1a73e3 - patchlevel 201

Authored and Committed by Karsten Hopp 17 years ago
    - patchlevel 201
    
        
file added
+81
7.0.201 ADDED
@@ -0,0 +1,81 @@
1
+ To: vim-dev@vim.org
2
+ Subject: patch 7.0.201
3
+ Fcc: outbox
4
+ From: Bram Moolenaar <Bram@moolenaar.net>
5
+ Mime-Version: 1.0
6
+ Content-Type: text/plain; charset=ISO-8859-1
7
+ Content-Transfer-Encoding: 8bit
8
+ ------------
9
+
10
+ Patch 7.0.201
11
+ Problem: Message for ":diffput" about buffer not being in diff mode may be
12
+ wrong.
13
+ Solution: Check for buffer in diff mode but not modifiable.
14
+ Files: src/diff.c
15
+
16
+
17
+ *** ../vim-7.0.200/src/diff.c Tue Feb 20 03:52:04 2007
18
+ --- src/diff.c Fri Feb 16 01:18:41 2007
19
+ ***************
20
+ *** 2014,2019 ****
21
+ --- 2014,2020 ----
22
+ int start_skip, end_skip;
23
+ int new_count;
24
+ int buf_empty;
25
+ + int found_not_ma = FALSE;
26
+
27
+ /* Find the current buffer in the list of diff buffers. */
28
+ idx_cur = diff_buf_idx(curbuf);
29
+ ***************
30
+ *** 2028,2040 ****
31
+ /* No argument: Find the other buffer in the list of diff buffers. */
32
+ for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
33
+ if (curtab->tp_diffbuf[idx_other] != curbuf
34
+ ! && curtab->tp_diffbuf[idx_other] != NULL
35
+ ! && (eap->cmdidx != CMD_diffput
36
+ ! || curtab->tp_diffbuf[idx_other]->b_p_ma))
37
+ ! break;
38
+ if (idx_other == DB_COUNT)
39
+ {
40
+ ! EMSG(_("E100: No other buffer in diff mode"));
41
+ return;
42
+ }
43
+
44
+ --- 2029,2047 ----
45
+ /* No argument: Find the other buffer in the list of diff buffers. */
46
+ for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
47
+ if (curtab->tp_diffbuf[idx_other] != curbuf
48
+ ! && curtab->tp_diffbuf[idx_other] != NULL)
49
+ ! {
50
+ ! if (eap->cmdidx != CMD_diffput
51
+ ! || curtab->tp_diffbuf[idx_other]->b_p_ma)
52
+ ! break;
53
+ ! found_not_ma = TRUE;
54
+ ! }
55
+ if (idx_other == DB_COUNT)
56
+ {
57
+ ! if (found_not_ma)
58
+ ! EMSG(_("E793: No other buffer in diff mode is modifiable"));
59
+ ! else
60
+ ! EMSG(_("E100: No other buffer in diff mode"));
61
+ return;
62
+ }
63
+
64
+ *** ../vim-7.0.200/src/version.c Tue Feb 20 03:52:04 2007
65
+ --- src/version.c Tue Feb 20 04:46:00 2007
66
+ ***************
67
+ *** 668,669 ****
68
+ --- 668,671 ----
69
+ { /* Add new patch number below this line */
70
+ + /**/
71
+ + 201,
72
+ /**/
73
+
74
+ --
75
+ hundred-and-one symptoms of being an internet addict:
76
+ 159. You get excited whenever discussing your hard drive.
77
+
78
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
79
+ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
80
+ \\\ download, build and distribute -- http://www.A-A-P.org ///
81
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
file modified
+7 -0
file modified
+15 -2