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