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