Use 7.2a "spell" folder (and remove all extra spell files)
[MacVim.git] / src / diff.c
blob8bf0ed81b1583997f5d3808826d31c7782c049ce
1 /* vim:set ts=8 sts=4 sw=4:
3 * VIM - Vi IMproved by Bram Moolenaar
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 */
11 * diff.c: code for diff'ing two or three buffers.
14 #include "vim.h"
16 #if defined(FEAT_DIFF) || defined(PROTO)
18 static int diff_busy = FALSE; /* ex_diffgetput() is busy */
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;
28 #define LBUFLEN 50 /* length of line in diff file */
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
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));
55 #ifndef USE_CR
56 # define tag_fgets vim_fgets
57 #endif
60 * Called when deleting or unloading a buffer: No longer make a diff with it.
62 void
63 diff_buf_delete(buf)
64 buf_T *buf;
66 int i;
67 tabpage_T *tp;
69 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
71 i = diff_buf_idx_tp(buf, tp);
72 if (i != DB_COUNT)
74 tp->tp_diffbuf[i] = NULL;
75 tp->tp_diff_invalid = TRUE;
81 * Check if the current buffer should be added to or removed from the list of
82 * diff buffers.
84 void
85 diff_buf_adjust(win)
86 win_T *win;
88 win_T *wp;
89 int i;
91 if (!win->w_p_diff)
93 /* When there is no window showing a diff for this buffer, remove
94 * it from the diffs. */
95 for (wp = firstwin; wp != NULL; wp = wp->w_next)
96 if (wp->w_buffer == win->w_buffer && wp->w_p_diff)
97 break;
98 if (wp == NULL)
100 i = diff_buf_idx(win->w_buffer);
101 if (i != DB_COUNT)
103 curtab->tp_diffbuf[i] = NULL;
104 curtab->tp_diff_invalid = TRUE;
108 else
109 diff_buf_add(win->w_buffer);
113 * Add a buffer to make diffs for.
114 * Call this when a new buffer is being edited in the current window where
115 * 'diff' is set.
116 * Marks the current buffer as being part of the diff and requireing updating.
117 * This must be done before any autocmd, because a command may use info
118 * about the screen contents.
120 void
121 diff_buf_add(buf)
122 buf_T *buf;
124 int i;
126 if (diff_buf_idx(buf) != DB_COUNT)
127 return; /* It's already there. */
129 for (i = 0; i < DB_COUNT; ++i)
130 if (curtab->tp_diffbuf[i] == NULL)
132 curtab->tp_diffbuf[i] = buf;
133 curtab->tp_diff_invalid = TRUE;
134 return;
137 EMSGN(_("E96: Can not diff more than %ld buffers"), DB_COUNT);
141 * Find buffer "buf" in the list of diff buffers for the current tab page.
142 * Return its index or DB_COUNT if not found.
144 static int
145 diff_buf_idx(buf)
146 buf_T *buf;
148 int idx;
150 for (idx = 0; idx < DB_COUNT; ++idx)
151 if (curtab->tp_diffbuf[idx] == buf)
152 break;
153 return idx;
157 * Find buffer "buf" in the list of diff buffers for tab page "tp".
158 * Return its index or DB_COUNT if not found.
160 static int
161 diff_buf_idx_tp(buf, tp)
162 buf_T *buf;
163 tabpage_T *tp;
165 int idx;
167 for (idx = 0; idx < DB_COUNT; ++idx)
168 if (tp->tp_diffbuf[idx] == buf)
169 break;
170 return idx;
174 * Mark the diff info involving buffer "buf" as invalid, it will be updated
175 * when info is requested.
177 void
178 diff_invalidate(buf)
179 buf_T *buf;
181 tabpage_T *tp;
182 int i;
184 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
186 i = diff_buf_idx_tp(buf, tp);
187 if (i != DB_COUNT)
189 tp->tp_diff_invalid = TRUE;
190 if (tp == curtab)
191 diff_redraw(TRUE);
197 * Called by mark_adjust(): update line numbers in "curbuf".
199 void
200 diff_mark_adjust(line1, line2, amount, amount_after)
201 linenr_T line1;
202 linenr_T line2;
203 long amount;
204 long amount_after;
206 int idx;
207 tabpage_T *tp;
209 /* Handle all tab pages that use the current buffer in a diff. */
210 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
212 idx = diff_buf_idx_tp(curbuf, tp);
213 if (idx != DB_COUNT)
214 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after);
219 * Update line numbers in tab page "tp" for "curbuf" with index "idx".
220 * This attempts to update the changes as much as possible:
221 * When inserting/deleting lines outside of existing change blocks, create a
222 * new change block and update the line numbers in following blocks.
223 * When inserting/deleting lines in existing change blocks, update them.
225 static void
226 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after)
227 tabpage_T *tp;
228 int idx;
229 linenr_T line1;
230 linenr_T line2;
231 long amount;
232 long amount_after;
234 diff_T *dp;
235 diff_T *dprev;
236 diff_T *dnext;
237 int i;
238 int inserted, deleted;
239 int n, off;
240 linenr_T last;
241 linenr_T lnum_deleted = line1; /* lnum of remaining deletion */
242 int check_unchanged;
244 if (line2 == MAXLNUM)
246 /* mark_adjust(99, MAXLNUM, 9, 0): insert lines */
247 inserted = amount;
248 deleted = 0;
250 else if (amount_after > 0)
252 /* mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines*/
253 inserted = amount_after;
254 deleted = 0;
256 else
258 /* mark_adjust(98, 99, MAXLNUM, -2): delete lines */
259 inserted = 0;
260 deleted = -amount_after;
263 dprev = NULL;
264 dp = tp->tp_first_diff;
265 for (;;)
267 /* If the change is after the previous diff block and before the next
268 * diff block, thus not touching an existing change, create a new diff
269 * block. Don't do this when ex_diffgetput() is busy. */
270 if ((dp == NULL || dp->df_lnum[idx] - 1 > line2
271 || (line2 == MAXLNUM && dp->df_lnum[idx] > line1))
272 && (dprev == NULL
273 || dprev->df_lnum[idx] + dprev->df_count[idx] < line1)
274 && !diff_busy)
276 dnext = diff_alloc_new(tp, dprev, dp);
277 if (dnext == NULL)
278 return;
280 dnext->df_lnum[idx] = line1;
281 dnext->df_count[idx] = inserted;
282 for (i = 0; i < DB_COUNT; ++i)
283 if (tp->tp_diffbuf[i] != NULL && i != idx)
285 if (dprev == NULL)
286 dnext->df_lnum[i] = line1;
287 else
288 dnext->df_lnum[i] = line1
289 + (dprev->df_lnum[i] + dprev->df_count[i])
290 - (dprev->df_lnum[idx] + dprev->df_count[idx]);
291 dnext->df_count[i] = deleted;
295 /* if at end of the list, quit */
296 if (dp == NULL)
297 break;
300 * Check for these situations:
301 * 1 2 3
302 * 1 2 3
303 * line1 2 3 4 5
304 * 2 3 4 5
305 * 2 3 4 5
306 * line2 2 3 4 5
307 * 3 5 6
308 * 3 5 6
310 /* compute last line of this change */
311 last = dp->df_lnum[idx] + dp->df_count[idx] - 1;
313 /* 1. change completely above line1: nothing to do */
314 if (last >= line1 - 1)
316 /* 6. change below line2: only adjust for amount_after; also when
317 * "deleted" became zero when deleted all lines between two diffs */
318 if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2)
320 if (amount_after == 0)
321 break; /* nothing left to change */
322 dp->df_lnum[idx] += amount_after;
324 else
326 check_unchanged = FALSE;
328 /* 2. 3. 4. 5.: inserted/deleted lines touching this diff. */
329 if (deleted > 0)
331 if (dp->df_lnum[idx] >= line1)
333 off = dp->df_lnum[idx] - lnum_deleted;
334 if (last <= line2)
336 /* 4. delete all lines of diff */
337 if (dp->df_next != NULL
338 && dp->df_next->df_lnum[idx] - 1 <= line2)
340 /* delete continues in next diff, only do
341 * lines until that one */
342 n = dp->df_next->df_lnum[idx] - lnum_deleted;
343 deleted -= n;
344 n -= dp->df_count[idx];
345 lnum_deleted = dp->df_next->df_lnum[idx];
347 else
348 n = deleted - dp->df_count[idx];
349 dp->df_count[idx] = 0;
351 else
353 /* 5. delete lines at or just before top of diff */
354 n = off;
355 dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1;
356 check_unchanged = TRUE;
358 dp->df_lnum[idx] = line1;
360 else
362 off = 0;
363 if (last < line2)
365 /* 2. delete at end of of diff */
366 dp->df_count[idx] -= last - lnum_deleted + 1;
367 if (dp->df_next != NULL
368 && dp->df_next->df_lnum[idx] - 1 <= line2)
370 /* delete continues in next diff, only do
371 * lines until that one */
372 n = dp->df_next->df_lnum[idx] - 1 - last;
373 deleted -= dp->df_next->df_lnum[idx]
374 - lnum_deleted;
375 lnum_deleted = dp->df_next->df_lnum[idx];
377 else
378 n = line2 - last;
379 check_unchanged = TRUE;
381 else
383 /* 3. delete lines inside the diff */
384 n = 0;
385 dp->df_count[idx] -= deleted;
389 for (i = 0; i < DB_COUNT; ++i)
390 if (tp->tp_diffbuf[i] != NULL && i != idx)
392 dp->df_lnum[i] -= off;
393 dp->df_count[i] += n;
396 else
398 if (dp->df_lnum[idx] <= line1)
400 /* inserted lines somewhere in this diff */
401 dp->df_count[idx] += inserted;
402 check_unchanged = TRUE;
404 else
405 /* inserted lines somewhere above this diff */
406 dp->df_lnum[idx] += inserted;
409 if (check_unchanged)
410 /* Check if inserted lines are equal, may reduce the
411 * size of the diff. TODO: also check for equal lines
412 * in the middle and perhaps split the block. */
413 diff_check_unchanged(tp, dp);
417 /* check if this block touches the previous one, may merge them. */
418 if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx]
419 == dp->df_lnum[idx])
421 for (i = 0; i < DB_COUNT; ++i)
422 if (tp->tp_diffbuf[i] != NULL)
423 dprev->df_count[i] += dp->df_count[i];
424 dprev->df_next = dp->df_next;
425 vim_free(dp);
426 dp = dprev->df_next;
428 else
430 /* Advance to next entry. */
431 dprev = dp;
432 dp = dp->df_next;
436 dprev = NULL;
437 dp = tp->tp_first_diff;
438 while (dp != NULL)
440 /* All counts are zero, remove this entry. */
441 for (i = 0; i < DB_COUNT; ++i)
442 if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
443 break;
444 if (i == DB_COUNT)
446 dnext = dp->df_next;
447 vim_free(dp);
448 dp = dnext;
449 if (dprev == NULL)
450 tp->tp_first_diff = dnext;
451 else
452 dprev->df_next = dnext;
454 else
456 /* Advance to next entry. */
457 dprev = dp;
458 dp = dp->df_next;
463 if (tp == curtab)
465 diff_redraw(TRUE);
467 /* Need to recompute the scroll binding, may remove or add filler
468 * lines (e.g., when adding lines above w_topline). But it's slow when
469 * making many changes, postpone until redrawing. */
470 diff_need_scrollbind = TRUE;
475 * Allocate a new diff block and link it between "dprev" and "dp".
477 static diff_T *
478 diff_alloc_new(tp, dprev, dp)
479 tabpage_T *tp;
480 diff_T *dprev;
481 diff_T *dp;
483 diff_T *dnew;
485 dnew = (diff_T *)alloc((unsigned)sizeof(diff_T));
486 if (dnew != NULL)
488 dnew->df_next = dp;
489 if (dprev == NULL)
490 tp->tp_first_diff = dnew;
491 else
492 dprev->df_next = dnew;
494 return dnew;
498 * Check if the diff block "dp" can be made smaller for lines at the start and
499 * end that are equal. Called after inserting lines.
500 * This may result in a change where all buffers have zero lines, the caller
501 * must take care of removing it.
503 static void
504 diff_check_unchanged(tp, dp)
505 tabpage_T *tp;
506 diff_T *dp;
508 int i_org;
509 int i_new;
510 int off_org, off_new;
511 char_u *line_org;
512 int dir = FORWARD;
514 /* Find the first buffers, use it as the original, compare the other
515 * buffer lines against this one. */
516 for (i_org = 0; i_org < DB_COUNT; ++i_org)
517 if (tp->tp_diffbuf[i_org] != NULL)
518 break;
519 if (i_org == DB_COUNT) /* safety check */
520 return;
522 if (diff_check_sanity(tp, dp) == FAIL)
523 return;
525 /* First check lines at the top, then at the bottom. */
526 off_org = 0;
527 off_new = 0;
528 for (;;)
530 /* Repeat until a line is found which is different or the number of
531 * lines has become zero. */
532 while (dp->df_count[i_org] > 0)
534 /* Copy the line, the next ml_get() will invalidate it. */
535 if (dir == BACKWARD)
536 off_org = dp->df_count[i_org] - 1;
537 line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org],
538 dp->df_lnum[i_org] + off_org, FALSE));
539 if (line_org == NULL)
540 return;
541 for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new)
543 if (tp->tp_diffbuf[i_new] == NULL)
544 continue;
545 if (dir == BACKWARD)
546 off_new = dp->df_count[i_new] - 1;
547 /* if other buffer doesn't have this line, it was inserted */
548 if (off_new < 0 || off_new >= dp->df_count[i_new])
549 break;
550 if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new],
551 dp->df_lnum[i_new] + off_new, FALSE)) != 0)
552 break;
554 vim_free(line_org);
556 /* Stop when a line isn't equal in all diff buffers. */
557 if (i_new != DB_COUNT)
558 break;
560 /* Line matched in all buffers, remove it from the diff. */
561 for (i_new = i_org; i_new < DB_COUNT; ++i_new)
562 if (tp->tp_diffbuf[i_new] != NULL)
564 if (dir == FORWARD)
565 ++dp->df_lnum[i_new];
566 --dp->df_count[i_new];
569 if (dir == BACKWARD)
570 break;
571 dir = BACKWARD;
576 * Check if a diff block doesn't contain invalid line numbers.
577 * This can happen when the diff program returns invalid results.
579 static int
580 diff_check_sanity(tp, dp)
581 tabpage_T *tp;
582 diff_T *dp;
584 int i;
586 for (i = 0; i < DB_COUNT; ++i)
587 if (tp->tp_diffbuf[i] != NULL)
588 if (dp->df_lnum[i] + dp->df_count[i] - 1
589 > tp->tp_diffbuf[i]->b_ml.ml_line_count)
590 return FAIL;
591 return OK;
595 * Mark all diff buffers in the current tab page for redraw.
597 static void
598 diff_redraw(dofold)
599 int dofold; /* also recompute the folds */
601 win_T *wp;
602 int n;
604 for (wp = firstwin; wp != NULL; wp = wp->w_next)
605 if (wp->w_p_diff)
607 redraw_win_later(wp, SOME_VALID);
608 #ifdef FEAT_FOLDING
609 if (dofold && foldmethodIsDiff(wp))
610 foldUpdateAll(wp);
611 #endif
612 /* A change may have made filler lines invalid, need to take care
613 * of that for other windows. */
614 if (wp != curwin && wp->w_topfill > 0)
616 n = diff_check(wp, wp->w_topline);
617 if (wp->w_topfill > n)
618 wp->w_topfill = (n < 0 ? 0 : n);
624 * Write buffer "buf" to file "name".
625 * Always use 'fileformat' set to "unix".
626 * Return FAIL for failure
628 static int
629 diff_write(buf, fname)
630 buf_T *buf;
631 char_u *fname;
633 int r;
634 char_u *save_ff;
636 save_ff = buf->b_p_ff;
637 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
638 r = buf_write(buf, fname, NULL, (linenr_T)1, buf->b_ml.ml_line_count,
639 NULL, FALSE, FALSE, FALSE, TRUE);
640 free_string_option(buf->b_p_ff);
641 buf->b_p_ff = save_ff;
642 return r;
646 * Completely update the diffs for the buffers involved.
647 * This uses the ordinary "diff" command.
648 * The buffers are written to a file, also for unmodified buffers (the file
649 * could have been produced by autocommands, e.g. the netrw plugin).
651 /*ARGSUSED*/
652 void
653 ex_diffupdate(eap)
654 exarg_T *eap; /* can be NULL, it's not used */
656 buf_T *buf;
657 int idx_orig;
658 int idx_new;
659 char_u *tmp_orig;
660 char_u *tmp_new;
661 char_u *tmp_diff;
662 FILE *fd;
663 int ok;
665 /* Delete all diffblocks. */
666 diff_clear(curtab);
667 curtab->tp_diff_invalid = FALSE;
669 /* Use the first buffer as the original text. */
670 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig)
671 if (curtab->tp_diffbuf[idx_orig] != NULL)
672 break;
673 if (idx_orig == DB_COUNT)
674 return;
676 /* Only need to do something when there is another buffer. */
677 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
678 if (curtab->tp_diffbuf[idx_new] != NULL)
679 break;
680 if (idx_new == DB_COUNT)
681 return;
683 /* We need three temp file names. */
684 tmp_orig = vim_tempname('o');
685 tmp_new = vim_tempname('n');
686 tmp_diff = vim_tempname('d');
687 if (tmp_orig == NULL || tmp_new == NULL || tmp_diff == NULL)
688 goto theend;
691 * Do a quick test if "diff" really works. Otherwise it looks like there
692 * are no differences. Can't use the return value, it's non-zero when
693 * there are differences.
694 * May try twice, first with "-a" and then without.
696 for (;;)
698 ok = FALSE;
699 fd = mch_fopen((char *)tmp_orig, "w");
700 if (fd != NULL)
702 fwrite("line1\n", (size_t)6, (size_t)1, fd);
703 fclose(fd);
704 fd = mch_fopen((char *)tmp_new, "w");
705 if (fd != NULL)
707 fwrite("line2\n", (size_t)6, (size_t)1, fd);
708 fclose(fd);
709 diff_file(tmp_orig, tmp_new, tmp_diff);
710 fd = mch_fopen((char *)tmp_diff, "r");
711 if (fd != NULL)
713 char_u linebuf[LBUFLEN];
715 for (;;)
717 /* There must be a line that contains "1c1". */
718 if (tag_fgets(linebuf, LBUFLEN, fd))
719 break;
720 if (STRNCMP(linebuf, "1c1", 3) == 0)
721 ok = TRUE;
723 fclose(fd);
725 mch_remove(tmp_diff);
726 mch_remove(tmp_new);
728 mch_remove(tmp_orig);
731 #ifdef FEAT_EVAL
732 /* When using 'diffexpr' break here. */
733 if (*p_dex != NUL)
734 break;
735 #endif
737 #if defined(MSWIN) || defined(MSDOS)
738 /* If the "-a" argument works, also check if "--binary" works. */
739 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE)
741 diff_a_works = TRUE;
742 diff_bin_works = TRUE;
743 continue;
745 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE)
747 /* Tried --binary, but it failed. "-a" works though. */
748 diff_bin_works = FALSE;
749 ok = TRUE;
751 #endif
753 /* If we checked if "-a" works already, break here. */
754 if (diff_a_works != MAYBE)
755 break;
756 diff_a_works = ok;
758 /* If "-a" works break here, otherwise retry without "-a". */
759 if (ok)
760 break;
762 if (!ok)
764 EMSG(_("E97: Cannot create diffs"));
765 diff_a_works = MAYBE;
766 #if defined(MSWIN) || defined(MSDOS)
767 diff_bin_works = MAYBE;
768 #endif
769 goto theend;
772 /* Write the first buffer to a tempfile. */
773 buf = curtab->tp_diffbuf[idx_orig];
774 if (diff_write(buf, tmp_orig) == FAIL)
775 goto theend;
777 /* Make a difference between the first buffer and every other. */
778 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
780 buf = curtab->tp_diffbuf[idx_new];
781 if (buf == NULL)
782 continue;
783 if (diff_write(buf, tmp_new) == FAIL)
784 continue;
785 diff_file(tmp_orig, tmp_new, tmp_diff);
787 /* Read the diff output and add each entry to the diff list. */
788 diff_read(idx_orig, idx_new, tmp_diff);
789 mch_remove(tmp_diff);
790 mch_remove(tmp_new);
792 mch_remove(tmp_orig);
794 /* force updating cursor position on screen */
795 curwin->w_valid_cursor.lnum = 0;
797 diff_redraw(TRUE);
799 theend:
800 vim_free(tmp_orig);
801 vim_free(tmp_new);
802 vim_free(tmp_diff);
806 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
808 static void
809 diff_file(tmp_orig, tmp_new, tmp_diff)
810 char_u *tmp_orig;
811 char_u *tmp_new;
812 char_u *tmp_diff;
814 char_u *cmd;
816 #ifdef FEAT_EVAL
817 if (*p_dex != NUL)
818 /* Use 'diffexpr' to generate the diff file. */
819 eval_diff(tmp_orig, tmp_new, tmp_diff);
820 else
821 #endif
823 cmd = alloc((unsigned)(STRLEN(tmp_orig) + STRLEN(tmp_new)
824 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27));
825 if (cmd != NULL)
827 /* We don't want $DIFF_OPTIONS to get in the way. */
828 if (getenv("DIFF_OPTIONS"))
829 vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)"");
831 /* Build the diff command and execute it. Always use -a, binary
832 * differences are of no use. Ignore errors, diff returns
833 * non-zero when differences have been found. */
834 sprintf((char *)cmd, "diff %s%s%s%s%s %s",
835 diff_a_works == FALSE ? "" : "-a ",
836 #if defined(MSWIN) || defined(MSDOS)
837 diff_bin_works == TRUE ? "--binary " : "",
838 #else
840 #endif
841 (diff_flags & DIFF_IWHITE) ? "-b " : "",
842 (diff_flags & DIFF_ICASE) ? "-i " : "",
843 tmp_orig, tmp_new);
844 append_redir(cmd, p_srr, tmp_diff);
845 #ifdef FEAT_AUTOCMD
846 block_autocmds(); /* Avoid ShellCmdPost stuff */
847 #endif
848 (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
849 #ifdef FEAT_AUTOCMD
850 unblock_autocmds();
851 #endif
852 vim_free(cmd);
858 * Create a new version of a file from the current buffer and a diff file.
859 * The buffer is written to a file, also for unmodified buffers (the file
860 * could have been produced by autocommands, e.g. the netrw plugin).
862 void
863 ex_diffpatch(eap)
864 exarg_T *eap;
866 char_u *tmp_orig; /* name of original temp file */
867 char_u *tmp_new; /* name of patched temp file */
868 char_u *buf = NULL;
869 win_T *old_curwin = curwin;
870 char_u *newname = NULL; /* name of patched file buffer */
871 #ifdef UNIX
872 char_u dirbuf[MAXPATHL];
873 char_u *fullname = NULL;
874 #endif
875 #ifdef FEAT_BROWSE
876 char_u *browseFile = NULL;
877 int browse_flag = cmdmod.browse;
878 #endif
880 #ifdef FEAT_BROWSE
881 if (cmdmod.browse)
883 browseFile = do_browse(0, (char_u *)_("Patch file"),
884 eap->arg, NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL);
885 if (browseFile == NULL)
886 return; /* operation cancelled */
887 eap->arg = browseFile;
888 cmdmod.browse = FALSE; /* don't let do_ecmd() browse again */
890 #endif
892 /* We need two temp file names. */
893 tmp_orig = vim_tempname('o');
894 tmp_new = vim_tempname('n');
895 if (tmp_orig == NULL || tmp_new == NULL)
896 goto theend;
898 /* Write the current buffer to "tmp_orig". */
899 if (buf_write(curbuf, tmp_orig, NULL,
900 (linenr_T)1, curbuf->b_ml.ml_line_count,
901 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL)
902 goto theend;
904 #ifdef UNIX
905 /* Get the absolute path of the patchfile, changing directory below. */
906 fullname = FullName_save(eap->arg, FALSE);
907 #endif
908 buf = alloc((unsigned)(STRLEN(tmp_orig) + (
909 # ifdef UNIX
910 fullname != NULL ? STRLEN(fullname) :
911 # endif
912 STRLEN(eap->arg)) + STRLEN(tmp_new) + 16));
913 if (buf == NULL)
914 goto theend;
916 #ifdef UNIX
917 /* Temporaraly chdir to /tmp, to avoid patching files in the current
918 * directory when the patch file contains more than one patch. When we
919 * have our own temp dir use that instead, it will be cleaned up when we
920 * exit (any .rej files created). Don't change directory if we can't
921 * return to the current. */
922 if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0)
923 dirbuf[0] = NUL;
924 else
926 # ifdef TEMPDIRNAMES
927 if (vim_tempdir != NULL)
928 mch_chdir((char *)vim_tempdir);
929 else
930 # endif
931 mch_chdir("/tmp");
932 shorten_fnames(TRUE);
934 #endif
936 #ifdef FEAT_EVAL
937 if (*p_pex != NUL)
938 /* Use 'patchexpr' to generate the new file. */
939 eval_patch(tmp_orig,
940 # ifdef UNIX
941 fullname != NULL ? fullname :
942 # endif
943 eap->arg, tmp_new);
944 else
945 #endif
947 /* Build the patch command and execute it. Ignore errors. Switch to
948 * cooked mode to allow the user to respond to prompts. */
949 sprintf((char *)buf, "patch -o %s %s < \"%s\"", tmp_new, tmp_orig,
950 # ifdef UNIX
951 fullname != NULL ? fullname :
952 # endif
953 eap->arg);
954 #ifdef FEAT_AUTOCMD
955 block_autocmds(); /* Avoid ShellCmdPost stuff */
956 #endif
957 (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED);
958 #ifdef FEAT_AUTOCMD
959 unblock_autocmds();
960 #endif
963 #ifdef UNIX
964 if (dirbuf[0] != NUL)
966 if (mch_chdir((char *)dirbuf) != 0)
967 EMSG(_(e_prev_dir));
968 shorten_fnames(TRUE);
970 #endif
972 /* patch probably has written over the screen */
973 redraw_later(CLEAR);
975 /* Delete any .orig or .rej file created. */
976 STRCPY(buf, tmp_new);
977 STRCAT(buf, ".orig");
978 mch_remove(buf);
979 STRCPY(buf, tmp_new);
980 STRCAT(buf, ".rej");
981 mch_remove(buf);
983 if (curbuf->b_fname != NULL)
985 newname = vim_strnsave(curbuf->b_fname,
986 (int)(STRLEN(curbuf->b_fname) + 4));
987 if (newname != NULL)
988 STRCAT(newname, ".new");
991 #ifdef FEAT_GUI
992 need_mouse_correct = TRUE;
993 #endif
994 /* don't use a new tab page, each tab page has its own diffs */
995 cmdmod.tab = 0;
997 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
999 /* Pretend it was a ":split fname" command */
1000 eap->cmdidx = CMD_split;
1001 eap->arg = tmp_new;
1002 do_exedit(eap, old_curwin);
1004 if (curwin != old_curwin) /* split must have worked */
1006 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
1007 diff_win_options(curwin, TRUE);
1008 diff_win_options(old_curwin, TRUE);
1010 if (newname != NULL)
1012 /* do a ":file filename.new" on the patched buffer */
1013 eap->arg = newname;
1014 ex_file(eap);
1016 #ifdef FEAT_AUTOCMD
1017 /* Do filetype detection with the new name. */
1018 if (au_has_group((char_u *)"filetypedetect"))
1019 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
1020 #endif
1025 theend:
1026 if (tmp_orig != NULL)
1027 mch_remove(tmp_orig);
1028 vim_free(tmp_orig);
1029 if (tmp_new != NULL)
1030 mch_remove(tmp_new);
1031 vim_free(tmp_new);
1032 vim_free(newname);
1033 vim_free(buf);
1034 #ifdef UNIX
1035 vim_free(fullname);
1036 #endif
1037 #ifdef FEAT_BROWSE
1038 vim_free(browseFile);
1039 cmdmod.browse = browse_flag;
1040 #endif
1044 * Split the window and edit another file, setting options to show the diffs.
1046 void
1047 ex_diffsplit(eap)
1048 exarg_T *eap;
1050 win_T *old_curwin = curwin;
1052 #ifdef FEAT_GUI
1053 need_mouse_correct = TRUE;
1054 #endif
1055 /* don't use a new tab page, each tab page has its own diffs */
1056 cmdmod.tab = 0;
1058 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
1060 /* Pretend it was a ":split fname" command */
1061 eap->cmdidx = CMD_split;
1062 curwin->w_p_diff = TRUE;
1063 do_exedit(eap, old_curwin);
1065 if (curwin != old_curwin) /* split must have worked */
1067 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
1068 diff_win_options(curwin, TRUE);
1069 diff_win_options(old_curwin, TRUE);
1075 * Set options to show difs for the current window.
1077 /*ARGSUSED*/
1078 void
1079 ex_diffthis(eap)
1080 exarg_T *eap;
1082 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
1083 diff_win_options(curwin, TRUE);
1087 * Set options in window "wp" for diff mode.
1089 void
1090 diff_win_options(wp, addbuf)
1091 win_T *wp;
1092 int addbuf; /* Add buffer to diff. */
1094 wp->w_p_diff = TRUE;
1095 wp->w_p_scb = TRUE;
1096 wp->w_p_wrap = FALSE;
1097 # ifdef FEAT_FOLDING
1099 win_T *old_curwin = curwin;
1101 curwin = wp;
1102 curbuf = curwin->w_buffer;
1103 set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff",
1104 OPT_LOCAL|OPT_FREE, 0);
1105 curwin = old_curwin;
1106 curbuf = curwin->w_buffer;
1107 wp->w_p_fdc = diff_foldcolumn;
1108 wp->w_p_fen = TRUE;
1109 wp->w_p_fdl = 0;
1110 foldUpdateAll(wp);
1111 /* make sure topline is not halfway a fold */
1112 changed_window_setting_win(wp);
1114 # endif
1115 #ifdef FEAT_SCROLLBIND
1116 if (vim_strchr(p_sbo, 'h') == NULL)
1117 do_cmdline_cmd((char_u *)"set sbo+=hor");
1118 #endif
1120 if (addbuf)
1121 diff_buf_add(wp->w_buffer);
1122 redraw_win_later(wp, NOT_VALID);
1126 * Set options not to show diffs. For the current window or all windows.
1127 * Only in the current tab page.
1129 void
1130 ex_diffoff(eap)
1131 exarg_T *eap;
1133 win_T *wp;
1134 win_T *old_curwin = curwin;
1135 #ifdef FEAT_SCROLLBIND
1136 int diffwin = FALSE;
1137 #endif
1139 for (wp = firstwin; wp != NULL; wp = wp->w_next)
1141 if (wp == curwin || eap->forceit)
1143 /* Set 'diff', 'scrollbind' off and 'wrap' on. */
1144 wp->w_p_diff = FALSE;
1145 wp->w_p_scb = FALSE;
1146 wp->w_p_wrap = TRUE;
1147 #ifdef FEAT_FOLDING
1148 curwin = wp;
1149 curbuf = curwin->w_buffer;
1150 set_string_option_direct((char_u *)"fdm", -1,
1151 (char_u *)"manual", OPT_LOCAL|OPT_FREE, 0);
1152 curwin = old_curwin;
1153 curbuf = curwin->w_buffer;
1154 wp->w_p_fdc = 0;
1155 wp->w_p_fen = FALSE;
1156 wp->w_p_fdl = 0;
1157 foldUpdateAll(wp);
1158 /* make sure topline is not halfway a fold */
1159 changed_window_setting_win(wp);
1160 #endif
1161 diff_buf_adjust(wp);
1163 #ifdef FEAT_SCROLLBIND
1164 diffwin |= wp->w_p_diff;
1165 #endif
1168 #ifdef FEAT_SCROLLBIND
1169 /* Remove "hor" from from 'scrollopt' if there are no diff windows left. */
1170 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
1171 do_cmdline_cmd((char_u *)"set sbo-=hor");
1172 #endif
1176 * Read the diff output and add each entry to the diff list.
1178 static void
1179 diff_read(idx_orig, idx_new, fname)
1180 int idx_orig; /* idx of original file */
1181 int idx_new; /* idx of new file */
1182 char_u *fname; /* name of diff output file */
1184 FILE *fd;
1185 diff_T *dprev = NULL;
1186 diff_T *dp = curtab->tp_first_diff;
1187 diff_T *dn, *dpl;
1188 long f1, l1, f2, l2;
1189 char_u linebuf[LBUFLEN]; /* only need to hold the diff line */
1190 int difftype;
1191 char_u *p;
1192 long off;
1193 int i;
1194 linenr_T lnum_orig, lnum_new;
1195 long count_orig, count_new;
1196 int notset = TRUE; /* block "*dp" not set yet */
1198 fd = mch_fopen((char *)fname, "r");
1199 if (fd == NULL)
1201 EMSG(_("E98: Cannot read diff output"));
1202 return;
1205 for (;;)
1207 if (tag_fgets(linebuf, LBUFLEN, fd))
1208 break; /* end of file */
1209 if (!isdigit(*linebuf))
1210 continue; /* not the start of a diff block */
1212 /* This line must be one of three formats:
1213 * {first}[,{last}]c{first}[,{last}]
1214 * {first}a{first}[,{last}]
1215 * {first}[,{last}]d{first}
1217 p = linebuf;
1218 f1 = getdigits(&p);
1219 if (*p == ',')
1221 ++p;
1222 l1 = getdigits(&p);
1224 else
1225 l1 = f1;
1226 if (*p != 'a' && *p != 'c' && *p != 'd')
1227 continue; /* invalid diff format */
1228 difftype = *p++;
1229 f2 = getdigits(&p);
1230 if (*p == ',')
1232 ++p;
1233 l2 = getdigits(&p);
1235 else
1236 l2 = f2;
1237 if (l1 < f1 || l2 < f2)
1238 continue; /* invalid line range */
1240 if (difftype == 'a')
1242 lnum_orig = f1 + 1;
1243 count_orig = 0;
1245 else
1247 lnum_orig = f1;
1248 count_orig = l1 - f1 + 1;
1250 if (difftype == 'd')
1252 lnum_new = f2 + 1;
1253 count_new = 0;
1255 else
1257 lnum_new = f2;
1258 count_new = l2 - f2 + 1;
1261 /* Go over blocks before the change, for which orig and new are equal.
1262 * Copy blocks from orig to new. */
1263 while (dp != NULL
1264 && lnum_orig > dp->df_lnum[idx_orig] + dp->df_count[idx_orig])
1266 if (notset)
1267 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1268 dprev = dp;
1269 dp = dp->df_next;
1270 notset = TRUE;
1273 if (dp != NULL
1274 && lnum_orig <= dp->df_lnum[idx_orig] + dp->df_count[idx_orig]
1275 && lnum_orig + count_orig >= dp->df_lnum[idx_orig])
1277 /* New block overlaps with existing block(s).
1278 * First find last block that overlaps. */
1279 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next)
1280 if (lnum_orig + count_orig < dpl->df_next->df_lnum[idx_orig])
1281 break;
1283 /* If the newly found block starts before the old one, set the
1284 * start back a number of lines. */
1285 off = dp->df_lnum[idx_orig] - lnum_orig;
1286 if (off > 0)
1288 for (i = idx_orig; i < idx_new; ++i)
1289 if (curtab->tp_diffbuf[i] != NULL)
1290 dp->df_lnum[i] -= off;
1291 dp->df_lnum[idx_new] = lnum_new;
1292 dp->df_count[idx_new] = count_new;
1294 else if (notset)
1296 /* new block inside existing one, adjust new block */
1297 dp->df_lnum[idx_new] = lnum_new + off;
1298 dp->df_count[idx_new] = count_new - off;
1300 else
1301 /* second overlap of new block with existing block */
1302 dp->df_count[idx_new] += count_new - count_orig
1303 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]
1304 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]);
1306 /* Adjust the size of the block to include all the lines to the
1307 * end of the existing block or the new diff, whatever ends last. */
1308 off = (lnum_orig + count_orig)
1309 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]);
1310 if (off < 0)
1312 /* new change ends in existing block, adjust the end if not
1313 * done already */
1314 if (notset)
1315 dp->df_count[idx_new] += -off;
1316 off = 0;
1318 for (i = idx_orig; i < idx_new; ++i)
1319 if (curtab->tp_diffbuf[i] != NULL)
1320 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
1321 - dp->df_lnum[i] + off;
1323 /* Delete the diff blocks that have been merged into one. */
1324 dn = dp->df_next;
1325 dp->df_next = dpl->df_next;
1326 while (dn != dp->df_next)
1328 dpl = dn->df_next;
1329 vim_free(dn);
1330 dn = dpl;
1333 else
1335 /* Allocate a new diffblock. */
1336 dp = diff_alloc_new(curtab, dprev, dp);
1337 if (dp == NULL)
1338 goto done;
1340 dp->df_lnum[idx_orig] = lnum_orig;
1341 dp->df_count[idx_orig] = count_orig;
1342 dp->df_lnum[idx_new] = lnum_new;
1343 dp->df_count[idx_new] = count_new;
1345 /* Set values for other buffers, these must be equal to the
1346 * original buffer, otherwise there would have been a change
1347 * already. */
1348 for (i = idx_orig + 1; i < idx_new; ++i)
1349 if (curtab->tp_diffbuf[i] != NULL)
1350 diff_copy_entry(dprev, dp, idx_orig, i);
1352 notset = FALSE; /* "*dp" has been set */
1355 /* for remaining diff blocks orig and new are equal */
1356 while (dp != NULL)
1358 if (notset)
1359 diff_copy_entry(dprev, dp, idx_orig, idx_new);
1360 dprev = dp;
1361 dp = dp->df_next;
1362 notset = TRUE;
1365 done:
1366 fclose(fd);
1370 * Copy an entry at "dp" from "idx_orig" to "idx_new".
1372 static void
1373 diff_copy_entry(dprev, dp, idx_orig, idx_new)
1374 diff_T *dprev;
1375 diff_T *dp;
1376 int idx_orig;
1377 int idx_new;
1379 long off;
1381 if (dprev == NULL)
1382 off = 0;
1383 else
1384 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig])
1385 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]);
1386 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off;
1387 dp->df_count[idx_new] = dp->df_count[idx_orig];
1391 * Clear the list of diffblocks for tab page "tp".
1393 void
1394 diff_clear(tp)
1395 tabpage_T *tp;
1397 diff_T *p, *next_p;
1399 for (p = tp->tp_first_diff; p != NULL; p = next_p)
1401 next_p = p->df_next;
1402 vim_free(p);
1404 tp->tp_first_diff = NULL;
1408 * Check diff status for line "lnum" in buffer "buf":
1409 * Returns 0 for nothing special
1410 * Returns -1 for a line that should be highlighted as changed.
1411 * Returns -2 for a line that should be highlighted as added/deleted.
1412 * Returns > 0 for inserting that many filler lines above it (never happens
1413 * when 'diffopt' doesn't contain "filler").
1414 * This should only be used for windows where 'diff' is set.
1417 diff_check(wp, lnum)
1418 win_T *wp;
1419 linenr_T lnum;
1421 int idx; /* index in tp_diffbuf[] for this buffer */
1422 diff_T *dp;
1423 int maxcount;
1424 int i;
1425 buf_T *buf = wp->w_buffer;
1426 int cmp;
1428 if (curtab->tp_diff_invalid)
1429 ex_diffupdate(NULL); /* update after a big change */
1431 if (curtab->tp_first_diff == NULL || !wp->w_p_diff) /* no diffs at all */
1432 return 0;
1434 /* safety check: "lnum" must be a buffer line */
1435 if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1)
1436 return 0;
1438 idx = diff_buf_idx(buf);
1439 if (idx == DB_COUNT)
1440 return 0; /* no diffs for buffer "buf" */
1442 #ifdef FEAT_FOLDING
1443 /* A closed fold never has filler lines. */
1444 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL))
1445 return 0;
1446 #endif
1448 /* search for a change that includes "lnum" in the list of diffblocks. */
1449 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1450 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
1451 break;
1452 if (dp == NULL || lnum < dp->df_lnum[idx])
1453 return 0;
1455 if (lnum < dp->df_lnum[idx] + dp->df_count[idx])
1457 int zero = FALSE;
1459 /* Changed or inserted line. If the other buffers have a count of
1460 * zero, the lines were inserted. If the other buffers have the same
1461 * count, check if the lines are identical. */
1462 cmp = FALSE;
1463 for (i = 0; i < DB_COUNT; ++i)
1464 if (i != idx && curtab->tp_diffbuf[i] != NULL)
1466 if (dp->df_count[i] == 0)
1467 zero = TRUE;
1468 else
1470 if (dp->df_count[i] != dp->df_count[idx])
1471 return -1; /* nr of lines changed. */
1472 cmp = TRUE;
1475 if (cmp)
1477 /* Compare all lines. If they are equal the lines were inserted
1478 * in some buffers, deleted in others, but not changed. */
1479 for (i = 0; i < DB_COUNT; ++i)
1480 if (i != idx && curtab->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
1481 if (!diff_equal_entry(dp, idx, i))
1482 return -1;
1484 /* If there is no buffer with zero lines then there is no difference
1485 * any longer. Happens when making a change (or undo) that removes
1486 * the difference. Can't remove the entry here, we might be halfway
1487 * updating the window. Just report the text as unchanged. Other
1488 * windows might still show the change though. */
1489 if (zero == FALSE)
1490 return 0;
1491 return -2;
1494 /* If 'diffopt' doesn't contain "filler", return 0. */
1495 if (!(diff_flags & DIFF_FILLER))
1496 return 0;
1498 /* Insert filler lines above the line just below the change. Will return
1499 * 0 when this buf had the max count. */
1500 maxcount = 0;
1501 for (i = 0; i < DB_COUNT; ++i)
1502 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount)
1503 maxcount = dp->df_count[i];
1504 return maxcount - dp->df_count[idx];
1508 * Compare two entries in diff "*dp" and return TRUE if they are equal.
1510 static int
1511 diff_equal_entry(dp, idx1, idx2)
1512 diff_T *dp;
1513 int idx1;
1514 int idx2;
1516 int i;
1517 char_u *line;
1518 int cmp;
1520 if (dp->df_count[idx1] != dp->df_count[idx2])
1521 return FALSE;
1522 if (diff_check_sanity(curtab, dp) == FAIL)
1523 return FALSE;
1524 for (i = 0; i < dp->df_count[idx1]; ++i)
1526 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1],
1527 dp->df_lnum[idx1] + i, FALSE));
1528 if (line == NULL)
1529 return FALSE;
1530 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2],
1531 dp->df_lnum[idx2] + i, FALSE));
1532 vim_free(line);
1533 if (cmp != 0)
1534 return FALSE;
1536 return TRUE;
1540 * Compare strings "s1" and "s2" according to 'diffopt'.
1541 * Return non-zero when they are different.
1543 static int
1544 diff_cmp(s1, s2)
1545 char_u *s1;
1546 char_u *s2;
1548 char_u *p1, *p2;
1549 #ifdef FEAT_MBYTE
1550 int l;
1551 #endif
1553 if ((diff_flags & (DIFF_ICASE | DIFF_IWHITE)) == 0)
1554 return STRCMP(s1, s2);
1555 if ((diff_flags & DIFF_ICASE) && !(diff_flags & DIFF_IWHITE))
1556 return MB_STRICMP(s1, s2);
1558 /* Ignore white space changes and possibly ignore case. */
1559 p1 = s1;
1560 p2 = s2;
1561 while (*p1 != NUL && *p2 != NUL)
1563 if (vim_iswhite(*p1) && vim_iswhite(*p2))
1565 p1 = skipwhite(p1);
1566 p2 = skipwhite(p2);
1568 else
1570 #ifdef FEAT_MBYTE
1571 l = (*mb_ptr2len)(p1);
1572 if (l != (*mb_ptr2len)(p2))
1573 break;
1574 if (l > 1)
1576 if (STRNCMP(p1, p2, l) != 0
1577 && (!enc_utf8
1578 || !(diff_flags & DIFF_ICASE)
1579 || utf_fold(utf_ptr2char(p1))
1580 != utf_fold(utf_ptr2char(p2))))
1581 break;
1582 p1 += l;
1583 p2 += l;
1585 else
1586 #endif
1588 if (*p1 != *p2 && (!(diff_flags & DIFF_ICASE)
1589 || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2)))
1590 break;
1591 ++p1;
1592 ++p2;
1597 /* Ignore trailing white space. */
1598 p1 = skipwhite(p1);
1599 p2 = skipwhite(p2);
1600 if (*p1 != NUL || *p2 != NUL)
1601 return 1;
1602 return 0;
1606 * Return the number of filler lines above "lnum".
1609 diff_check_fill(wp, lnum)
1610 win_T *wp;
1611 linenr_T lnum;
1613 int n;
1615 /* be quick when there are no filler lines */
1616 if (!(diff_flags & DIFF_FILLER))
1617 return 0;
1618 n = diff_check(wp, lnum);
1619 if (n <= 0)
1620 return 0;
1621 return n;
1625 * Set the topline of "towin" to match the position in "fromwin", so that they
1626 * show the same diff'ed lines.
1628 void
1629 diff_set_topline(fromwin, towin)
1630 win_T *fromwin;
1631 win_T *towin;
1633 buf_T *frombuf = fromwin->w_buffer;
1634 linenr_T lnum = fromwin->w_topline;
1635 int fromidx;
1636 int toidx;
1637 diff_T *dp;
1638 int max_count;
1639 int i;
1641 fromidx = diff_buf_idx(frombuf);
1642 if (fromidx == DB_COUNT)
1643 return; /* safety check */
1645 if (curtab->tp_diff_invalid)
1646 ex_diffupdate(NULL); /* update after a big change */
1648 towin->w_topfill = 0;
1650 /* search for a change that includes "lnum" in the list of diffblocks. */
1651 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1652 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx])
1653 break;
1654 if (dp == NULL)
1656 /* After last change, compute topline relative to end of file; no
1657 * filler lines. */
1658 towin->w_topline = towin->w_buffer->b_ml.ml_line_count
1659 - (frombuf->b_ml.ml_line_count - lnum);
1661 else
1663 /* Find index for "towin". */
1664 toidx = diff_buf_idx(towin->w_buffer);
1665 if (toidx == DB_COUNT)
1666 return; /* safety check */
1668 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]);
1669 if (lnum >= dp->df_lnum[fromidx])
1671 /* Inside a change: compute filler lines. With three or more
1672 * buffers we need to know the largest count. */
1673 max_count = 0;
1674 for (i = 0; i < DB_COUNT; ++i)
1675 if (curtab->tp_diffbuf[i] != NULL
1676 && max_count < dp->df_count[i])
1677 max_count = dp->df_count[i];
1679 if (dp->df_count[toidx] == dp->df_count[fromidx])
1681 /* same number of lines: use same filler count */
1682 towin->w_topfill = fromwin->w_topfill;
1684 else if (dp->df_count[toidx] > dp->df_count[fromidx])
1686 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
1688 /* more lines in towin and fromwin doesn't show diff
1689 * lines, only filler lines */
1690 if (max_count - fromwin->w_topfill >= dp->df_count[toidx])
1692 /* towin also only shows filler lines */
1693 towin->w_topline = dp->df_lnum[toidx]
1694 + dp->df_count[toidx];
1695 towin->w_topfill = fromwin->w_topfill;
1697 else
1698 /* towin still has some diff lines to show */
1699 towin->w_topline = dp->df_lnum[toidx]
1700 + max_count - fromwin->w_topfill;
1703 else if (towin->w_topline >= dp->df_lnum[toidx]
1704 + dp->df_count[toidx])
1706 /* less lines in towin and no diff lines to show: compute
1707 * filler lines */
1708 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx];
1709 if (diff_flags & DIFF_FILLER)
1711 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
1712 /* fromwin is also out of diff lines */
1713 towin->w_topfill = fromwin->w_topfill;
1714 else
1715 /* fromwin has some diff lines */
1716 towin->w_topfill = dp->df_lnum[fromidx]
1717 + max_count - lnum;
1723 /* safety check (if diff info gets outdated strange things may happen) */
1724 towin->w_botfill = FALSE;
1725 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count)
1727 towin->w_topline = towin->w_buffer->b_ml.ml_line_count;
1728 towin->w_botfill = TRUE;
1730 if (towin->w_topline < 1)
1732 towin->w_topline = 1;
1733 towin->w_topfill = 0;
1736 /* When w_topline changes need to recompute w_botline and cursor position */
1737 invalidate_botline_win(towin);
1738 changed_line_abv_curs_win(towin);
1740 check_topfill(towin, FALSE);
1741 #ifdef FEAT_FOLDING
1742 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline,
1743 NULL, TRUE, NULL);
1744 #endif
1748 * This is called when 'diffopt' is changed.
1751 diffopt_changed()
1753 char_u *p;
1754 int diff_context_new = 6;
1755 int diff_flags_new = 0;
1756 int diff_foldcolumn_new = 2;
1757 tabpage_T *tp;
1759 p = p_dip;
1760 while (*p != NUL)
1762 if (STRNCMP(p, "filler", 6) == 0)
1764 p += 6;
1765 diff_flags_new |= DIFF_FILLER;
1767 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8]))
1769 p += 8;
1770 diff_context_new = getdigits(&p);
1772 else if (STRNCMP(p, "icase", 5) == 0)
1774 p += 5;
1775 diff_flags_new |= DIFF_ICASE;
1777 else if (STRNCMP(p, "iwhite", 6) == 0)
1779 p += 6;
1780 diff_flags_new |= DIFF_IWHITE;
1782 else if (STRNCMP(p, "horizontal", 10) == 0)
1784 p += 10;
1785 diff_flags_new |= DIFF_HORIZONTAL;
1787 else if (STRNCMP(p, "vertical", 8) == 0)
1789 p += 8;
1790 diff_flags_new |= DIFF_VERTICAL;
1792 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11]))
1794 p += 11;
1795 diff_foldcolumn_new = getdigits(&p);
1797 if (*p != ',' && *p != NUL)
1798 return FAIL;
1799 if (*p == ',')
1800 ++p;
1803 /* Can't have both "horizontal" and "vertical". */
1804 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL))
1805 return FAIL;
1807 /* If "icase" or "iwhite" was added or removed, need to update the diff. */
1808 if (diff_flags != diff_flags_new)
1809 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
1810 tp->tp_diff_invalid = TRUE;
1812 diff_flags = diff_flags_new;
1813 diff_context = diff_context_new;
1814 diff_foldcolumn = diff_foldcolumn_new;
1816 diff_redraw(TRUE);
1818 /* recompute the scroll binding with the new option value, may
1819 * remove or add filler lines */
1820 check_scrollbind((linenr_T)0, 0L);
1822 return OK;
1826 * Return TRUE if 'diffopt' contains "horizontal".
1829 diffopt_horizontal()
1831 return (diff_flags & DIFF_HORIZONTAL) != 0;
1835 * Find the difference within a changed line.
1836 * Returns TRUE if the line was added, no other buffer has it.
1839 diff_find_change(wp, lnum, startp, endp)
1840 win_T *wp;
1841 linenr_T lnum;
1842 int *startp; /* first char of the change */
1843 int *endp; /* last char of the change */
1845 char_u *line_org;
1846 char_u *line_new;
1847 int i;
1848 int si_org, si_new;
1849 int ei_org, ei_new;
1850 diff_T *dp;
1851 int idx;
1852 int off;
1853 int added = TRUE;
1855 /* Make a copy of the line, the next ml_get() will invalidate it. */
1856 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));
1857 if (line_org == NULL)
1858 return FALSE;
1860 idx = diff_buf_idx(wp->w_buffer);
1861 if (idx == DB_COUNT) /* cannot happen */
1863 vim_free(line_org);
1864 return FALSE;
1867 /* search for a change that includes "lnum" in the list of diffblocks. */
1868 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1869 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
1870 break;
1871 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
1873 vim_free(line_org);
1874 return FALSE;
1877 off = lnum - dp->df_lnum[idx];
1879 for (i = 0; i < DB_COUNT; ++i)
1880 if (curtab->tp_diffbuf[i] != NULL && i != idx)
1882 /* Skip lines that are not in the other change (filler lines). */
1883 if (off >= dp->df_count[i])
1884 continue;
1885 added = FALSE;
1886 line_new = ml_get_buf(curtab->tp_diffbuf[i],
1887 dp->df_lnum[i] + off, FALSE);
1889 /* Search for start of difference */
1890 si_org = si_new = 0;
1891 while (line_org[si_org] != NUL)
1893 if ((diff_flags & DIFF_IWHITE)
1894 && vim_iswhite(line_org[si_org])
1895 && vim_iswhite(line_new[si_new]))
1897 si_org = (int)(skipwhite(line_org + si_org) - line_org);
1898 si_new = (int)(skipwhite(line_new + si_new) - line_new);
1900 else
1902 if (line_org[si_org] != line_new[si_new])
1903 break;
1904 ++si_org;
1905 ++si_new;
1908 #ifdef FEAT_MBYTE
1909 if (has_mbyte)
1911 /* Move back to first byte of character in both lines (may
1912 * have "nn^" in line_org and "n^ in line_new). */
1913 si_org -= (*mb_head_off)(line_org, line_org + si_org);
1914 si_new -= (*mb_head_off)(line_new, line_new + si_new);
1916 #endif
1917 if (*startp > si_org)
1918 *startp = si_org;
1920 /* Search for end of difference, if any. */
1921 if (line_org[si_org] != NUL || line_new[si_new] != NUL)
1923 ei_org = (int)STRLEN(line_org);
1924 ei_new = (int)STRLEN(line_new);
1925 while (ei_org >= *startp && ei_new >= si_new
1926 && ei_org >= 0 && ei_new >= 0)
1928 if ((diff_flags & DIFF_IWHITE)
1929 && vim_iswhite(line_org[ei_org])
1930 && vim_iswhite(line_new[ei_new]))
1932 while (ei_org >= *startp
1933 && vim_iswhite(line_org[ei_org]))
1934 --ei_org;
1935 while (ei_new >= si_new
1936 && vim_iswhite(line_new[ei_new]))
1937 --ei_new;
1939 else
1941 if (line_org[ei_org] != line_new[ei_new])
1942 break;
1943 --ei_org;
1944 --ei_new;
1947 if (*endp < ei_org)
1948 *endp = ei_org;
1952 vim_free(line_org);
1953 return added;
1956 #if defined(FEAT_FOLDING) || defined(PROTO)
1958 * Return TRUE if line "lnum" is not close to a diff block, this line should
1959 * be in a fold.
1960 * Return FALSE if there are no diff blocks at all in this window.
1963 diff_infold(wp, lnum)
1964 win_T *wp;
1965 linenr_T lnum;
1967 int i;
1968 int idx = -1;
1969 int other = FALSE;
1970 diff_T *dp;
1972 /* Return if 'diff' isn't set. */
1973 if (!wp->w_p_diff)
1974 return FALSE;
1976 for (i = 0; i < DB_COUNT; ++i)
1978 if (curtab->tp_diffbuf[i] == wp->w_buffer)
1979 idx = i;
1980 else if (curtab->tp_diffbuf[i] != NULL)
1981 other = TRUE;
1984 /* return here if there are no diffs in the window */
1985 if (idx == -1 || !other)
1986 return FALSE;
1988 if (curtab->tp_diff_invalid)
1989 ex_diffupdate(NULL); /* update after a big change */
1991 /* Return if there are no diff blocks. All lines will be folded. */
1992 if (curtab->tp_first_diff == NULL)
1993 return TRUE;
1995 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1997 /* If this change is below the line there can't be any further match. */
1998 if (dp->df_lnum[idx] - diff_context > lnum)
1999 break;
2000 /* If this change ends before the line we have a match. */
2001 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum)
2002 return FALSE;
2004 return TRUE;
2006 #endif
2009 * "dp" and "do" commands.
2011 void
2012 nv_diffgetput(put)
2013 int put;
2015 exarg_T ea;
2017 ea.arg = (char_u *)"";
2018 if (put)
2019 ea.cmdidx = CMD_diffput;
2020 else
2021 ea.cmdidx = CMD_diffget;
2022 ea.addr_count = 0;
2023 ea.line1 = curwin->w_cursor.lnum;
2024 ea.line2 = curwin->w_cursor.lnum;
2025 ex_diffgetput(&ea);
2029 * ":diffget"
2030 * ":diffput"
2032 void
2033 ex_diffgetput(eap)
2034 exarg_T *eap;
2036 linenr_T lnum;
2037 int count;
2038 linenr_T off = 0;
2039 diff_T *dp;
2040 diff_T *dprev;
2041 diff_T *dfree;
2042 int idx_cur;
2043 int idx_other;
2044 int idx_from;
2045 int idx_to;
2046 int i;
2047 int added;
2048 char_u *p;
2049 aco_save_T aco;
2050 buf_T *buf;
2051 int start_skip, end_skip;
2052 int new_count;
2053 int buf_empty;
2054 int found_not_ma = FALSE;
2056 /* Find the current buffer in the list of diff buffers. */
2057 idx_cur = diff_buf_idx(curbuf);
2058 if (idx_cur == DB_COUNT)
2060 EMSG(_("E99: Current buffer is not in diff mode"));
2061 return;
2064 if (*eap->arg == NUL)
2066 /* No argument: Find the other buffer in the list of diff buffers. */
2067 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
2068 if (curtab->tp_diffbuf[idx_other] != curbuf
2069 && curtab->tp_diffbuf[idx_other] != NULL)
2071 if (eap->cmdidx != CMD_diffput
2072 || curtab->tp_diffbuf[idx_other]->b_p_ma)
2073 break;
2074 found_not_ma = TRUE;
2076 if (idx_other == DB_COUNT)
2078 if (found_not_ma)
2079 EMSG(_("E793: No other buffer in diff mode is modifiable"));
2080 else
2081 EMSG(_("E100: No other buffer in diff mode"));
2082 return;
2085 /* Check that there isn't a third buffer in the list */
2086 for (i = idx_other + 1; i < DB_COUNT; ++i)
2087 if (curtab->tp_diffbuf[i] != curbuf
2088 && curtab->tp_diffbuf[i] != NULL
2089 && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma))
2091 EMSG(_("E101: More than two buffers in diff mode, don't know which one to use"));
2092 return;
2095 else
2097 /* Buffer number or pattern given. Ignore trailing white space. */
2098 p = eap->arg + STRLEN(eap->arg);
2099 while (p > eap->arg && vim_iswhite(p[-1]))
2100 --p;
2101 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i)
2103 if (eap->arg + i == p) /* digits only */
2104 i = atol((char *)eap->arg);
2105 else
2107 i = buflist_findpat(eap->arg, p, FALSE, TRUE);
2108 if (i < 0)
2109 return; /* error message already given */
2111 buf = buflist_findnr(i);
2112 if (buf == NULL)
2114 EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg);
2115 return;
2117 idx_other = diff_buf_idx(buf);
2118 if (idx_other == DB_COUNT)
2120 EMSG2(_("E103: Buffer \"%s\" is not in diff mode"), eap->arg);
2121 return;
2125 diff_busy = TRUE;
2127 /* When no range given include the line above or below the cursor. */
2128 if (eap->addr_count == 0)
2130 /* Make it possible that ":diffget" on the last line gets line below
2131 * the cursor line when there is no difference above the cursor. */
2132 if (eap->cmdidx == CMD_diffget
2133 && eap->line1 == curbuf->b_ml.ml_line_count
2134 && diff_check(curwin, eap->line1) == 0
2135 && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0))
2136 ++eap->line2;
2137 else if (eap->line1 > 0)
2138 --eap->line1;
2141 if (eap->cmdidx == CMD_diffget)
2143 idx_from = idx_other;
2144 idx_to = idx_cur;
2146 else
2148 idx_from = idx_cur;
2149 idx_to = idx_other;
2150 /* Need to make the other buffer the current buffer to be able to make
2151 * changes in it. */
2152 /* set curwin/curbuf to buf and save a few things */
2153 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]);
2156 /* May give the warning for a changed buffer here, which can trigger the
2157 * FileChangedRO autocommand, which may do nasty things and mess
2158 * everything up. */
2159 if (!curbuf->b_changed)
2161 change_warning(0);
2162 if (diff_buf_idx(curbuf) != idx_to)
2164 EMSG(_("E787: Buffer changed unexpectedly"));
2165 return;
2169 dprev = NULL;
2170 for (dp = curtab->tp_first_diff; dp != NULL; )
2172 if (dp->df_lnum[idx_cur] > eap->line2 + off)
2173 break; /* past the range that was specified */
2175 dfree = NULL;
2176 lnum = dp->df_lnum[idx_to];
2177 count = dp->df_count[idx_to];
2178 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off
2179 && u_save(lnum - 1, lnum + count) != FAIL)
2181 /* Inside the specified range and saving for undo worked. */
2182 start_skip = 0;
2183 end_skip = 0;
2184 if (eap->addr_count > 0)
2186 /* A range was specified: check if lines need to be skipped. */
2187 start_skip = eap->line1 + off - dp->df_lnum[idx_cur];
2188 if (start_skip > 0)
2190 /* range starts below start of current diff block */
2191 if (start_skip > count)
2193 lnum += count;
2194 count = 0;
2196 else
2198 count -= start_skip;
2199 lnum += start_skip;
2202 else
2203 start_skip = 0;
2205 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1
2206 - (eap->line2 + off);
2207 if (end_skip > 0)
2209 /* range ends above end of current/from diff block */
2210 if (idx_cur == idx_from) /* :diffput */
2212 i = dp->df_count[idx_cur] - start_skip - end_skip;
2213 if (count > i)
2214 count = i;
2216 else /* :diffget */
2218 count -= end_skip;
2219 end_skip = dp->df_count[idx_from] - start_skip - count;
2220 if (end_skip < 0)
2221 end_skip = 0;
2224 else
2225 end_skip = 0;
2228 buf_empty = FALSE;
2229 added = 0;
2230 for (i = 0; i < count; ++i)
2232 /* remember deleting the last line of the buffer */
2233 buf_empty = curbuf->b_ml.ml_line_count == 1;
2234 ml_delete(lnum, FALSE);
2235 --added;
2237 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i)
2239 linenr_T nr;
2241 nr = dp->df_lnum[idx_from] + start_skip + i;
2242 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count)
2243 break;
2244 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from],
2245 nr, FALSE));
2246 if (p != NULL)
2248 ml_append(lnum + i - 1, p, 0, FALSE);
2249 vim_free(p);
2250 ++added;
2251 if (buf_empty && curbuf->b_ml.ml_line_count == 2)
2253 /* Added the first line into an empty buffer, need to
2254 * delete the dummy empty line. */
2255 buf_empty = FALSE;
2256 ml_delete((linenr_T)2, FALSE);
2260 new_count = dp->df_count[idx_to] + added;
2261 dp->df_count[idx_to] = new_count;
2263 if (start_skip == 0 && end_skip == 0)
2265 /* Check if there are any other buffers and if the diff is
2266 * equal in them. */
2267 for (i = 0; i < DB_COUNT; ++i)
2268 if (curtab->tp_diffbuf[i] != NULL && i != idx_from
2269 && i != idx_to
2270 && !diff_equal_entry(dp, idx_from, i))
2271 break;
2272 if (i == DB_COUNT)
2274 /* delete the diff entry, the buffers are now equal here */
2275 dfree = dp;
2276 dp = dp->df_next;
2277 if (dprev == NULL)
2278 curtab->tp_first_diff = dp;
2279 else
2280 dprev->df_next = dp;
2284 /* Adjust marks. This will change the following entries! */
2285 if (added != 0)
2287 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added);
2288 if (curwin->w_cursor.lnum >= lnum)
2290 /* Adjust the cursor position if it's in/after the changed
2291 * lines. */
2292 if (curwin->w_cursor.lnum >= lnum + count)
2293 curwin->w_cursor.lnum += added;
2294 else if (added < 0)
2295 curwin->w_cursor.lnum = lnum;
2298 changed_lines(lnum, 0, lnum + count, (long)added);
2300 if (dfree != NULL)
2302 /* Diff is deleted, update folds in other windows. */
2303 #ifdef FEAT_FOLDING
2304 diff_fold_update(dfree, idx_to);
2305 #endif
2306 vim_free(dfree);
2308 else
2309 /* mark_adjust() may have changed the count in a wrong way */
2310 dp->df_count[idx_to] = new_count;
2312 /* When changing the current buffer, keep track of line numbers */
2313 if (idx_cur == idx_to)
2314 off += added;
2317 /* If before the range or not deleted, go to next diff. */
2318 if (dfree == NULL)
2320 dprev = dp;
2321 dp = dp->df_next;
2325 /* restore curwin/curbuf and a few other things */
2326 if (idx_other == idx_to)
2328 /* Syncing undo only works for the current buffer, but we change
2329 * another buffer. Sync undo if the command was typed. This isn't
2330 * 100% right when ":diffput" is used in a function or mapping. */
2331 if (KeyTyped)
2332 u_sync(FALSE);
2333 aucmd_restbuf(&aco);
2336 diff_busy = FALSE;
2338 /* Check that the cursor is on a valid character and update it's position.
2339 * When there were filler lines the topline has become invalid. */
2340 check_cursor();
2341 changed_line_abv_curs();
2343 /* Also need to redraw the other buffers. */
2344 diff_redraw(FALSE);
2347 #ifdef FEAT_FOLDING
2349 * Update folds for all diff buffers for entry "dp".
2350 * Skip buffer with index "skip_idx".
2351 * When there are no diffs, all folds are removed.
2353 static void
2354 diff_fold_update(dp, skip_idx)
2355 diff_T *dp;
2356 int skip_idx;
2358 int i;
2359 win_T *wp;
2361 for (wp = firstwin; wp != NULL; wp = wp->w_next)
2362 for (i = 0; i < DB_COUNT; ++i)
2363 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx)
2364 foldUpdate(wp, dp->df_lnum[i],
2365 dp->df_lnum[i] + dp->df_count[i]);
2367 #endif
2370 * Return TRUE if buffer "buf" is in diff-mode.
2373 diff_mode_buf(buf)
2374 buf_T *buf;
2376 tabpage_T *tp;
2378 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
2379 if (diff_buf_idx_tp(buf, tp) != DB_COUNT)
2380 return TRUE;
2381 return FALSE;
2385 * Move "count" times in direction "dir" to the next diff block.
2386 * Return FAIL if there isn't such a diff block.
2389 diff_move_to(dir, count)
2390 int dir;
2391 long count;
2393 int idx;
2394 linenr_T lnum = curwin->w_cursor.lnum;
2395 diff_T *dp;
2397 idx = diff_buf_idx(curbuf);
2398 if (idx == DB_COUNT || curtab->tp_first_diff == NULL)
2399 return FAIL;
2401 if (curtab->tp_diff_invalid)
2402 ex_diffupdate(NULL); /* update after a big change */
2404 if (curtab->tp_first_diff == NULL) /* no diffs today */
2405 return FAIL;
2407 while (--count >= 0)
2409 /* Check if already before first diff. */
2410 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx])
2411 break;
2413 for (dp = curtab->tp_first_diff; ; dp = dp->df_next)
2415 if (dp == NULL)
2416 break;
2417 if ((dir == FORWARD && lnum < dp->df_lnum[idx])
2418 || (dir == BACKWARD
2419 && (dp->df_next == NULL
2420 || lnum <= dp->df_next->df_lnum[idx])))
2422 lnum = dp->df_lnum[idx];
2423 break;
2428 /* don't end up past the end of the file */
2429 if (lnum > curbuf->b_ml.ml_line_count)
2430 lnum = curbuf->b_ml.ml_line_count;
2432 /* When the cursor didn't move at all we fail. */
2433 if (lnum == curwin->w_cursor.lnum)
2434 return FAIL;
2436 setpcmark();
2437 curwin->w_cursor.lnum = lnum;
2438 curwin->w_cursor.col = 0;
2440 return OK;
2443 #if defined(FEAT_FOLDING) || defined(PROTO)
2445 * For line "lnum" in the current window find the equivalent lnum in window
2446 * "wp", compensating for inserted/deleted lines.
2448 linenr_T
2449 diff_lnum_win(lnum, wp)
2450 linenr_T lnum;
2451 win_T *wp;
2453 diff_T *dp;
2454 int idx;
2455 int i;
2456 linenr_T n;
2458 idx = diff_buf_idx(curbuf);
2459 if (idx == DB_COUNT) /* safety check */
2460 return (linenr_T)0;
2462 if (curtab->tp_diff_invalid)
2463 ex_diffupdate(NULL); /* update after a big change */
2465 /* search for a change that includes "lnum" in the list of diffblocks. */
2466 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
2467 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
2468 break;
2470 /* When after the last change, compute relative to the last line number. */
2471 if (dp == NULL)
2472 return wp->w_buffer->b_ml.ml_line_count
2473 - (curbuf->b_ml.ml_line_count - lnum);
2475 /* Find index for "wp". */
2476 i = diff_buf_idx(wp->w_buffer);
2477 if (i == DB_COUNT) /* safety check */
2478 return (linenr_T)0;
2480 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]);
2481 if (n > dp->df_lnum[i] + dp->df_count[i])
2482 n = dp->df_lnum[i] + dp->df_count[i];
2483 return n;
2485 #endif
2487 #endif /* FEAT_DIFF */