annotate src/diff.c @ 2859:ce1dce2af2a3 v7.3.203

updated for version 7.3.203 Problem: MS-Windows: Can't run an external command without a console window. Solution: Support ":!start /b cmd". (Xaizek)
author Bram Moolenaar <bram@vim.org>
date Wed, 25 May 2011 17:06:22 +0200
parents 7c2e6ba1d702
children d8ce4a2eb44e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1 /* vim:set ts=8 sts=4 sw=4:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3 * VIM - Vi IMproved by Bram Moolenaar
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5 * Do ":help uganda" in Vim to read copying and usage conditions.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 * Do ":help credits" in Vim to see a list of people who contributed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7 * See README.txt for an overview of the Vim source code.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 /*
1788
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
11 * diff.c: code for diff'ing two, three or four buffers.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14 #include "vim.h"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
15
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16 #if defined(FEAT_DIFF) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
17
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
18 static int diff_busy = FALSE; /* ex_diffgetput() is busy */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
20 /* flags obtained from the 'diffopt' option */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
21 #define DIFF_FILLER 1 /* display filler lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
22 #define DIFF_ICASE 2 /* ignore case */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
23 #define DIFF_IWHITE 4 /* ignore change in white space */
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
24 #define DIFF_HORIZONTAL 8 /* horizontal splits */
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
25 #define DIFF_VERTICAL 16 /* vertical splits */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26 static int diff_flags = DIFF_FILLER;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
27
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28 #define LBUFLEN 50 /* length of line in diff file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
29
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
30 static int diff_a_works = MAYBE; /* TRUE when "diff -a" works, FALSE when it
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
31 doesn't work, MAYBE when not checked yet */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
32 #if defined(MSWIN) || defined(MSDOS)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
33 static int diff_bin_works = MAYBE; /* TRUE when "diff --binary" works, FALSE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
34 when it doesn't work, MAYBE when not
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
35 checked yet */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
36 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
37
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
38 static int diff_buf_idx __ARGS((buf_T *buf));
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
39 static int diff_buf_idx_tp __ARGS((buf_T *buf, tabpage_T *tp));
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
40 static void diff_mark_adjust_tp __ARGS((tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after));
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
41 static void diff_check_unchanged __ARGS((tabpage_T *tp, diff_T *dp));
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
42 static int diff_check_sanity __ARGS((tabpage_T *tp, diff_T *dp));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
43 static void diff_redraw __ARGS((int dofold));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
44 static int diff_write __ARGS((buf_T *buf, char_u *fname));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
45 static void diff_file __ARGS((char_u *tmp_orig, char_u *tmp_new, char_u *tmp_diff));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
46 static int diff_equal_entry __ARGS((diff_T *dp, int idx1, int idx2));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
47 static int diff_cmp __ARGS((char_u *s1, char_u *s2));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
48 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
49 static void diff_fold_update __ARGS((diff_T *dp, int skip_idx));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
50 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
51 static void diff_read __ARGS((int idx_orig, int idx_new, char_u *fname));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
52 static void diff_copy_entry __ARGS((diff_T *dprev, diff_T *dp, int idx_orig, int idx_new));
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
53 static diff_T *diff_alloc_new __ARGS((tabpage_T *tp, diff_T *dprev, diff_T *dp));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
54
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
55 #ifndef USE_CR
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
56 # define tag_fgets vim_fgets
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
57 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
58
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
59 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
60 * Called when deleting or unloading a buffer: No longer make a diff with it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
61 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
62 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
63 diff_buf_delete(buf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
64 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
65 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
66 int i;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
67 tabpage_T *tp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
68
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
69 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
70 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
71 i = diff_buf_idx_tp(buf, tp);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
72 if (i != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
73 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
74 tp->tp_diffbuf[i] = NULL;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
75 tp->tp_diff_invalid = TRUE;
1761
0836531167ab updated for version 7.2-059
vimboss
parents: 1757
diff changeset
76 if (tp == curtab)
0836531167ab updated for version 7.2-059
vimboss
parents: 1757
diff changeset
77 diff_redraw(TRUE);
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
78 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
79 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
80 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
81
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
82 /*
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
83 * Check if the current buffer should be added to or removed from the list of
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
84 * diff buffers.
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
85 */
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
86 void
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
87 diff_buf_adjust(win)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
88 win_T *win;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
89 {
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
90 win_T *wp;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
91 int i;
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
92
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
93 if (!win->w_p_diff)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
94 {
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
95 /* When there is no window showing a diff for this buffer, remove
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
96 * it from the diffs. */
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
97 for (wp = firstwin; wp != NULL; wp = wp->w_next)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
98 if (wp->w_buffer == win->w_buffer && wp->w_p_diff)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
99 break;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
100 if (wp == NULL)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
101 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
102 i = diff_buf_idx(win->w_buffer);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
103 if (i != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
104 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
105 curtab->tp_diffbuf[i] = NULL;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
106 curtab->tp_diff_invalid = TRUE;
1761
0836531167ab updated for version 7.2-059
vimboss
parents: 1757
diff changeset
107 diff_redraw(TRUE);
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
108 }
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
109 }
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
110 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
111 else
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
112 diff_buf_add(win->w_buffer);
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
113 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
114
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
115 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
116 * Add a buffer to make diffs for.
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
117 * Call this when a new buffer is being edited in the current window where
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
118 * 'diff' is set.
1788
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
119 * Marks the current buffer as being part of the diff and requiring updating.
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
120 * This must be done before any autocmd, because a command may use info
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
121 * about the screen contents.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
122 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
123 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
124 diff_buf_add(buf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
125 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
126 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
127 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
128
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
129 if (diff_buf_idx(buf) != DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
130 return; /* It's already there. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
131
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
132 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
133 if (curtab->tp_diffbuf[i] == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
134 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
135 curtab->tp_diffbuf[i] = buf;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
136 curtab->tp_diff_invalid = TRUE;
1761
0836531167ab updated for version 7.2-059
vimboss
parents: 1757
diff changeset
137 diff_redraw(TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
138 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
139 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
140
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
141 EMSGN(_("E96: Can not diff more than %ld buffers"), DB_COUNT);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
142 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
143
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
144 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
145 * Find buffer "buf" in the list of diff buffers for the current tab page.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
146 * Return its index or DB_COUNT if not found.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
147 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
148 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
149 diff_buf_idx(buf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
150 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
151 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
152 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
153
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
154 for (idx = 0; idx < DB_COUNT; ++idx)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
155 if (curtab->tp_diffbuf[idx] == buf)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
156 break;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
157 return idx;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
158 }
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
159
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
160 /*
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
161 * Find buffer "buf" in the list of diff buffers for tab page "tp".
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
162 * Return its index or DB_COUNT if not found.
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
163 */
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
164 static int
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
165 diff_buf_idx_tp(buf, tp)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
166 buf_T *buf;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
167 tabpage_T *tp;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
168 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
169 int idx;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
170
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
171 for (idx = 0; idx < DB_COUNT; ++idx)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
172 if (tp->tp_diffbuf[idx] == buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
173 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
174 return idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
175 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
176
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
177 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
178 * Mark the diff info involving buffer "buf" as invalid, it will be updated
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
179 * when info is requested.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
180 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
181 void
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
182 diff_invalidate(buf)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
183 buf_T *buf;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
184 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
185 tabpage_T *tp;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
186 int i;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
187
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
188 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
189 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
190 i = diff_buf_idx_tp(buf, tp);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
191 if (i != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
192 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
193 tp->tp_diff_invalid = TRUE;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
194 if (tp == curtab)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
195 diff_redraw(TRUE);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
196 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
197 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
198 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
199
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
200 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
201 * Called by mark_adjust(): update line numbers in "curbuf".
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
202 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
203 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
204 diff_mark_adjust(line1, line2, amount, amount_after)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
205 linenr_T line1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
206 linenr_T line2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
207 long amount;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
208 long amount_after;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
209 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
210 int idx;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
211 tabpage_T *tp;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
212
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
213 /* Handle all tab pages that use the current buffer in a diff. */
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
214 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
215 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
216 idx = diff_buf_idx_tp(curbuf, tp);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
217 if (idx != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
218 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
219 }
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
220 }
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
221
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
222 /*
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
223 * Update line numbers in tab page "tp" for "curbuf" with index "idx".
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
224 * This attempts to update the changes as much as possible:
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
225 * When inserting/deleting lines outside of existing change blocks, create a
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
226 * new change block and update the line numbers in following blocks.
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
227 * When inserting/deleting lines in existing change blocks, update them.
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
228 */
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
229 static void
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
230 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
231 tabpage_T *tp;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
232 int idx;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
233 linenr_T line1;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
234 linenr_T line2;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
235 long amount;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
236 long amount_after;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
237 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
238 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
239 diff_T *dprev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
240 diff_T *dnext;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
241 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
242 int inserted, deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
243 int n, off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
244 linenr_T last;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
245 linenr_T lnum_deleted = line1; /* lnum of remaining deletion */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
246 int check_unchanged;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
247
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
248 if (line2 == MAXLNUM)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
249 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
250 /* mark_adjust(99, MAXLNUM, 9, 0): insert lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
251 inserted = amount;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
252 deleted = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
253 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
254 else if (amount_after > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
255 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
256 /* mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines*/
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
257 inserted = amount_after;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
258 deleted = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
259 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
260 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
261 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
262 /* mark_adjust(98, 99, MAXLNUM, -2): delete lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
263 inserted = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
264 deleted = -amount_after;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
265 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
266
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
267 dprev = NULL;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
268 dp = tp->tp_first_diff;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
269 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
270 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
271 /* If the change is after the previous diff block and before the next
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
272 * diff block, thus not touching an existing change, create a new diff
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
273 * block. Don't do this when ex_diffgetput() is busy. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
274 if ((dp == NULL || dp->df_lnum[idx] - 1 > line2
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
275 || (line2 == MAXLNUM && dp->df_lnum[idx] > line1))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
276 && (dprev == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
277 || dprev->df_lnum[idx] + dprev->df_count[idx] < line1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
278 && !diff_busy)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
279 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
280 dnext = diff_alloc_new(tp, dprev, dp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
281 if (dnext == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
282 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
283
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
284 dnext->df_lnum[idx] = line1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
285 dnext->df_count[idx] = inserted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
286 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
287 if (tp->tp_diffbuf[i] != NULL && i != idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
288 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
289 if (dprev == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
290 dnext->df_lnum[i] = line1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
291 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
292 dnext->df_lnum[i] = line1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
293 + (dprev->df_lnum[i] + dprev->df_count[i])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
294 - (dprev->df_lnum[idx] + dprev->df_count[idx]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
295 dnext->df_count[i] = deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
296 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
297 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
298
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
299 /* if at end of the list, quit */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
300 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
301 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
302
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
303 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
304 * Check for these situations:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
305 * 1 2 3
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
306 * 1 2 3
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
307 * line1 2 3 4 5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
308 * 2 3 4 5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
309 * 2 3 4 5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
310 * line2 2 3 4 5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
311 * 3 5 6
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
312 * 3 5 6
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
313 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
314 /* compute last line of this change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
315 last = dp->df_lnum[idx] + dp->df_count[idx] - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
316
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
317 /* 1. change completely above line1: nothing to do */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
318 if (last >= line1 - 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
319 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
320 /* 6. change below line2: only adjust for amount_after; also when
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
321 * "deleted" became zero when deleted all lines between two diffs */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
322 if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
323 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
324 if (amount_after == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
325 break; /* nothing left to change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
326 dp->df_lnum[idx] += amount_after;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
327 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
328 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
329 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
330 check_unchanged = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
331
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
332 /* 2. 3. 4. 5.: inserted/deleted lines touching this diff. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
333 if (deleted > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
334 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
335 if (dp->df_lnum[idx] >= line1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
336 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
337 off = dp->df_lnum[idx] - lnum_deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
338 if (last <= line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
339 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
340 /* 4. delete all lines of diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
341 if (dp->df_next != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
342 && dp->df_next->df_lnum[idx] - 1 <= line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
343 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
344 /* delete continues in next diff, only do
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
345 * lines until that one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
346 n = dp->df_next->df_lnum[idx] - lnum_deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
347 deleted -= n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
348 n -= dp->df_count[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
349 lnum_deleted = dp->df_next->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
350 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
351 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
352 n = deleted - dp->df_count[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
353 dp->df_count[idx] = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
354 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
355 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
356 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
357 /* 5. delete lines at or just before top of diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
358 n = off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
359 dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
360 check_unchanged = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
361 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
362 dp->df_lnum[idx] = line1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
363 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
364 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
365 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
366 off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
367 if (last < line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
368 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
369 /* 2. delete at end of of diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
370 dp->df_count[idx] -= last - lnum_deleted + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
371 if (dp->df_next != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
372 && dp->df_next->df_lnum[idx] - 1 <= line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
373 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
374 /* delete continues in next diff, only do
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
375 * lines until that one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
376 n = dp->df_next->df_lnum[idx] - 1 - last;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
377 deleted -= dp->df_next->df_lnum[idx]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
378 - lnum_deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
379 lnum_deleted = dp->df_next->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
380 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
381 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
382 n = line2 - last;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
383 check_unchanged = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
384 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
385 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
386 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
387 /* 3. delete lines inside the diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
388 n = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
389 dp->df_count[idx] -= deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
390 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
391 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
392
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
393 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
394 if (tp->tp_diffbuf[i] != NULL && i != idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
395 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
396 dp->df_lnum[i] -= off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
397 dp->df_count[i] += n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
398 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
399 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
400 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
401 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
402 if (dp->df_lnum[idx] <= line1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
403 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
404 /* inserted lines somewhere in this diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
405 dp->df_count[idx] += inserted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
406 check_unchanged = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
407 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
408 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
409 /* inserted lines somewhere above this diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
410 dp->df_lnum[idx] += inserted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
411 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
412
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
413 if (check_unchanged)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
414 /* Check if inserted lines are equal, may reduce the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
415 * size of the diff. TODO: also check for equal lines
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
416 * in the middle and perhaps split the block. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
417 diff_check_unchanged(tp, dp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
418 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
419 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
420
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
421 /* check if this block touches the previous one, may merge them. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
422 if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
423 == dp->df_lnum[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
424 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
425 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
426 if (tp->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
427 dprev->df_count[i] += dp->df_count[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
428 dprev->df_next = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
429 vim_free(dp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
430 dp = dprev->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
431 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
432 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
433 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
434 /* Advance to next entry. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
435 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
436 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
437 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
438 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
439
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
440 dprev = NULL;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
441 dp = tp->tp_first_diff;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
442 while (dp != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
443 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
444 /* All counts are zero, remove this entry. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
445 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
446 if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
447 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
448 if (i == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
449 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
450 dnext = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
451 vim_free(dp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
452 dp = dnext;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
453 if (dprev == NULL)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
454 tp->tp_first_diff = dnext;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
455 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
456 dprev->df_next = dnext;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
457 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
458 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
459 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
460 /* Advance to next entry. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
461 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
462 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
463 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
464
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
465 }
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
466
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
467 if (tp == curtab)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
468 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
469 diff_redraw(TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
470
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
471 /* Need to recompute the scroll binding, may remove or add filler
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
472 * lines (e.g., when adding lines above w_topline). But it's slow when
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
473 * making many changes, postpone until redrawing. */
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
474 diff_need_scrollbind = TRUE;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
475 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
476 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
477
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
478 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
479 * Allocate a new diff block and link it between "dprev" and "dp".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
480 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
481 static diff_T *
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
482 diff_alloc_new(tp, dprev, dp)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
483 tabpage_T *tp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
484 diff_T *dprev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
485 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
486 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
487 diff_T *dnew;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
488
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
489 dnew = (diff_T *)alloc((unsigned)sizeof(diff_T));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
490 if (dnew != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
491 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
492 dnew->df_next = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
493 if (dprev == NULL)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
494 tp->tp_first_diff = dnew;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
495 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
496 dprev->df_next = dnew;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
497 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
498 return dnew;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
499 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
500
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
501 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
502 * Check if the diff block "dp" can be made smaller for lines at the start and
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
503 * end that are equal. Called after inserting lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
504 * This may result in a change where all buffers have zero lines, the caller
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
505 * must take care of removing it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
506 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
507 static void
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
508 diff_check_unchanged(tp, dp)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
509 tabpage_T *tp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
510 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
511 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
512 int i_org;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
513 int i_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
514 int off_org, off_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
515 char_u *line_org;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
516 int dir = FORWARD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
517
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
518 /* Find the first buffers, use it as the original, compare the other
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
519 * buffer lines against this one. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
520 for (i_org = 0; i_org < DB_COUNT; ++i_org)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
521 if (tp->tp_diffbuf[i_org] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
522 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
523 if (i_org == DB_COUNT) /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
524 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
525
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
526 if (diff_check_sanity(tp, dp) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
527 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
528
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
529 /* First check lines at the top, then at the bottom. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
530 off_org = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
531 off_new = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
532 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
533 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
534 /* Repeat until a line is found which is different or the number of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
535 * lines has become zero. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
536 while (dp->df_count[i_org] > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
537 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
538 /* Copy the line, the next ml_get() will invalidate it. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
539 if (dir == BACKWARD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
540 off_org = dp->df_count[i_org] - 1;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
541 line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org],
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
542 dp->df_lnum[i_org] + off_org, FALSE));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
543 if (line_org == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
544 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
545 for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
546 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
547 if (tp->tp_diffbuf[i_new] == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
548 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
549 if (dir == BACKWARD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
550 off_new = dp->df_count[i_new] - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
551 /* if other buffer doesn't have this line, it was inserted */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
552 if (off_new < 0 || off_new >= dp->df_count[i_new])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
553 break;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
554 if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new],
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
555 dp->df_lnum[i_new] + off_new, FALSE)) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
556 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
557 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
558 vim_free(line_org);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
559
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
560 /* Stop when a line isn't equal in all diff buffers. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
561 if (i_new != DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
562 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
563
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
564 /* Line matched in all buffers, remove it from the diff. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
565 for (i_new = i_org; i_new < DB_COUNT; ++i_new)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
566 if (tp->tp_diffbuf[i_new] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
567 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
568 if (dir == FORWARD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
569 ++dp->df_lnum[i_new];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
570 --dp->df_count[i_new];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
571 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
572 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
573 if (dir == BACKWARD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
574 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
575 dir = BACKWARD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
576 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
577 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
578
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
579 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
580 * Check if a diff block doesn't contain invalid line numbers.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
581 * This can happen when the diff program returns invalid results.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
582 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
583 static int
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
584 diff_check_sanity(tp, dp)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
585 tabpage_T *tp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
586 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
587 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
588 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
589
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
590 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
591 if (tp->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
592 if (dp->df_lnum[i] + dp->df_count[i] - 1
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
593 > tp->tp_diffbuf[i]->b_ml.ml_line_count)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
594 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
595 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
596 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
597
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
598 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
599 * Mark all diff buffers in the current tab page for redraw.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
600 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
601 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
602 diff_redraw(dofold)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
603 int dofold; /* also recompute the folds */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
604 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
605 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
606 int n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
607
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
608 for (wp = firstwin; wp != NULL; wp = wp->w_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
609 if (wp->w_p_diff)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
610 {
738
5c9e7c6e6e2e updated for version 7.0222
vimboss
parents: 694
diff changeset
611 redraw_win_later(wp, SOME_VALID);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
612 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
613 if (dofold && foldmethodIsDiff(wp))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
614 foldUpdateAll(wp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
615 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
616 /* A change may have made filler lines invalid, need to take care
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
617 * of that for other windows. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
618 if (wp != curwin && wp->w_topfill > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
619 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
620 n = diff_check(wp, wp->w_topline);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
621 if (wp->w_topfill > n)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
622 wp->w_topfill = (n < 0 ? 0 : n);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
623 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
624 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
625 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
626
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
627 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
628 * Write buffer "buf" to file "name".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
629 * Always use 'fileformat' set to "unix".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
630 * Return FAIL for failure
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
631 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
632 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
633 diff_write(buf, fname)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
634 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
635 char_u *fname;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
636 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
637 int r;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
638 char_u *save_ff;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
639
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
640 save_ff = buf->b_p_ff;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
641 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
642 r = buf_write(buf, fname, NULL, (linenr_T)1, buf->b_ml.ml_line_count,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
643 NULL, FALSE, FALSE, FALSE, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
644 free_string_option(buf->b_p_ff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
645 buf->b_p_ff = save_ff;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
646 return r;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
647 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
648
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
649 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
650 * Completely update the diffs for the buffers involved.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
651 * This uses the ordinary "diff" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
652 * The buffers are written to a file, also for unmodified buffers (the file
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
653 * could have been produced by autocommands, e.g. the netrw plugin).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
654 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
655 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
656 ex_diffupdate(eap)
1876
932ff0c0f57b updated for version 7.2-173
vimboss
parents: 1872
diff changeset
657 exarg_T *eap UNUSED; /* can be NULL */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
658 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
659 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
660 int idx_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
661 int idx_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
662 char_u *tmp_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
663 char_u *tmp_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
664 char_u *tmp_diff;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
665 FILE *fd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
666 int ok;
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
667 int io_error = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
668
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
669 /* Delete all diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
670 diff_clear(curtab);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
671 curtab->tp_diff_invalid = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
672
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
673 /* Use the first buffer as the original text. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
674 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
675 if (curtab->tp_diffbuf[idx_orig] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
676 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
677 if (idx_orig == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
678 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
679
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
680 /* Only need to do something when there is another buffer. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
681 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
682 if (curtab->tp_diffbuf[idx_new] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
683 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
684 if (idx_new == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
685 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
686
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
687 /* We need three temp file names. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
688 tmp_orig = vim_tempname('o');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
689 tmp_new = vim_tempname('n');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
690 tmp_diff = vim_tempname('d');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
691 if (tmp_orig == NULL || tmp_new == NULL || tmp_diff == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
692 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
693
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
694 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
695 * Do a quick test if "diff" really works. Otherwise it looks like there
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
696 * are no differences. Can't use the return value, it's non-zero when
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
697 * there are differences.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
698 * May try twice, first with "-a" and then without.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
699 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
700 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
701 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
702 ok = FALSE;
531
da9142bd190a updated for version 7.0149
vimboss
parents: 474
diff changeset
703 fd = mch_fopen((char *)tmp_orig, "w");
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
704 if (fd == NULL)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
705 io_error = TRUE;
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
706 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
707 {
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
708 if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
709 io_error = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
710 fclose(fd);
531
da9142bd190a updated for version 7.0149
vimboss
parents: 474
diff changeset
711 fd = mch_fopen((char *)tmp_new, "w");
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
712 if (fd == NULL)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
713 io_error = TRUE;
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
714 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
715 {
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
716 if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
717 io_error = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
718 fclose(fd);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
719 diff_file(tmp_orig, tmp_new, tmp_diff);
531
da9142bd190a updated for version 7.0149
vimboss
parents: 474
diff changeset
720 fd = mch_fopen((char *)tmp_diff, "r");
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
721 if (fd == NULL)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
722 io_error = TRUE;
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
723 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
724 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
725 char_u linebuf[LBUFLEN];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
726
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
727 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
728 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
729 /* There must be a line that contains "1c1". */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
730 if (tag_fgets(linebuf, LBUFLEN, fd))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
731 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
732 if (STRNCMP(linebuf, "1c1", 3) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
733 ok = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
734 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
735 fclose(fd);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
736 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
737 mch_remove(tmp_diff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
738 mch_remove(tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
739 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
740 mch_remove(tmp_orig);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
741 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
742
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
743 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
744 /* When using 'diffexpr' break here. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
745 if (*p_dex != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
746 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
747 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
748
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
749 #if defined(MSWIN) || defined(MSDOS)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
750 /* If the "-a" argument works, also check if "--binary" works. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
751 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
752 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
753 diff_a_works = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
754 diff_bin_works = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
755 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
756 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
757 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
758 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
759 /* Tried --binary, but it failed. "-a" works though. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
760 diff_bin_works = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
761 ok = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
762 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
763 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
764
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
765 /* If we checked if "-a" works already, break here. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
766 if (diff_a_works != MAYBE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
767 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
768 diff_a_works = ok;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
769
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
770 /* If "-a" works break here, otherwise retry without "-a". */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
771 if (ok)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
772 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
773 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
774 if (!ok)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
775 {
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
776 if (io_error)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
777 EMSG(_("E810: Cannot read or write temp files"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
778 EMSG(_("E97: Cannot create diffs"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
779 diff_a_works = MAYBE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
780 #if defined(MSWIN) || defined(MSDOS)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
781 diff_bin_works = MAYBE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
782 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
783 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
784 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
785
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
786 /* Write the first buffer to a tempfile. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
787 buf = curtab->tp_diffbuf[idx_orig];
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
788 if (diff_write(buf, tmp_orig) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
789 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
790
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
791 /* Make a difference between the first buffer and every other. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
792 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
793 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
794 buf = curtab->tp_diffbuf[idx_new];
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
795 if (buf == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
796 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
797 if (diff_write(buf, tmp_new) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
798 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
799 diff_file(tmp_orig, tmp_new, tmp_diff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
800
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
801 /* Read the diff output and add each entry to the diff list. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
802 diff_read(idx_orig, idx_new, tmp_diff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
803 mch_remove(tmp_diff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
804 mch_remove(tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
805 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
806 mch_remove(tmp_orig);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
807
1429
3372616fe1f1 updated for version 7.1-144
vimboss
parents: 1428
diff changeset
808 /* force updating cursor position on screen */
3372616fe1f1 updated for version 7.1-144
vimboss
parents: 1428
diff changeset
809 curwin->w_valid_cursor.lnum = 0;
3372616fe1f1 updated for version 7.1-144
vimboss
parents: 1428
diff changeset
810
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
811 diff_redraw(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
812
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
813 theend:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
814 vim_free(tmp_orig);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
815 vim_free(tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
816 vim_free(tmp_diff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
817 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
818
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
819 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
820 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
821 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
822 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
823 diff_file(tmp_orig, tmp_new, tmp_diff)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
824 char_u *tmp_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
825 char_u *tmp_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
826 char_u *tmp_diff;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
827 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
828 char_u *cmd;
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
829 size_t len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
830
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
831 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
832 if (*p_dex != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
833 /* Use 'diffexpr' to generate the diff file. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
834 eval_diff(tmp_orig, tmp_new, tmp_diff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
835 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
836 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
837 {
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
838 len = STRLEN(tmp_orig) + STRLEN(tmp_new)
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
839 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27;
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
840 cmd = alloc((unsigned)len);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
841 if (cmd != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
842 {
193
eee3fa1b0197 updated for version 7.0058
vimboss
parents: 28
diff changeset
843 /* We don't want $DIFF_OPTIONS to get in the way. */
eee3fa1b0197 updated for version 7.0058
vimboss
parents: 28
diff changeset
844 if (getenv("DIFF_OPTIONS"))
eee3fa1b0197 updated for version 7.0058
vimboss
parents: 28
diff changeset
845 vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)"");
eee3fa1b0197 updated for version 7.0058
vimboss
parents: 28
diff changeset
846
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
847 /* Build the diff command and execute it. Always use -a, binary
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
848 * differences are of no use. Ignore errors, diff returns
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
849 * non-zero when differences have been found. */
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
850 vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s %s",
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
851 diff_a_works == FALSE ? "" : "-a ",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
852 #if defined(MSWIN) || defined(MSDOS)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
853 diff_bin_works == TRUE ? "--binary " : "",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
854 #else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
855 "",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
856 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
857 (diff_flags & DIFF_IWHITE) ? "-b " : "",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
858 (diff_flags & DIFF_ICASE) ? "-i " : "",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
859 tmp_orig, tmp_new);
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
860 append_redir(cmd, (int)len, p_srr, tmp_diff);
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
861 #ifdef FEAT_AUTOCMD
1410
cdd82acd75b4 updated for version 7.1-125
vimboss
parents: 1075
diff changeset
862 block_autocmds(); /* Avoid ShellCmdPost stuff */
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
863 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
864 (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
865 #ifdef FEAT_AUTOCMD
1410
cdd82acd75b4 updated for version 7.1-125
vimboss
parents: 1075
diff changeset
866 unblock_autocmds();
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
867 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
868 vim_free(cmd);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
869 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
870 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
871 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
872
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
873 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
874 * Create a new version of a file from the current buffer and a diff file.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
875 * The buffer is written to a file, also for unmodified buffers (the file
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
876 * could have been produced by autocommands, e.g. the netrw plugin).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
877 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
878 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
879 ex_diffpatch(eap)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
880 exarg_T *eap;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
881 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
882 char_u *tmp_orig; /* name of original temp file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
883 char_u *tmp_new; /* name of patched temp file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
884 char_u *buf = NULL;
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
885 size_t buflen;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
886 win_T *old_curwin = curwin;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
887 char_u *newname = NULL; /* name of patched file buffer */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
888 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
889 char_u dirbuf[MAXPATHL];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
890 char_u *fullname = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
891 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
892 #ifdef FEAT_BROWSE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
893 char_u *browseFile = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
894 int browse_flag = cmdmod.browse;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
895 #endif
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
896 struct stat st;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
897
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
898 #ifdef FEAT_BROWSE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
899 if (cmdmod.browse)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
900 {
28
726bdc53fa49 updated for version 7.0018
vimboss
parents: 16
diff changeset
901 browseFile = do_browse(0, (char_u *)_("Patch file"),
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
902 eap->arg, NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
903 if (browseFile == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
904 return; /* operation cancelled */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
905 eap->arg = browseFile;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
906 cmdmod.browse = FALSE; /* don't let do_ecmd() browse again */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
907 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
908 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
909
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
910 /* We need two temp file names. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
911 tmp_orig = vim_tempname('o');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
912 tmp_new = vim_tempname('n');
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
913 if (tmp_orig == NULL || tmp_new == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
914 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
915
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
916 /* Write the current buffer to "tmp_orig". */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
917 if (buf_write(curbuf, tmp_orig, NULL,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
918 (linenr_T)1, curbuf->b_ml.ml_line_count,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
919 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
920 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
921
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
922 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
923 /* Get the absolute path of the patchfile, changing directory below. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
924 fullname = FullName_save(eap->arg, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
925 #endif
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
926 buflen = STRLEN(tmp_orig) + (
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
927 # ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
928 fullname != NULL ? STRLEN(fullname) :
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
929 # endif
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
930 STRLEN(eap->arg)) + STRLEN(tmp_new) + 16;
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
931 buf = alloc((unsigned)buflen);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
932 if (buf == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
933 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
934
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
935 #ifdef UNIX
1788
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
936 /* Temporarily chdir to /tmp, to avoid patching files in the current
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
937 * directory when the patch file contains more than one patch. When we
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
938 * have our own temp dir use that instead, it will be cleaned up when we
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
939 * exit (any .rej files created). Don't change directory if we can't
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
940 * return to the current. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
941 if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
942 dirbuf[0] = NUL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
943 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
944 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
945 # ifdef TEMPDIRNAMES
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
946 if (vim_tempdir != NULL)
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
947 ignored = mch_chdir((char *)vim_tempdir);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
948 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
949 # endif
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
950 ignored = mch_chdir("/tmp");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
951 shorten_fnames(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
952 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
953 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
954
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
955 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
956 if (*p_pex != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
957 /* Use 'patchexpr' to generate the new file. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
958 eval_patch(tmp_orig,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
959 # ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
960 fullname != NULL ? fullname :
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
961 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
962 eap->arg, tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
963 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
964 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
965 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
966 /* Build the patch command and execute it. Ignore errors. Switch to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
967 * cooked mode to allow the user to respond to prompts. */
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
968 vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"",
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
969 tmp_new, tmp_orig,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
970 # ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
971 fullname != NULL ? fullname :
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
972 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
973 eap->arg);
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
974 #ifdef FEAT_AUTOCMD
1410
cdd82acd75b4 updated for version 7.1-125
vimboss
parents: 1075
diff changeset
975 block_autocmds(); /* Avoid ShellCmdPost stuff */
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
976 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
977 (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED);
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
978 #ifdef FEAT_AUTOCMD
1410
cdd82acd75b4 updated for version 7.1-125
vimboss
parents: 1075
diff changeset
979 unblock_autocmds();
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
980 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
981 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
982
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
983 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
984 if (dirbuf[0] != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
985 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
986 if (mch_chdir((char *)dirbuf) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
987 EMSG(_(e_prev_dir));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
988 shorten_fnames(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
989 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
990 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
991
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
992 /* patch probably has written over the screen */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
993 redraw_later(CLEAR);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
994
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
995 /* Delete any .orig or .rej file created. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
996 STRCPY(buf, tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
997 STRCAT(buf, ".orig");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
998 mch_remove(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
999 STRCPY(buf, tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1000 STRCAT(buf, ".rej");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1001 mch_remove(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1002
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1003 /* Only continue if the output file was created. */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1004 if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1005 EMSG(_("E816: Cannot read patch output"));
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1006 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1007 {
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1008 if (curbuf->b_fname != NULL)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1009 {
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1010 newname = vim_strnsave(curbuf->b_fname,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1011 (int)(STRLEN(curbuf->b_fname) + 4));
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1012 if (newname != NULL)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1013 STRCAT(newname, ".new");
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1014 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1015
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1016 #ifdef FEAT_GUI
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1017 need_mouse_correct = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1018 #endif
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1019 /* don't use a new tab page, each tab page has its own diffs */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1020 cmdmod.tab = 0;
682
f1b013312711 updated for version 7.0205
vimboss
parents: 681
diff changeset
1021
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1022 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1023 {
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1024 /* Pretend it was a ":split fname" command */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1025 eap->cmdidx = CMD_split;
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1026 eap->arg = tmp_new;
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1027 do_exedit(eap, old_curwin);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1028
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1029 /* check that split worked and editing tmp_new */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1030 if (curwin != old_curwin && win_valid(old_curwin))
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1031 {
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1032 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1033 diff_win_options(curwin, TRUE);
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1034 diff_win_options(old_curwin, TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1035
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1036 if (newname != NULL)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1037 {
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1038 /* do a ":file filename.new" on the patched buffer */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1039 eap->arg = newname;
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1040 ex_file(eap);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1041
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1042 #ifdef FEAT_AUTOCMD
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1043 /* Do filetype detection with the new name. */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1044 if (au_has_group((char_u *)"filetypedetect"))
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1045 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1046 #endif
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1047 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1048 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1049 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1050 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1051
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1052 theend:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1053 if (tmp_orig != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1054 mch_remove(tmp_orig);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1055 vim_free(tmp_orig);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1056 if (tmp_new != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1057 mch_remove(tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1058 vim_free(tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1059 vim_free(newname);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1060 vim_free(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1061 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1062 vim_free(fullname);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1063 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1064 #ifdef FEAT_BROWSE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1065 vim_free(browseFile);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1066 cmdmod.browse = browse_flag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1067 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1068 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1069
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1070 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1071 * Split the window and edit another file, setting options to show the diffs.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1072 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1073 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1074 ex_diffsplit(eap)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1075 exarg_T *eap;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1076 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1077 win_T *old_curwin = curwin;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1078
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1079 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1080 need_mouse_correct = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1081 #endif
682
f1b013312711 updated for version 7.0205
vimboss
parents: 681
diff changeset
1082 /* don't use a new tab page, each tab page has its own diffs */
f1b013312711 updated for version 7.0205
vimboss
parents: 681
diff changeset
1083 cmdmod.tab = 0;
f1b013312711 updated for version 7.0205
vimboss
parents: 681
diff changeset
1084
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1085 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1086 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1087 /* Pretend it was a ":split fname" command */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1088 eap->cmdidx = CMD_split;
449
3709cf52b9b5 updated for version 7.0119
vimboss
parents: 358
diff changeset
1089 curwin->w_p_diff = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1090 do_exedit(eap, old_curwin);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1091
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1092 if (curwin != old_curwin) /* split must have worked */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1093 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1094 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1095 diff_win_options(curwin, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1096 diff_win_options(old_curwin, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1097 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1098 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1099 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1100
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1101 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1102 * Set options to show difs for the current window.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1103 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1104 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1105 ex_diffthis(eap)
1876
932ff0c0f57b updated for version 7.2-173
vimboss
parents: 1872
diff changeset
1106 exarg_T *eap UNUSED;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1107 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1108 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1109 diff_win_options(curwin, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1110 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1111
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1112 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1113 * Set options in window "wp" for diff mode.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1114 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1115 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1116 diff_win_options(wp, addbuf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1117 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1118 int addbuf; /* Add buffer to diff. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1119 {
2086
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1120 # ifdef FEAT_FOLDING
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1121 win_T *old_curwin = curwin;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1122
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1123 /* close the manually opened folds */
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1124 curwin = wp;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1125 newFoldLevel();
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1126 curwin = old_curwin;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1127 # endif
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1128
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1129 wp->w_p_diff = TRUE;
2583
7c2e6ba1d702 updated for version 7.3.008
Bram Moolenaar <bram@vim.org>
parents: 2445
diff changeset
1130 /* Use 'scrollbind' and 'cursorbind' when available */
7c2e6ba1d702 updated for version 7.3.008
Bram Moolenaar <bram@vim.org>
parents: 2445
diff changeset
1131 #ifdef FEAT_SCROLLBIND
7c2e6ba1d702 updated for version 7.3.008
Bram Moolenaar <bram@vim.org>
parents: 2445
diff changeset
1132 wp->w_p_scb = TRUE;
7c2e6ba1d702 updated for version 7.3.008
Bram Moolenaar <bram@vim.org>
parents: 2445
diff changeset
1133 #endif
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
1134 #ifdef FEAT_CURSORBIND
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
1135 wp->w_p_crb = TRUE;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
1136 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1137 wp->w_p_wrap = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1138 # ifdef FEAT_FOLDING
2086
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1139 curwin = wp;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1140 curbuf = curwin->w_buffer;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1141 set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff",
694
07d199fe02ed updated for version 7.0209
vimboss
parents: 682
diff changeset
1142 OPT_LOCAL|OPT_FREE, 0);
2086
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1143 curwin = old_curwin;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1144 curbuf = curwin->w_buffer;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1145 wp->w_p_fdc = diff_foldcolumn;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1146 wp->w_p_fen = TRUE;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1147 wp->w_p_fdl = 0;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1148 foldUpdateAll(wp);
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1149 /* make sure topline is not halfway a fold */
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1150 changed_window_setting_win(wp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1151 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1152 #ifdef FEAT_SCROLLBIND
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1153 if (vim_strchr(p_sbo, 'h') == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1154 do_cmdline_cmd((char_u *)"set sbo+=hor");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1155 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1156
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1157 if (addbuf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1158 diff_buf_add(wp->w_buffer);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1159 redraw_win_later(wp, NOT_VALID);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1160 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1161
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1162 /*
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1163 * Set options not to show diffs. For the current window or all windows.
671
83a006f81bac updated for version 7.0199
vimboss
parents: 648
diff changeset
1164 * Only in the current tab page.
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1165 */
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1166 void
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1167 ex_diffoff(eap)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1168 exarg_T *eap;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1169 {
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1170 win_T *wp;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1171 win_T *old_curwin = curwin;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1172 #ifdef FEAT_SCROLLBIND
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1173 int diffwin = FALSE;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1174 #endif
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1175
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1176 for (wp = firstwin; wp != NULL; wp = wp->w_next)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1177 {
1835
8389197c91f3 updated for version 7.2-133
vimboss
parents: 1788
diff changeset
1178 if (wp == curwin || (eap->forceit && wp->w_p_diff))
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1179 {
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1180 /* Set 'diff', 'scrollbind' off and 'wrap' on. */
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1181 wp->w_p_diff = FALSE;
2583
7c2e6ba1d702 updated for version 7.3.008
Bram Moolenaar <bram@vim.org>
parents: 2445
diff changeset
1182 RESET_BINDING(wp);
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1183 wp->w_p_wrap = TRUE;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1184 #ifdef FEAT_FOLDING
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1185 curwin = wp;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1186 curbuf = curwin->w_buffer;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1187 set_string_option_direct((char_u *)"fdm", -1,
694
07d199fe02ed updated for version 7.0209
vimboss
parents: 682
diff changeset
1188 (char_u *)"manual", OPT_LOCAL|OPT_FREE, 0);
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1189 curwin = old_curwin;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1190 curbuf = curwin->w_buffer;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1191 wp->w_p_fdc = 0;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1192 wp->w_p_fen = FALSE;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1193 wp->w_p_fdl = 0;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1194 foldUpdateAll(wp);
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1195 /* make sure topline is not halfway a fold */
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1196 changed_window_setting_win(wp);
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1197 #endif
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1198 diff_buf_adjust(wp);
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1199 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1200 #ifdef FEAT_SCROLLBIND
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1201 diffwin |= wp->w_p_diff;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1202 #endif
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1203 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1204
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1205 #ifdef FEAT_SCROLLBIND
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1206 /* Remove "hor" from from 'scrollopt' if there are no diff windows left. */
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1207 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1208 do_cmdline_cmd((char_u *)"set sbo-=hor");
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1209 #endif
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1210 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1211
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1212 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1213 * Read the diff output and add each entry to the diff list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1214 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1215 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1216 diff_read(idx_orig, idx_new, fname)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1217 int idx_orig; /* idx of original file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1218 int idx_new; /* idx of new file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1219 char_u *fname; /* name of diff output file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1220 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1221 FILE *fd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1222 diff_T *dprev = NULL;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1223 diff_T *dp = curtab->tp_first_diff;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1224 diff_T *dn, *dpl;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1225 long f1, l1, f2, l2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1226 char_u linebuf[LBUFLEN]; /* only need to hold the diff line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1227 int difftype;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1228 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1229 long off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1230 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1231 linenr_T lnum_orig, lnum_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1232 long count_orig, count_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1233 int notset = TRUE; /* block "*dp" not set yet */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1234
531
da9142bd190a updated for version 7.0149
vimboss
parents: 474
diff changeset
1235 fd = mch_fopen((char *)fname, "r");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1236 if (fd == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1237 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1238 EMSG(_("E98: Cannot read diff output"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1239 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1240 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1241
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1242 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1243 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1244 if (tag_fgets(linebuf, LBUFLEN, fd))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1245 break; /* end of file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1246 if (!isdigit(*linebuf))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1247 continue; /* not the start of a diff block */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1248
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1249 /* This line must be one of three formats:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1250 * {first}[,{last}]c{first}[,{last}]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1251 * {first}a{first}[,{last}]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1252 * {first}[,{last}]d{first}
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1253 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1254 p = linebuf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1255 f1 = getdigits(&p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1256 if (*p == ',')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1257 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1258 ++p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1259 l1 = getdigits(&p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1260 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1261 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1262 l1 = f1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1263 if (*p != 'a' && *p != 'c' && *p != 'd')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1264 continue; /* invalid diff format */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1265 difftype = *p++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1266 f2 = getdigits(&p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1267 if (*p == ',')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1268 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1269 ++p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1270 l2 = getdigits(&p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1271 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1272 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1273 l2 = f2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1274 if (l1 < f1 || l2 < f2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1275 continue; /* invalid line range */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1276
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1277 if (difftype == 'a')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1278 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1279 lnum_orig = f1 + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1280 count_orig = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1281 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1282 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1283 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1284 lnum_orig = f1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1285 count_orig = l1 - f1 + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1286 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1287 if (difftype == 'd')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1288 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1289 lnum_new = f2 + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1290 count_new = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1291 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1292 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1293 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1294 lnum_new = f2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1295 count_new = l2 - f2 + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1296 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1297
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1298 /* Go over blocks before the change, for which orig and new are equal.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1299 * Copy blocks from orig to new. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1300 while (dp != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1301 && lnum_orig > dp->df_lnum[idx_orig] + dp->df_count[idx_orig])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1302 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1303 if (notset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1304 diff_copy_entry(dprev, dp, idx_orig, idx_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1305 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1306 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1307 notset = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1308 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1309
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1310 if (dp != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1311 && lnum_orig <= dp->df_lnum[idx_orig] + dp->df_count[idx_orig]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1312 && lnum_orig + count_orig >= dp->df_lnum[idx_orig])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1313 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1314 /* New block overlaps with existing block(s).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1315 * First find last block that overlaps. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1316 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1317 if (lnum_orig + count_orig < dpl->df_next->df_lnum[idx_orig])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1318 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1319
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1320 /* If the newly found block starts before the old one, set the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1321 * start back a number of lines. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1322 off = dp->df_lnum[idx_orig] - lnum_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1323 if (off > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1324 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1325 for (i = idx_orig; i < idx_new; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1326 if (curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1327 dp->df_lnum[i] -= off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1328 dp->df_lnum[idx_new] = lnum_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1329 dp->df_count[idx_new] = count_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1330 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1331 else if (notset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1332 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1333 /* new block inside existing one, adjust new block */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1334 dp->df_lnum[idx_new] = lnum_new + off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1335 dp->df_count[idx_new] = count_new - off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1336 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1337 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1338 /* second overlap of new block with existing block */
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1339 dp->df_count[idx_new] += count_new - count_orig
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1340 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1341 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1342
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1343 /* Adjust the size of the block to include all the lines to the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1344 * end of the existing block or the new diff, whatever ends last. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1345 off = (lnum_orig + count_orig)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1346 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1347 if (off < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1348 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1349 /* new change ends in existing block, adjust the end if not
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1350 * done already */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1351 if (notset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1352 dp->df_count[idx_new] += -off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1353 off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1354 }
1428
912b18745def updated for version 7.1-143
vimboss
parents: 1410
diff changeset
1355 for (i = idx_orig; i < idx_new; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1356 if (curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1357 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1358 - dp->df_lnum[i] + off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1359
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1360 /* Delete the diff blocks that have been merged into one. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1361 dn = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1362 dp->df_next = dpl->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1363 while (dn != dp->df_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1364 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1365 dpl = dn->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1366 vim_free(dn);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1367 dn = dpl;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1368 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1369 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1370 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1371 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1372 /* Allocate a new diffblock. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1373 dp = diff_alloc_new(curtab, dprev, dp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1374 if (dp == NULL)
840
2c885fab04e3 updated for version 7.0e06
vimboss
parents: 835
diff changeset
1375 goto done;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1376
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1377 dp->df_lnum[idx_orig] = lnum_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1378 dp->df_count[idx_orig] = count_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1379 dp->df_lnum[idx_new] = lnum_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1380 dp->df_count[idx_new] = count_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1381
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1382 /* Set values for other buffers, these must be equal to the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1383 * original buffer, otherwise there would have been a change
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1384 * already. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1385 for (i = idx_orig + 1; i < idx_new; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1386 if (curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1387 diff_copy_entry(dprev, dp, idx_orig, i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1388 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1389 notset = FALSE; /* "*dp" has been set */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1390 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1391
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1392 /* for remaining diff blocks orig and new are equal */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1393 while (dp != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1394 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1395 if (notset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1396 diff_copy_entry(dprev, dp, idx_orig, idx_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1397 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1398 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1399 notset = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1400 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1401
840
2c885fab04e3 updated for version 7.0e06
vimboss
parents: 835
diff changeset
1402 done:
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1403 fclose(fd);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1404 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1405
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1406 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1407 * Copy an entry at "dp" from "idx_orig" to "idx_new".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1408 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1409 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1410 diff_copy_entry(dprev, dp, idx_orig, idx_new)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1411 diff_T *dprev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1412 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1413 int idx_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1414 int idx_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1415 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1416 long off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1417
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1418 if (dprev == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1419 off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1420 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1421 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1422 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1423 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1424 dp->df_count[idx_new] = dp->df_count[idx_orig];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1425 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1426
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1427 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1428 * Clear the list of diffblocks for tab page "tp".
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1429 */
358
e111db373ca4 updated for version 7.0093
vimboss
parents: 193
diff changeset
1430 void
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1431 diff_clear(tp)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1432 tabpage_T *tp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1433 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1434 diff_T *p, *next_p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1435
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1436 for (p = tp->tp_first_diff; p != NULL; p = next_p)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1437 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1438 next_p = p->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1439 vim_free(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1440 }
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1441 tp->tp_first_diff = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1442 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1443
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1444 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1445 * Check diff status for line "lnum" in buffer "buf":
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1446 * Returns 0 for nothing special
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1447 * Returns -1 for a line that should be highlighted as changed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1448 * Returns -2 for a line that should be highlighted as added/deleted.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1449 * Returns > 0 for inserting that many filler lines above it (never happens
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1450 * when 'diffopt' doesn't contain "filler").
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1451 * This should only be used for windows where 'diff' is set.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1452 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1453 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1454 diff_check(wp, lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1455 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1456 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1457 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1458 int idx; /* index in tp_diffbuf[] for this buffer */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1459 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1460 int maxcount;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1461 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1462 buf_T *buf = wp->w_buffer;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1463 int cmp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1464
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1465 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1466 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1467
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1468 if (curtab->tp_first_diff == NULL || !wp->w_p_diff) /* no diffs at all */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1469 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1470
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1471 /* safety check: "lnum" must be a buffer line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1472 if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1473 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1474
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1475 idx = diff_buf_idx(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1476 if (idx == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1477 return 0; /* no diffs for buffer "buf" */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1478
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1479 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1480 /* A closed fold never has filler lines. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1481 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1482 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1483 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1484
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1485 /* search for a change that includes "lnum" in the list of diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1486 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1487 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1488 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1489 if (dp == NULL || lnum < dp->df_lnum[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1490 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1491
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1492 if (lnum < dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1493 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1494 int zero = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1495
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1496 /* Changed or inserted line. If the other buffers have a count of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1497 * zero, the lines were inserted. If the other buffers have the same
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1498 * count, check if the lines are identical. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1499 cmp = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1500 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1501 if (i != idx && curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1502 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1503 if (dp->df_count[i] == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1504 zero = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1505 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1506 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1507 if (dp->df_count[i] != dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1508 return -1; /* nr of lines changed. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1509 cmp = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1510 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1511 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1512 if (cmp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1513 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1514 /* Compare all lines. If they are equal the lines were inserted
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1515 * in some buffers, deleted in others, but not changed. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1516 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1517 if (i != idx && curtab->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1518 if (!diff_equal_entry(dp, idx, i))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1519 return -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1520 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1521 /* If there is no buffer with zero lines then there is no difference
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1522 * any longer. Happens when making a change (or undo) that removes
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1523 * the difference. Can't remove the entry here, we might be halfway
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1524 * updating the window. Just report the text as unchanged. Other
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1525 * windows might still show the change though. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1526 if (zero == FALSE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1527 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1528 return -2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1529 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1530
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1531 /* If 'diffopt' doesn't contain "filler", return 0. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1532 if (!(diff_flags & DIFF_FILLER))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1533 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1534
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1535 /* Insert filler lines above the line just below the change. Will return
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1536 * 0 when this buf had the max count. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1537 maxcount = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1538 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1539 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1540 maxcount = dp->df_count[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1541 return maxcount - dp->df_count[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1542 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1543
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1544 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1545 * Compare two entries in diff "*dp" and return TRUE if they are equal.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1546 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1547 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1548 diff_equal_entry(dp, idx1, idx2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1549 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1550 int idx1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1551 int idx2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1552 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1553 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1554 char_u *line;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1555 int cmp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1556
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1557 if (dp->df_count[idx1] != dp->df_count[idx2])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1558 return FALSE;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1559 if (diff_check_sanity(curtab, dp) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1560 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1561 for (i = 0; i < dp->df_count[idx1]; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1562 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1563 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1],
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1564 dp->df_lnum[idx1] + i, FALSE));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1565 if (line == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1566 return FALSE;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1567 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2],
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1568 dp->df_lnum[idx2] + i, FALSE));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1569 vim_free(line);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1570 if (cmp != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1571 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1572 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1573 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1574 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1575
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1576 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1577 * Compare strings "s1" and "s2" according to 'diffopt'.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1578 * Return non-zero when they are different.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1579 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1580 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1581 diff_cmp(s1, s2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1582 char_u *s1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1583 char_u *s2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1584 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1585 char_u *p1, *p2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1586 #ifdef FEAT_MBYTE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1587 int l;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1588 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1589
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1590 if ((diff_flags & (DIFF_ICASE | DIFF_IWHITE)) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1591 return STRCMP(s1, s2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1592 if ((diff_flags & DIFF_ICASE) && !(diff_flags & DIFF_IWHITE))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1593 return MB_STRICMP(s1, s2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1594
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1595 /* Ignore white space changes and possibly ignore case. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1596 p1 = s1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1597 p2 = s2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1598 while (*p1 != NUL && *p2 != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1599 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1600 if (vim_iswhite(*p1) && vim_iswhite(*p2))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1601 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1602 p1 = skipwhite(p1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1603 p2 = skipwhite(p2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1604 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1605 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1606 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1607 #ifdef FEAT_MBYTE
474
a5fcf36ef512 updated for version 7.0127
vimboss
parents: 449
diff changeset
1608 l = (*mb_ptr2len)(p1);
a5fcf36ef512 updated for version 7.0127
vimboss
parents: 449
diff changeset
1609 if (l != (*mb_ptr2len)(p2))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1610 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1611 if (l > 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1612 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1613 if (STRNCMP(p1, p2, l) != 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1614 && (!enc_utf8
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1615 || !(diff_flags & DIFF_ICASE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1616 || utf_fold(utf_ptr2char(p1))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1617 != utf_fold(utf_ptr2char(p2))))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1618 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1619 p1 += l;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1620 p2 += l;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1621 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1622 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1623 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1624 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1625 if (*p1 != *p2 && (!(diff_flags & DIFF_ICASE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1626 || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1627 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1628 ++p1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1629 ++p2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1630 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1631 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1632 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1633
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1634 /* Ignore trailing white space. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1635 p1 = skipwhite(p1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1636 p2 = skipwhite(p2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1637 if (*p1 != NUL || *p2 != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1638 return 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1639 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1640 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1641
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1642 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1643 * Return the number of filler lines above "lnum".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1644 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1645 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1646 diff_check_fill(wp, lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1647 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1648 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1649 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1650 int n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1651
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1652 /* be quick when there are no filler lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1653 if (!(diff_flags & DIFF_FILLER))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1654 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1655 n = diff_check(wp, lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1656 if (n <= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1657 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1658 return n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1659 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1660
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1661 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1662 * Set the topline of "towin" to match the position in "fromwin", so that they
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1663 * show the same diff'ed lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1664 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1665 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1666 diff_set_topline(fromwin, towin)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1667 win_T *fromwin;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1668 win_T *towin;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1669 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1670 buf_T *frombuf = fromwin->w_buffer;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1671 linenr_T lnum = fromwin->w_topline;
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1672 int fromidx;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1673 int toidx;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1674 diff_T *dp;
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1675 int max_count;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1676 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1677
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1678 fromidx = diff_buf_idx(frombuf);
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1679 if (fromidx == DB_COUNT)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1680 return; /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1681
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1682 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1683 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1684
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1685 towin->w_topfill = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1686
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1687 /* search for a change that includes "lnum" in the list of diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1688 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1689 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1690 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1691 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1692 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1693 /* After last change, compute topline relative to end of file; no
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1694 * filler lines. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1695 towin->w_topline = towin->w_buffer->b_ml.ml_line_count
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1696 - (frombuf->b_ml.ml_line_count - lnum);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1697 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1698 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1699 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1700 /* Find index for "towin". */
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1701 toidx = diff_buf_idx(towin->w_buffer);
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1702 if (toidx == DB_COUNT)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1703 return; /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1704
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1705 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]);
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1706 if (lnum >= dp->df_lnum[fromidx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1707 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1708 /* Inside a change: compute filler lines. With three or more
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1709 * buffers we need to know the largest count. */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1710 max_count = 0;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1711 for (i = 0; i < DB_COUNT; ++i)
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1712 if (curtab->tp_diffbuf[i] != NULL
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1713 && max_count < dp->df_count[i])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1714 max_count = dp->df_count[i];
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1715
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1716 if (dp->df_count[toidx] == dp->df_count[fromidx])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1717 {
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1718 /* same number of lines: use same filler count */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1719 towin->w_topfill = fromwin->w_topfill;
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1720 }
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1721 else if (dp->df_count[toidx] > dp->df_count[fromidx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1722 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1723 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1724 {
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1725 /* more lines in towin and fromwin doesn't show diff
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1726 * lines, only filler lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1727 if (max_count - fromwin->w_topfill >= dp->df_count[toidx])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1728 {
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1729 /* towin also only shows filler lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1730 towin->w_topline = dp->df_lnum[toidx]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1731 + dp->df_count[toidx];
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1732 towin->w_topfill = fromwin->w_topfill;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1733 }
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1734 else
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1735 /* towin still has some diff lines to show */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1736 towin->w_topline = dp->df_lnum[toidx]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1737 + max_count - fromwin->w_topfill;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1738 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1739 }
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1740 else if (towin->w_topline >= dp->df_lnum[toidx]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1741 + dp->df_count[toidx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1742 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1743 /* less lines in towin and no diff lines to show: compute
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1744 * filler lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1745 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx];
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1746 if (diff_flags & DIFF_FILLER)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1747 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1748 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1749 /* fromwin is also out of diff lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1750 towin->w_topfill = fromwin->w_topfill;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1751 else
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1752 /* fromwin has some diff lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1753 towin->w_topfill = dp->df_lnum[fromidx]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1754 + max_count - lnum;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1755 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1756 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1757 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1758 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1759
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1760 /* safety check (if diff info gets outdated strange things may happen) */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1761 towin->w_botfill = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1762 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1763 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1764 towin->w_topline = towin->w_buffer->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1765 towin->w_botfill = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1766 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1767 if (towin->w_topline < 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1768 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1769 towin->w_topline = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1770 towin->w_topfill = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1771 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1772
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1773 /* When w_topline changes need to recompute w_botline and cursor position */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1774 invalidate_botline_win(towin);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1775 changed_line_abv_curs_win(towin);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1776
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1777 check_topfill(towin, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1778 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1779 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1780 NULL, TRUE, NULL);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1781 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1782 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1783
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1784 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1785 * This is called when 'diffopt' is changed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1786 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1787 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1788 diffopt_changed()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1789 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1790 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1791 int diff_context_new = 6;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1792 int diff_flags_new = 0;
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1793 int diff_foldcolumn_new = 2;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1794 tabpage_T *tp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1795
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1796 p = p_dip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1797 while (*p != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1798 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1799 if (STRNCMP(p, "filler", 6) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1800 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1801 p += 6;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1802 diff_flags_new |= DIFF_FILLER;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1803 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1804 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8]))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1805 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1806 p += 8;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1807 diff_context_new = getdigits(&p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1808 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1809 else if (STRNCMP(p, "icase", 5) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1810 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1811 p += 5;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1812 diff_flags_new |= DIFF_ICASE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1813 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1814 else if (STRNCMP(p, "iwhite", 6) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1815 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1816 p += 6;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1817 diff_flags_new |= DIFF_IWHITE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1818 }
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1819 else if (STRNCMP(p, "horizontal", 10) == 0)
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1820 {
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1821 p += 10;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1822 diff_flags_new |= DIFF_HORIZONTAL;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1823 }
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1824 else if (STRNCMP(p, "vertical", 8) == 0)
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1825 {
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1826 p += 8;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1827 diff_flags_new |= DIFF_VERTICAL;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1828 }
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1829 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11]))
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1830 {
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1831 p += 11;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1832 diff_foldcolumn_new = getdigits(&p);
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1833 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1834 if (*p != ',' && *p != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1835 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1836 if (*p == ',')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1837 ++p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1838 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1839
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1840 /* Can't have both "horizontal" and "vertical". */
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1841 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL))
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1842 return FAIL;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1843
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1844 /* If "icase" or "iwhite" was added or removed, need to update the diff. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1845 if (diff_flags != diff_flags_new)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1846 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1847 tp->tp_diff_invalid = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1848
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1849 diff_flags = diff_flags_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1850 diff_context = diff_context_new;
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1851 diff_foldcolumn = diff_foldcolumn_new;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1852
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1853 diff_redraw(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1854
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1855 /* recompute the scroll binding with the new option value, may
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1856 * remove or add filler lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1857 check_scrollbind((linenr_T)0, 0L);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1858
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1859 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1860 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1861
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1862 /*
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1863 * Return TRUE if 'diffopt' contains "horizontal".
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1864 */
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1865 int
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1866 diffopt_horizontal()
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1867 {
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1868 return (diff_flags & DIFF_HORIZONTAL) != 0;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1869 }
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1870
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1871 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1872 * Find the difference within a changed line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1873 * Returns TRUE if the line was added, no other buffer has it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1874 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1875 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1876 diff_find_change(wp, lnum, startp, endp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1877 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1878 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1879 int *startp; /* first char of the change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1880 int *endp; /* last char of the change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1881 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1882 char_u *line_org;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1883 char_u *line_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1884 int i;
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1885 int si_org, si_new;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1886 int ei_org, ei_new;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1887 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1888 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1889 int off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1890 int added = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1891
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1892 /* Make a copy of the line, the next ml_get() will invalidate it. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1893 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1894 if (line_org == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1895 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1896
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1897 idx = diff_buf_idx(wp->w_buffer);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1898 if (idx == DB_COUNT) /* cannot happen */
1074
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
1899 {
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
1900 vim_free(line_org);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1901 return FALSE;
1074
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
1902 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1903
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1904 /* search for a change that includes "lnum" in the list of diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1905 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1906 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1907 break;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1908 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
1074
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
1909 {
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
1910 vim_free(line_org);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1911 return FALSE;
1074
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
1912 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1913
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1914 off = lnum - dp->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1915
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1916 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1917 if (curtab->tp_diffbuf[i] != NULL && i != idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1918 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1919 /* Skip lines that are not in the other change (filler lines). */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1920 if (off >= dp->df_count[i])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1921 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1922 added = FALSE;
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1923 line_new = ml_get_buf(curtab->tp_diffbuf[i],
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1924 dp->df_lnum[i] + off, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1925
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1926 /* Search for start of difference */
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1927 si_org = si_new = 0;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1928 while (line_org[si_org] != NUL)
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1929 {
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1930 if ((diff_flags & DIFF_IWHITE)
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1931 && vim_iswhite(line_org[si_org])
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1932 && vim_iswhite(line_new[si_new]))
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1933 {
835
8bebcabccc2c updated for version 7.0e01
vimboss
parents: 829
diff changeset
1934 si_org = (int)(skipwhite(line_org + si_org) - line_org);
8bebcabccc2c updated for version 7.0e01
vimboss
parents: 829
diff changeset
1935 si_new = (int)(skipwhite(line_new + si_new) - line_new);
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1936 }
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1937 else
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1938 {
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1939 if (line_org[si_org] != line_new[si_new])
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1940 break;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1941 ++si_org;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1942 ++si_new;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1943 }
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1944 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1945 #ifdef FEAT_MBYTE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1946 if (has_mbyte)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1947 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1948 /* Move back to first byte of character in both lines (may
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1949 * have "nn^" in line_org and "n^ in line_new). */
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1950 si_org -= (*mb_head_off)(line_org, line_org + si_org);
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1951 si_new -= (*mb_head_off)(line_new, line_new + si_new);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1952 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1953 #endif
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1954 if (*startp > si_org)
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1955 *startp = si_org;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1956
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1957 /* Search for end of difference, if any. */
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1958 if (line_org[si_org] != NUL || line_new[si_new] != NUL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1959 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1960 ei_org = (int)STRLEN(line_org);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1961 ei_new = (int)STRLEN(line_new);
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1962 while (ei_org >= *startp && ei_new >= si_new
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1963 && ei_org >= 0 && ei_new >= 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1964 {
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1965 if ((diff_flags & DIFF_IWHITE)
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1966 && vim_iswhite(line_org[ei_org])
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1967 && vim_iswhite(line_new[ei_new]))
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1968 {
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1969 while (ei_org >= *startp
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1970 && vim_iswhite(line_org[ei_org]))
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1971 --ei_org;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1972 while (ei_new >= si_new
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1973 && vim_iswhite(line_new[ei_new]))
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1974 --ei_new;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1975 }
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1976 else
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1977 {
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1978 if (line_org[ei_org] != line_new[ei_new])
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1979 break;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1980 --ei_org;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1981 --ei_new;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1982 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1983 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1984 if (*endp < ei_org)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1985 *endp = ei_org;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1986 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1987 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1988
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1989 vim_free(line_org);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1990 return added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1991 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1992
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1993 #if defined(FEAT_FOLDING) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1994 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1995 * Return TRUE if line "lnum" is not close to a diff block, this line should
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1996 * be in a fold.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1997 * Return FALSE if there are no diff blocks at all in this window.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1998 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1999 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2000 diff_infold(wp, lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2001 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2002 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2003 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2004 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2005 int idx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2006 int other = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2007 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2008
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2009 /* Return if 'diff' isn't set. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2010 if (!wp->w_p_diff)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2011 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2012
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2013 for (i = 0; i < DB_COUNT; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2014 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2015 if (curtab->tp_diffbuf[i] == wp->w_buffer)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2016 idx = i;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2017 else if (curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2018 other = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2019 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2020
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2021 /* return here if there are no diffs in the window */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2022 if (idx == -1 || !other)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2023 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2024
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2025 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2026 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2027
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2028 /* Return if there are no diff blocks. All lines will be folded. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2029 if (curtab->tp_first_diff == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2030 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2031
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2032 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2033 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2034 /* If this change is below the line there can't be any further match. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2035 if (dp->df_lnum[idx] - diff_context > lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2036 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2037 /* If this change ends before the line we have a match. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2038 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2039 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2040 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2041 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2042 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2043 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2044
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2045 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2046 * "dp" and "do" commands.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2047 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2048 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2049 nv_diffgetput(put)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2050 int put;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2051 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2052 exarg_T ea;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2053
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2054 ea.arg = (char_u *)"";
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2055 if (put)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2056 ea.cmdidx = CMD_diffput;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2057 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2058 ea.cmdidx = CMD_diffget;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2059 ea.addr_count = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2060 ea.line1 = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2061 ea.line2 = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2062 ex_diffgetput(&ea);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2063 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2064
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2065 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2066 * ":diffget"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2067 * ":diffput"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2068 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2069 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2070 ex_diffgetput(eap)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2071 exarg_T *eap;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2072 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2073 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2074 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2075 linenr_T off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2076 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2077 diff_T *dprev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2078 diff_T *dfree;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2079 int idx_cur;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2080 int idx_other;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2081 int idx_from;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2082 int idx_to;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2083 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2084 int added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2085 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2086 aco_save_T aco;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2087 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2088 int start_skip, end_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2089 int new_count;
648
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2090 int buf_empty;
1075
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2091 int found_not_ma = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2092
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2093 /* Find the current buffer in the list of diff buffers. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2094 idx_cur = diff_buf_idx(curbuf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2095 if (idx_cur == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2096 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2097 EMSG(_("E99: Current buffer is not in diff mode"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2098 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2099 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2100
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2101 if (*eap->arg == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2102 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2103 /* No argument: Find the other buffer in the list of diff buffers. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2104 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2105 if (curtab->tp_diffbuf[idx_other] != curbuf
1075
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2106 && curtab->tp_diffbuf[idx_other] != NULL)
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2107 {
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2108 if (eap->cmdidx != CMD_diffput
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2109 || curtab->tp_diffbuf[idx_other]->b_p_ma)
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2110 break;
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2111 found_not_ma = TRUE;
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2112 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2113 if (idx_other == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2114 {
1075
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2115 if (found_not_ma)
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2116 EMSG(_("E793: No other buffer in diff mode is modifiable"));
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2117 else
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2118 EMSG(_("E100: No other buffer in diff mode"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2119 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2120 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2121
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2122 /* Check that there isn't a third buffer in the list */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2123 for (i = idx_other + 1; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2124 if (curtab->tp_diffbuf[i] != curbuf
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2125 && curtab->tp_diffbuf[i] != NULL
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2126 && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2127 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2128 EMSG(_("E101: More than two buffers in diff mode, don't know which one to use"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2129 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2130 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2131 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2132 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2133 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2134 /* Buffer number or pattern given. Ignore trailing white space. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2135 p = eap->arg + STRLEN(eap->arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2136 while (p > eap->arg && vim_iswhite(p[-1]))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2137 --p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2138 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2139 ;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2140 if (eap->arg + i == p) /* digits only */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2141 i = atol((char *)eap->arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2142 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2143 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2144 i = buflist_findpat(eap->arg, p, FALSE, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2145 if (i < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2146 return; /* error message already given */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2147 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2148 buf = buflist_findnr(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2149 if (buf == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2150 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2151 EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2152 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2153 }
1788
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
2154 if (buf == curbuf)
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
2155 return; /* nothing to do */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2156 idx_other = diff_buf_idx(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2157 if (idx_other == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2158 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2159 EMSG2(_("E103: Buffer \"%s\" is not in diff mode"), eap->arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2160 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2161 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2162 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2163
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2164 diff_busy = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2165
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2166 /* When no range given include the line above or below the cursor. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2167 if (eap->addr_count == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2168 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2169 /* Make it possible that ":diffget" on the last line gets line below
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2170 * the cursor line when there is no difference above the cursor. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2171 if (eap->cmdidx == CMD_diffget
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2172 && eap->line1 == curbuf->b_ml.ml_line_count
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2173 && diff_check(curwin, eap->line1) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2174 && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2175 ++eap->line2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2176 else if (eap->line1 > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2177 --eap->line1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2178 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2179
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2180 if (eap->cmdidx == CMD_diffget)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2181 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2182 idx_from = idx_other;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2183 idx_to = idx_cur;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2184 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2185 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2186 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2187 idx_from = idx_cur;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2188 idx_to = idx_other;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2189 /* Need to make the other buffer the current buffer to be able to make
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2190 * changes in it. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2191 /* set curwin/curbuf to buf and save a few things */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2192 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2193 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2194
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2195 /* May give the warning for a changed buffer here, which can trigger the
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2196 * FileChangedRO autocommand, which may do nasty things and mess
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2197 * everything up. */
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2198 if (!curbuf->b_changed)
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2199 {
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2200 change_warning(0);
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2201 if (diff_buf_idx(curbuf) != idx_to)
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2202 {
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2203 EMSG(_("E787: Buffer changed unexpectedly"));
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2204 return;
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2205 }
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2206 }
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2207
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2208 dprev = NULL;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2209 for (dp = curtab->tp_first_diff; dp != NULL; )
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2210 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2211 if (dp->df_lnum[idx_cur] > eap->line2 + off)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2212 break; /* past the range that was specified */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2213
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2214 dfree = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2215 lnum = dp->df_lnum[idx_to];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2216 count = dp->df_count[idx_to];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2217 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2218 && u_save(lnum - 1, lnum + count) != FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2219 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2220 /* Inside the specified range and saving for undo worked. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2221 start_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2222 end_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2223 if (eap->addr_count > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2224 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2225 /* A range was specified: check if lines need to be skipped. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2226 start_skip = eap->line1 + off - dp->df_lnum[idx_cur];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2227 if (start_skip > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2228 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2229 /* range starts below start of current diff block */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2230 if (start_skip > count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2231 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2232 lnum += count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2233 count = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2234 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2235 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2236 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2237 count -= start_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2238 lnum += start_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2239 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2240 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2241 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2242 start_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2243
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2244 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2245 - (eap->line2 + off);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2246 if (end_skip > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2247 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2248 /* range ends above end of current/from diff block */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2249 if (idx_cur == idx_from) /* :diffput */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2250 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2251 i = dp->df_count[idx_cur] - start_skip - end_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2252 if (count > i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2253 count = i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2254 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2255 else /* :diffget */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2256 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2257 count -= end_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2258 end_skip = dp->df_count[idx_from] - start_skip - count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2259 if (end_skip < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2260 end_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2261 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2262 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2263 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2264 end_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2265 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2266
648
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2267 buf_empty = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2268 added = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2269 for (i = 0; i < count; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2270 {
648
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2271 /* remember deleting the last line of the buffer */
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2272 buf_empty = curbuf->b_ml.ml_line_count == 1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2273 ml_delete(lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2274 --added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2275 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2276 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2277 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2278 linenr_T nr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2279
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2280 nr = dp->df_lnum[idx_from] + start_skip + i;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2281 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2282 break;
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2283 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from],
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2284 nr, FALSE));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2285 if (p != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2286 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2287 ml_append(lnum + i - 1, p, 0, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2288 vim_free(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2289 ++added;
648
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2290 if (buf_empty && curbuf->b_ml.ml_line_count == 2)
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2291 {
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2292 /* Added the first line into an empty buffer, need to
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2293 * delete the dummy empty line. */
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2294 buf_empty = FALSE;
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2295 ml_delete((linenr_T)2, FALSE);
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2296 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2297 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2298 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2299 new_count = dp->df_count[idx_to] + added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2300 dp->df_count[idx_to] = new_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2301
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2302 if (start_skip == 0 && end_skip == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2303 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2304 /* Check if there are any other buffers and if the diff is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2305 * equal in them. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2306 for (i = 0; i < DB_COUNT; ++i)
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2307 if (curtab->tp_diffbuf[i] != NULL && i != idx_from
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2308 && i != idx_to
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2309 && !diff_equal_entry(dp, idx_from, i))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2310 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2311 if (i == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2312 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2313 /* delete the diff entry, the buffers are now equal here */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2314 dfree = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2315 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2316 if (dprev == NULL)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2317 curtab->tp_first_diff = dp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2318 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2319 dprev->df_next = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2320 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2321 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2322
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2323 /* Adjust marks. This will change the following entries! */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2324 if (added != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2325 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2326 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2327 if (curwin->w_cursor.lnum >= lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2328 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2329 /* Adjust the cursor position if it's in/after the changed
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2330 * lines. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2331 if (curwin->w_cursor.lnum >= lnum + count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2332 curwin->w_cursor.lnum += added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2333 else if (added < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2334 curwin->w_cursor.lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2335 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2336 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2337 changed_lines(lnum, 0, lnum + count, (long)added);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2338
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2339 if (dfree != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2340 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2341 /* Diff is deleted, update folds in other windows. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2342 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2343 diff_fold_update(dfree, idx_to);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2344 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2345 vim_free(dfree);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2346 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2347 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2348 /* mark_adjust() may have changed the count in a wrong way */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2349 dp->df_count[idx_to] = new_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2350
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2351 /* When changing the current buffer, keep track of line numbers */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2352 if (idx_cur == idx_to)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2353 off += added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2354 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2355
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2356 /* If before the range or not deleted, go to next diff. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2357 if (dfree == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2358 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2359 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2360 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2361 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2362 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2363
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2364 /* restore curwin/curbuf and a few other things */
2445
04dae202d316 Fixes for coverity warnings.
Bram Moolenaar <bram@vim.org>
parents: 2250
diff changeset
2365 if (eap->cmdidx != CMD_diffget)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2366 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2367 /* Syncing undo only works for the current buffer, but we change
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2368 * another buffer. Sync undo if the command was typed. This isn't
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2369 * 100% right when ":diffput" is used in a function or mapping. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2370 if (KeyTyped)
825
6675076019ae updated for version 7.0d
vimboss
parents: 819
diff changeset
2371 u_sync(FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2372 aucmd_restbuf(&aco);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2373 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2374
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2375 diff_busy = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2376
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2377 /* Check that the cursor is on a valid character and update it's position.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2378 * When there were filler lines the topline has become invalid. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2379 check_cursor();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2380 changed_line_abv_curs();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2381
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2382 /* Also need to redraw the other buffers. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2383 diff_redraw(FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2384 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2385
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2386 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2387 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2388 * Update folds for all diff buffers for entry "dp".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2389 * Skip buffer with index "skip_idx".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2390 * When there are no diffs, all folds are removed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2391 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2392 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2393 diff_fold_update(dp, skip_idx)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2394 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2395 int skip_idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2396 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2397 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2398 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2399
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2400 for (wp = firstwin; wp != NULL; wp = wp->w_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2401 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2402 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2403 foldUpdate(wp, dp->df_lnum[i],
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2404 dp->df_lnum[i] + dp->df_count[i]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2405 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2406 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2407
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2408 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2409 * Return TRUE if buffer "buf" is in diff-mode.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2410 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2411 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2412 diff_mode_buf(buf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2413 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2414 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2415 tabpage_T *tp;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2416
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2417 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2418 if (diff_buf_idx_tp(buf, tp) != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2419 return TRUE;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2420 return FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2421 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2422
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2423 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2424 * Move "count" times in direction "dir" to the next diff block.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2425 * Return FAIL if there isn't such a diff block.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2426 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2427 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2428 diff_move_to(dir, count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2429 int dir;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2430 long count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2431 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2432 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2433 linenr_T lnum = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2434 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2435
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2436 idx = diff_buf_idx(curbuf);
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2437 if (idx == DB_COUNT || curtab->tp_first_diff == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2438 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2439
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2440 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2441 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2442
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2443 if (curtab->tp_first_diff == NULL) /* no diffs today */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2444 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2445
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2446 while (--count >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2447 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2448 /* Check if already before first diff. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2449 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2450 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2451
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2452 for (dp = curtab->tp_first_diff; ; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2453 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2454 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2455 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2456 if ((dir == FORWARD && lnum < dp->df_lnum[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2457 || (dir == BACKWARD
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2458 && (dp->df_next == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2459 || lnum <= dp->df_next->df_lnum[idx])))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2460 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2461 lnum = dp->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2462 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2463 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2464 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2465 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2466
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2467 /* don't end up past the end of the file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2468 if (lnum > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2469 lnum = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2470
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2471 /* When the cursor didn't move at all we fail. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2472 if (lnum == curwin->w_cursor.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2473 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2474
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2475 setpcmark();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2476 curwin->w_cursor.lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2477 curwin->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2478
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2479 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2480 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2481
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2482 #if defined(FEAT_CURSORBIND) || defined(PROTO)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2483 linenr_T
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2484 diff_get_corresponding_line(buf1, lnum1, buf2, lnum3)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2485 buf_T *buf1;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2486 linenr_T lnum1;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2487 buf_T *buf2;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2488 linenr_T lnum3;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2489 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2490 int idx1;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2491 int idx2;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2492 diff_T *dp;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2493 int baseline = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2494 linenr_T lnum2;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2495
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2496 idx1 = diff_buf_idx(buf1);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2497 idx2 = diff_buf_idx(buf2);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2498 if (idx1 == DB_COUNT || idx2 == DB_COUNT || curtab->tp_first_diff == NULL)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2499 return lnum1;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2500
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2501 if (curtab->tp_diff_invalid)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2502 ex_diffupdate(NULL); /* update after a big change */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2503
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2504 if (curtab->tp_first_diff == NULL) /* no diffs today */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2505 return lnum1;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2506
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2507 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2508 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2509 if (dp->df_lnum[idx1] > lnum1)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2510 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2511 lnum2 = lnum1 - baseline;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2512 /* don't end up past the end of the file */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2513 if (lnum2 > buf2->b_ml.ml_line_count)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2514 lnum2 = buf2->b_ml.ml_line_count;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2515
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2516 return lnum2;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2517 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2518 else if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2519 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2520 /* Inside the diffblock */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2521 baseline = lnum1 - dp->df_lnum[idx1];
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2522 if (baseline > dp->df_count[idx2])
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2523 baseline = dp->df_count[idx2];
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2524
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2525 return dp->df_lnum[idx2] + baseline;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2526 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2527 else if ( (dp->df_lnum[idx1] == lnum1)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2528 && (dp->df_count[idx1] == 0)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2529 && (dp->df_lnum[idx2] <= lnum3)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2530 && ((dp->df_lnum[idx2] + dp->df_count[idx2]) > lnum3))
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2531 /*
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2532 * Special case: if the cursor is just after a zero-count
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2533 * block (i.e. all filler) and the target cursor is already
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2534 * inside the corresponding block, leave the target cursor
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2535 * unmoved. This makes repeated CTRL-W W operations work
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2536 * as expected.
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2537 */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2538 return lnum3;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2539 baseline = (dp->df_lnum[idx1] + dp->df_count[idx1])
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2540 - (dp->df_lnum[idx2] + dp->df_count[idx2]);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2541 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2542
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2543 /* If we get here then the cursor is after the last diff */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2544 lnum2 = lnum1 - baseline;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2545 /* don't end up past the end of the file */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2546 if (lnum2 > buf2->b_ml.ml_line_count)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2547 lnum2 = buf2->b_ml.ml_line_count;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2548
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2549 return lnum2;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2550 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2551 #endif
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2552
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2553 #if defined(FEAT_FOLDING) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2554 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2555 * For line "lnum" in the current window find the equivalent lnum in window
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2556 * "wp", compensating for inserted/deleted lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2557 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2558 linenr_T
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2559 diff_lnum_win(lnum, wp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2560 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2561 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2562 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2563 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2564 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2565 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2566 linenr_T n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2567
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2568 idx = diff_buf_idx(curbuf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2569 if (idx == DB_COUNT) /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2570 return (linenr_T)0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2571
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2572 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2573 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2574
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2575 /* search for a change that includes "lnum" in the list of diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2576 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2577 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2578 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2579
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2580 /* When after the last change, compute relative to the last line number. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2581 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2582 return wp->w_buffer->b_ml.ml_line_count
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2583 - (curbuf->b_ml.ml_line_count - lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2584
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2585 /* Find index for "wp". */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2586 i = diff_buf_idx(wp->w_buffer);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2587 if (i == DB_COUNT) /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2588 return (linenr_T)0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2589
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2590 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2591 if (n > dp->df_lnum[i] + dp->df_count[i])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2592 n = dp->df_lnum[i] + dp->df_count[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2593 return n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2594 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2595 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2596
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2597 #endif /* FEAT_DIFF */