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