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