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