xref: /vim-8.2.3635/src/diff.c (revision a93fa7ee)
1071d4279SBram Moolenaar /* vim:set ts=8 sts=4 sw=4:
2071d4279SBram Moolenaar  *
3071d4279SBram Moolenaar  * VIM - Vi IMproved	by Bram Moolenaar
4071d4279SBram Moolenaar  *
5071d4279SBram Moolenaar  * Do ":help uganda"  in Vim to read copying and usage conditions.
6071d4279SBram Moolenaar  * Do ":help credits" in Vim to see a list of people who contributed.
7071d4279SBram Moolenaar  * See README.txt for an overview of the Vim source code.
8071d4279SBram Moolenaar  */
9071d4279SBram Moolenaar 
10071d4279SBram Moolenaar /*
11071d4279SBram Moolenaar  * diff.c: code for diff'ing two or three buffers.
12071d4279SBram Moolenaar  */
13071d4279SBram Moolenaar 
14071d4279SBram Moolenaar #include "vim.h"
15071d4279SBram Moolenaar 
16071d4279SBram Moolenaar #if defined(FEAT_DIFF) || defined(PROTO)
17071d4279SBram Moolenaar 
18071d4279SBram Moolenaar static int	diff_busy = FALSE;	/* ex_diffgetput() is busy */
19071d4279SBram Moolenaar 
20071d4279SBram Moolenaar /* flags obtained from the 'diffopt' option */
21071d4279SBram Moolenaar #define DIFF_FILLER	1	/* display filler lines */
22071d4279SBram Moolenaar #define DIFF_ICASE	2	/* ignore case */
23071d4279SBram Moolenaar #define DIFF_IWHITE	4	/* ignore change in white space */
24c4675a19SBram Moolenaar #define DIFF_HORIZONTAL	8	/* horizontal splits */
25c4675a19SBram Moolenaar #define DIFF_VERTICAL	16	/* vertical splits */
26071d4279SBram Moolenaar static int	diff_flags = DIFF_FILLER;
27071d4279SBram Moolenaar 
28071d4279SBram Moolenaar #define LBUFLEN 50		/* length of line in diff file */
29071d4279SBram Moolenaar 
30071d4279SBram Moolenaar static int diff_a_works = MAYBE; /* TRUE when "diff -a" works, FALSE when it
31071d4279SBram Moolenaar 				    doesn't work, MAYBE when not checked yet */
32071d4279SBram Moolenaar #if defined(MSWIN) || defined(MSDOS)
33071d4279SBram Moolenaar static int diff_bin_works = MAYBE; /* TRUE when "diff --binary" works, FALSE
34071d4279SBram Moolenaar 				      when it doesn't work, MAYBE when not
35071d4279SBram Moolenaar 				      checked yet */
36071d4279SBram Moolenaar #endif
37071d4279SBram Moolenaar 
38071d4279SBram Moolenaar static int diff_buf_idx __ARGS((buf_T *buf));
3949d7bf13SBram Moolenaar static int diff_buf_idx_tp __ARGS((buf_T *buf, tabpage_T *tp));
4049d7bf13SBram Moolenaar static void diff_mark_adjust_tp __ARGS((tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after));
4149d7bf13SBram Moolenaar static void diff_check_unchanged __ARGS((tabpage_T *tp, diff_T *dp));
4249d7bf13SBram Moolenaar static int diff_check_sanity __ARGS((tabpage_T *tp, diff_T *dp));
43071d4279SBram Moolenaar static void diff_redraw __ARGS((int dofold));
44071d4279SBram Moolenaar static int diff_write __ARGS((buf_T *buf, char_u *fname));
45071d4279SBram Moolenaar static void diff_file __ARGS((char_u *tmp_orig, char_u *tmp_new, char_u *tmp_diff));
46071d4279SBram Moolenaar static int diff_equal_entry __ARGS((diff_T *dp, int idx1, int idx2));
47071d4279SBram Moolenaar static int diff_cmp __ARGS((char_u *s1, char_u *s2));
48071d4279SBram Moolenaar #ifdef FEAT_FOLDING
49071d4279SBram Moolenaar static void diff_fold_update __ARGS((diff_T *dp, int skip_idx));
50071d4279SBram Moolenaar #endif
51071d4279SBram Moolenaar static void diff_read __ARGS((int idx_orig, int idx_new, char_u *fname));
52071d4279SBram Moolenaar static void diff_copy_entry __ARGS((diff_T *dprev, diff_T *dp, int idx_orig, int idx_new));
5349d7bf13SBram Moolenaar static diff_T *diff_alloc_new __ARGS((tabpage_T *tp, diff_T *dprev, diff_T *dp));
54071d4279SBram Moolenaar 
55071d4279SBram Moolenaar #ifndef USE_CR
56071d4279SBram Moolenaar # define tag_fgets vim_fgets
57071d4279SBram Moolenaar #endif
58071d4279SBram Moolenaar 
59071d4279SBram Moolenaar /*
60071d4279SBram Moolenaar  * Called when deleting or unloading a buffer: No longer make a diff with it.
61071d4279SBram Moolenaar  */
62071d4279SBram Moolenaar     void
63071d4279SBram Moolenaar diff_buf_delete(buf)
64071d4279SBram Moolenaar     buf_T	*buf;
65071d4279SBram Moolenaar {
66071d4279SBram Moolenaar     int		i;
6749d7bf13SBram Moolenaar     tabpage_T	*tp;
68071d4279SBram Moolenaar 
6949d7bf13SBram Moolenaar     for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
7049d7bf13SBram Moolenaar     {
7149d7bf13SBram Moolenaar 	i = diff_buf_idx_tp(buf, tp);
72071d4279SBram Moolenaar 	if (i != DB_COUNT)
73071d4279SBram Moolenaar 	{
7449d7bf13SBram Moolenaar 	    tp->tp_diffbuf[i] = NULL;
7549d7bf13SBram Moolenaar 	    tp->tp_diff_invalid = TRUE;
7649d7bf13SBram Moolenaar 	}
77071d4279SBram Moolenaar     }
78071d4279SBram Moolenaar }
79071d4279SBram Moolenaar 
80071d4279SBram Moolenaar /*
812df6dcc5SBram Moolenaar  * Check if the current buffer should be added to or removed from the list of
822df6dcc5SBram Moolenaar  * diff buffers.
832df6dcc5SBram Moolenaar  */
842df6dcc5SBram Moolenaar     void
852df6dcc5SBram Moolenaar diff_buf_adjust(win)
862df6dcc5SBram Moolenaar     win_T	*win;
872df6dcc5SBram Moolenaar {
882df6dcc5SBram Moolenaar     win_T	*wp;
8949d7bf13SBram Moolenaar     int		i;
902df6dcc5SBram Moolenaar 
912df6dcc5SBram Moolenaar     if (!win->w_p_diff)
922df6dcc5SBram Moolenaar     {
932df6dcc5SBram Moolenaar 	/* When there is no window showing a diff for this buffer, remove
942df6dcc5SBram Moolenaar 	 * it from the diffs. */
952df6dcc5SBram Moolenaar 	for (wp = firstwin; wp != NULL; wp = wp->w_next)
962df6dcc5SBram Moolenaar 	    if (wp->w_buffer == win->w_buffer && wp->w_p_diff)
972df6dcc5SBram Moolenaar 		break;
982df6dcc5SBram Moolenaar 	if (wp == NULL)
9949d7bf13SBram Moolenaar 	{
10049d7bf13SBram Moolenaar 	    i = diff_buf_idx(win->w_buffer);
10149d7bf13SBram Moolenaar 	    if (i != DB_COUNT)
10249d7bf13SBram Moolenaar 	    {
10349d7bf13SBram Moolenaar 		curtab->tp_diffbuf[i] = NULL;
10449d7bf13SBram Moolenaar 		curtab->tp_diff_invalid = TRUE;
10549d7bf13SBram Moolenaar 	    }
10649d7bf13SBram Moolenaar 	}
1072df6dcc5SBram Moolenaar     }
1082df6dcc5SBram Moolenaar     else
1092df6dcc5SBram Moolenaar 	diff_buf_add(win->w_buffer);
1102df6dcc5SBram Moolenaar }
1112df6dcc5SBram Moolenaar 
1122df6dcc5SBram Moolenaar /*
113071d4279SBram Moolenaar  * Add a buffer to make diffs for.
11449d7bf13SBram Moolenaar  * Call this when a new buffer is being edited in the current window where
11549d7bf13SBram Moolenaar  * 'diff' is set.
11649d7bf13SBram Moolenaar  * Marks the current buffer as being part of the diff and requireing updating.
11749d7bf13SBram Moolenaar  * This must be done before any autocmd, because a command may use info
11849d7bf13SBram Moolenaar  * about the screen contents.
119071d4279SBram Moolenaar  */
120071d4279SBram Moolenaar     void
121071d4279SBram Moolenaar diff_buf_add(buf)
122071d4279SBram Moolenaar     buf_T	*buf;
123071d4279SBram Moolenaar {
124071d4279SBram Moolenaar     int		i;
125071d4279SBram Moolenaar 
126071d4279SBram Moolenaar     if (diff_buf_idx(buf) != DB_COUNT)
127071d4279SBram Moolenaar 	return;		/* It's already there. */
128071d4279SBram Moolenaar 
129071d4279SBram Moolenaar     for (i = 0; i < DB_COUNT; ++i)
13049d7bf13SBram Moolenaar 	if (curtab->tp_diffbuf[i] == NULL)
131071d4279SBram Moolenaar 	{
13249d7bf13SBram Moolenaar 	    curtab->tp_diffbuf[i] = buf;
13349d7bf13SBram Moolenaar 	    curtab->tp_diff_invalid = TRUE;
134071d4279SBram Moolenaar 	    return;
135071d4279SBram Moolenaar 	}
136071d4279SBram Moolenaar 
137071d4279SBram Moolenaar     EMSGN(_("E96: Can not diff more than %ld buffers"), DB_COUNT);
138071d4279SBram Moolenaar }
139071d4279SBram Moolenaar 
140071d4279SBram Moolenaar /*
14149d7bf13SBram Moolenaar  * Find buffer "buf" in the list of diff buffers for the current tab page.
142071d4279SBram Moolenaar  * Return its index or DB_COUNT if not found.
143071d4279SBram Moolenaar  */
144071d4279SBram Moolenaar     static int
145071d4279SBram Moolenaar diff_buf_idx(buf)
146071d4279SBram Moolenaar     buf_T	*buf;
147071d4279SBram Moolenaar {
148071d4279SBram Moolenaar     int		idx;
149071d4279SBram Moolenaar 
150071d4279SBram Moolenaar     for (idx = 0; idx < DB_COUNT; ++idx)
15149d7bf13SBram Moolenaar 	if (curtab->tp_diffbuf[idx] == buf)
152071d4279SBram Moolenaar 	    break;
153071d4279SBram Moolenaar     return idx;
154071d4279SBram Moolenaar }
155071d4279SBram Moolenaar 
156071d4279SBram Moolenaar /*
15749d7bf13SBram Moolenaar  * Find buffer "buf" in the list of diff buffers for tab page "tp".
15849d7bf13SBram Moolenaar  * Return its index or DB_COUNT if not found.
15949d7bf13SBram Moolenaar  */
16049d7bf13SBram Moolenaar     static int
16149d7bf13SBram Moolenaar diff_buf_idx_tp(buf, tp)
16249d7bf13SBram Moolenaar     buf_T	*buf;
16349d7bf13SBram Moolenaar     tabpage_T	*tp;
16449d7bf13SBram Moolenaar {
16549d7bf13SBram Moolenaar     int		idx;
16649d7bf13SBram Moolenaar 
16749d7bf13SBram Moolenaar     for (idx = 0; idx < DB_COUNT; ++idx)
16849d7bf13SBram Moolenaar 	if (tp->tp_diffbuf[idx] == buf)
16949d7bf13SBram Moolenaar 	    break;
17049d7bf13SBram Moolenaar     return idx;
17149d7bf13SBram Moolenaar }
17249d7bf13SBram Moolenaar 
17349d7bf13SBram Moolenaar /*
17449d7bf13SBram Moolenaar  * Mark the diff info involving buffer "buf" as invalid, it will be updated
17549d7bf13SBram Moolenaar  * when info is requested.
176071d4279SBram Moolenaar  */
177071d4279SBram Moolenaar     void
17849d7bf13SBram Moolenaar diff_invalidate(buf)
17949d7bf13SBram Moolenaar     buf_T	*buf;
180071d4279SBram Moolenaar {
18149d7bf13SBram Moolenaar     tabpage_T	*tp;
18249d7bf13SBram Moolenaar     int		i;
18349d7bf13SBram Moolenaar 
18449d7bf13SBram Moolenaar     for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
185071d4279SBram Moolenaar     {
18649d7bf13SBram Moolenaar 	i = diff_buf_idx_tp(buf, tp);
18749d7bf13SBram Moolenaar 	if (i != DB_COUNT)
18849d7bf13SBram Moolenaar 	{
18949d7bf13SBram Moolenaar 	    tp->tp_diff_invalid = TRUE;
19049d7bf13SBram Moolenaar 	    if (tp == curtab)
191071d4279SBram Moolenaar 		diff_redraw(TRUE);
192071d4279SBram Moolenaar 	}
193071d4279SBram Moolenaar     }
19449d7bf13SBram Moolenaar }
195071d4279SBram Moolenaar 
196071d4279SBram Moolenaar /*
19749d7bf13SBram Moolenaar  * Called by mark_adjust(): update line numbers in "curbuf".
198071d4279SBram Moolenaar  */
199071d4279SBram Moolenaar     void
200071d4279SBram Moolenaar diff_mark_adjust(line1, line2, amount, amount_after)
201071d4279SBram Moolenaar     linenr_T	line1;
202071d4279SBram Moolenaar     linenr_T	line2;
203071d4279SBram Moolenaar     long	amount;
204071d4279SBram Moolenaar     long	amount_after;
205071d4279SBram Moolenaar {
20649d7bf13SBram Moolenaar     int		idx;
20749d7bf13SBram Moolenaar     tabpage_T	*tp;
20849d7bf13SBram Moolenaar 
20949d7bf13SBram Moolenaar     /* Handle all tab pages that use the current buffer in a diff. */
21049d7bf13SBram Moolenaar     for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
21149d7bf13SBram Moolenaar     {
21249d7bf13SBram Moolenaar 	idx = diff_buf_idx_tp(curbuf, tp);
21349d7bf13SBram Moolenaar 	if (idx != DB_COUNT)
21449d7bf13SBram Moolenaar 	    diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after);
21549d7bf13SBram Moolenaar     }
21649d7bf13SBram Moolenaar }
21749d7bf13SBram Moolenaar 
21849d7bf13SBram Moolenaar /*
21949d7bf13SBram Moolenaar  * Update line numbers in tab page "tp" for "curbuf" with index "idx".
22049d7bf13SBram Moolenaar  * This attempts to update the changes as much as possible:
22149d7bf13SBram Moolenaar  * When inserting/deleting lines outside of existing change blocks, create a
22249d7bf13SBram Moolenaar  * new change block and update the line numbers in following blocks.
22349d7bf13SBram Moolenaar  * When inserting/deleting lines in existing change blocks, update them.
22449d7bf13SBram Moolenaar  */
22549d7bf13SBram Moolenaar     static void
22649d7bf13SBram Moolenaar diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after)
22749d7bf13SBram Moolenaar     tabpage_T	*tp;
22849d7bf13SBram Moolenaar     int		idx;
22949d7bf13SBram Moolenaar     linenr_T	line1;
23049d7bf13SBram Moolenaar     linenr_T	line2;
23149d7bf13SBram Moolenaar     long	amount;
23249d7bf13SBram Moolenaar     long	amount_after;
23349d7bf13SBram Moolenaar {
234071d4279SBram Moolenaar     diff_T	*dp;
235071d4279SBram Moolenaar     diff_T	*dprev;
236071d4279SBram Moolenaar     diff_T	*dnext;
237071d4279SBram Moolenaar     int		i;
238071d4279SBram Moolenaar     int		inserted, deleted;
239071d4279SBram Moolenaar     int		n, off;
240071d4279SBram Moolenaar     linenr_T	last;
241071d4279SBram Moolenaar     linenr_T	lnum_deleted = line1;	/* lnum of remaining deletion */
242071d4279SBram Moolenaar     int		check_unchanged;
243071d4279SBram Moolenaar 
244071d4279SBram Moolenaar     if (line2 == MAXLNUM)
245071d4279SBram Moolenaar     {
246071d4279SBram Moolenaar 	/* mark_adjust(99, MAXLNUM, 9, 0): insert lines */
247071d4279SBram Moolenaar 	inserted = amount;
248071d4279SBram Moolenaar 	deleted = 0;
249071d4279SBram Moolenaar     }
250071d4279SBram Moolenaar     else if (amount_after > 0)
251071d4279SBram Moolenaar     {
252071d4279SBram Moolenaar 	/* mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines*/
253071d4279SBram Moolenaar 	inserted = amount_after;
254071d4279SBram Moolenaar 	deleted = 0;
255071d4279SBram Moolenaar     }
256071d4279SBram Moolenaar     else
257071d4279SBram Moolenaar     {
258071d4279SBram Moolenaar 	/* mark_adjust(98, 99, MAXLNUM, -2): delete lines */
259071d4279SBram Moolenaar 	inserted = 0;
260071d4279SBram Moolenaar 	deleted = -amount_after;
261071d4279SBram Moolenaar     }
262071d4279SBram Moolenaar 
263071d4279SBram Moolenaar     dprev = NULL;
26449d7bf13SBram Moolenaar     dp = tp->tp_first_diff;
265071d4279SBram Moolenaar     for (;;)
266071d4279SBram Moolenaar     {
267071d4279SBram Moolenaar 	/* If the change is after the previous diff block and before the next
268071d4279SBram Moolenaar 	 * diff block, thus not touching an existing change, create a new diff
269071d4279SBram Moolenaar 	 * block.  Don't do this when ex_diffgetput() is busy. */
270071d4279SBram Moolenaar 	if ((dp == NULL || dp->df_lnum[idx] - 1 > line2
271071d4279SBram Moolenaar 		    || (line2 == MAXLNUM && dp->df_lnum[idx] > line1))
272071d4279SBram Moolenaar 		&& (dprev == NULL
273071d4279SBram Moolenaar 		    || dprev->df_lnum[idx] + dprev->df_count[idx] < line1)
274071d4279SBram Moolenaar 		&& !diff_busy)
275071d4279SBram Moolenaar 	{
27649d7bf13SBram Moolenaar 	    dnext = diff_alloc_new(tp, dprev, dp);
277071d4279SBram Moolenaar 	    if (dnext == NULL)
278071d4279SBram Moolenaar 		return;
279071d4279SBram Moolenaar 
280071d4279SBram Moolenaar 	    dnext->df_lnum[idx] = line1;
281071d4279SBram Moolenaar 	    dnext->df_count[idx] = inserted;
282071d4279SBram Moolenaar 	    for (i = 0; i < DB_COUNT; ++i)
28349d7bf13SBram Moolenaar 		if (tp->tp_diffbuf[i] != NULL && i != idx)
284071d4279SBram Moolenaar 		{
285071d4279SBram Moolenaar 		    if (dprev == NULL)
286071d4279SBram Moolenaar 			dnext->df_lnum[i] = line1;
287071d4279SBram Moolenaar 		    else
288071d4279SBram Moolenaar 			dnext->df_lnum[i] = line1
289071d4279SBram Moolenaar 			    + (dprev->df_lnum[i] + dprev->df_count[i])
290071d4279SBram Moolenaar 			    - (dprev->df_lnum[idx] + dprev->df_count[idx]);
291071d4279SBram Moolenaar 		    dnext->df_count[i] = deleted;
292071d4279SBram Moolenaar 		}
293071d4279SBram Moolenaar 	}
294071d4279SBram Moolenaar 
295071d4279SBram Moolenaar 	/* if at end of the list, quit */
296071d4279SBram Moolenaar 	if (dp == NULL)
297071d4279SBram Moolenaar 	    break;
298071d4279SBram Moolenaar 
299071d4279SBram Moolenaar 	/*
300071d4279SBram Moolenaar 	 * Check for these situations:
301071d4279SBram Moolenaar 	 *	  1  2	3
302071d4279SBram Moolenaar 	 *	  1  2	3
303071d4279SBram Moolenaar 	 * line1     2	3  4  5
304071d4279SBram Moolenaar 	 *	     2	3  4  5
305071d4279SBram Moolenaar 	 *	     2	3  4  5
306071d4279SBram Moolenaar 	 * line2     2	3  4  5
307071d4279SBram Moolenaar 	 *		3     5  6
308071d4279SBram Moolenaar 	 *		3     5  6
309071d4279SBram Moolenaar 	 */
310071d4279SBram Moolenaar 	/* compute last line of this change */
311071d4279SBram Moolenaar 	last = dp->df_lnum[idx] + dp->df_count[idx] - 1;
312071d4279SBram Moolenaar 
313071d4279SBram Moolenaar 	/* 1. change completely above line1: nothing to do */
314071d4279SBram Moolenaar 	if (last >= line1 - 1)
315071d4279SBram Moolenaar 	{
316071d4279SBram Moolenaar 	    /* 6. change below line2: only adjust for amount_after; also when
317071d4279SBram Moolenaar 	     * "deleted" became zero when deleted all lines between two diffs */
318071d4279SBram Moolenaar 	    if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2)
319071d4279SBram Moolenaar 	    {
320071d4279SBram Moolenaar 		if (amount_after == 0)
321071d4279SBram Moolenaar 		    break;	/* nothing left to change */
322071d4279SBram Moolenaar 		dp->df_lnum[idx] += amount_after;
323071d4279SBram Moolenaar 	    }
324071d4279SBram Moolenaar 	    else
325071d4279SBram Moolenaar 	    {
326071d4279SBram Moolenaar 		check_unchanged = FALSE;
327071d4279SBram Moolenaar 
328071d4279SBram Moolenaar 		/* 2. 3. 4. 5.: inserted/deleted lines touching this diff. */
329071d4279SBram Moolenaar 		if (deleted > 0)
330071d4279SBram Moolenaar 		{
331071d4279SBram Moolenaar 		    if (dp->df_lnum[idx] >= line1)
332071d4279SBram Moolenaar 		    {
333071d4279SBram Moolenaar 			off = dp->df_lnum[idx] - lnum_deleted;
334071d4279SBram Moolenaar 			if (last <= line2)
335071d4279SBram Moolenaar 			{
336071d4279SBram Moolenaar 			    /* 4. delete all lines of diff */
337071d4279SBram Moolenaar 			    if (dp->df_next != NULL
338071d4279SBram Moolenaar 				    && dp->df_next->df_lnum[idx] - 1 <= line2)
339071d4279SBram Moolenaar 			    {
340071d4279SBram Moolenaar 				/* delete continues in next diff, only do
341071d4279SBram Moolenaar 				 * lines until that one */
342071d4279SBram Moolenaar 				n = dp->df_next->df_lnum[idx] - lnum_deleted;
343071d4279SBram Moolenaar 				deleted -= n;
344071d4279SBram Moolenaar 				n -= dp->df_count[idx];
345071d4279SBram Moolenaar 				lnum_deleted = dp->df_next->df_lnum[idx];
346071d4279SBram Moolenaar 			    }
347071d4279SBram Moolenaar 			    else
348071d4279SBram Moolenaar 				n = deleted - dp->df_count[idx];
349071d4279SBram Moolenaar 			    dp->df_count[idx] = 0;
350071d4279SBram Moolenaar 			}
351071d4279SBram Moolenaar 			else
352071d4279SBram Moolenaar 			{
353071d4279SBram Moolenaar 			    /* 5. delete lines at or just before top of diff */
354071d4279SBram Moolenaar 			    n = off;
355071d4279SBram Moolenaar 			    dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1;
356071d4279SBram Moolenaar 			    check_unchanged = TRUE;
357071d4279SBram Moolenaar 			}
358071d4279SBram Moolenaar 			dp->df_lnum[idx] = line1;
359071d4279SBram Moolenaar 		    }
360071d4279SBram Moolenaar 		    else
361071d4279SBram Moolenaar 		    {
362071d4279SBram Moolenaar 			off = 0;
363071d4279SBram Moolenaar 			if (last < line2)
364071d4279SBram Moolenaar 			{
365071d4279SBram Moolenaar 			    /* 2. delete at end of of diff */
366071d4279SBram Moolenaar 			    dp->df_count[idx] -= last - lnum_deleted + 1;
367071d4279SBram Moolenaar 			    if (dp->df_next != NULL
368071d4279SBram Moolenaar 				    && dp->df_next->df_lnum[idx] - 1 <= line2)
369071d4279SBram Moolenaar 			    {
370071d4279SBram Moolenaar 				/* delete continues in next diff, only do
371071d4279SBram Moolenaar 				 * lines until that one */
372071d4279SBram Moolenaar 				n = dp->df_next->df_lnum[idx] - 1 - last;
373071d4279SBram Moolenaar 				deleted -= dp->df_next->df_lnum[idx]
374071d4279SBram Moolenaar 							       - lnum_deleted;
375071d4279SBram Moolenaar 				lnum_deleted = dp->df_next->df_lnum[idx];
376071d4279SBram Moolenaar 			    }
377071d4279SBram Moolenaar 			    else
378071d4279SBram Moolenaar 				n = line2 - last;
379071d4279SBram Moolenaar 			    check_unchanged = TRUE;
380071d4279SBram Moolenaar 			}
381071d4279SBram Moolenaar 			else
382071d4279SBram Moolenaar 			{
383071d4279SBram Moolenaar 			    /* 3. delete lines inside the diff */
384071d4279SBram Moolenaar 			    n = 0;
385071d4279SBram Moolenaar 			    dp->df_count[idx] -= deleted;
386071d4279SBram Moolenaar 			}
387071d4279SBram Moolenaar 		    }
388071d4279SBram Moolenaar 
389071d4279SBram Moolenaar 		    for (i = 0; i < DB_COUNT; ++i)
39049d7bf13SBram Moolenaar 			if (tp->tp_diffbuf[i] != NULL && i != idx)
391071d4279SBram Moolenaar 			{
392071d4279SBram Moolenaar 			    dp->df_lnum[i] -= off;
393071d4279SBram Moolenaar 			    dp->df_count[i] += n;
394071d4279SBram Moolenaar 			}
395071d4279SBram Moolenaar 		}
396071d4279SBram Moolenaar 		else
397071d4279SBram Moolenaar 		{
398071d4279SBram Moolenaar 		    if (dp->df_lnum[idx] <= line1)
399071d4279SBram Moolenaar 		    {
400071d4279SBram Moolenaar 			/* inserted lines somewhere in this diff */
401071d4279SBram Moolenaar 			dp->df_count[idx] += inserted;
402071d4279SBram Moolenaar 			check_unchanged = TRUE;
403071d4279SBram Moolenaar 		    }
404071d4279SBram Moolenaar 		    else
405071d4279SBram Moolenaar 			/* inserted lines somewhere above this diff */
406071d4279SBram Moolenaar 			dp->df_lnum[idx] += inserted;
407071d4279SBram Moolenaar 		}
408071d4279SBram Moolenaar 
409071d4279SBram Moolenaar 		if (check_unchanged)
410071d4279SBram Moolenaar 		    /* Check if inserted lines are equal, may reduce the
411071d4279SBram Moolenaar 		     * size of the diff.  TODO: also check for equal lines
412071d4279SBram Moolenaar 		     * in the middle and perhaps split the block. */
41349d7bf13SBram Moolenaar 		    diff_check_unchanged(tp, dp);
414071d4279SBram Moolenaar 	    }
415071d4279SBram Moolenaar 	}
416071d4279SBram Moolenaar 
417071d4279SBram Moolenaar 	/* check if this block touches the previous one, may merge them. */
418071d4279SBram Moolenaar 	if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx]
419071d4279SBram Moolenaar 							  == dp->df_lnum[idx])
420071d4279SBram Moolenaar 	{
421071d4279SBram Moolenaar 	    for (i = 0; i < DB_COUNT; ++i)
42249d7bf13SBram Moolenaar 		if (tp->tp_diffbuf[i] != NULL)
423071d4279SBram Moolenaar 		    dprev->df_count[i] += dp->df_count[i];
424071d4279SBram Moolenaar 	    dprev->df_next = dp->df_next;
425071d4279SBram Moolenaar 	    vim_free(dp);
426071d4279SBram Moolenaar 	    dp = dprev->df_next;
427071d4279SBram Moolenaar 	}
428071d4279SBram Moolenaar 	else
429071d4279SBram Moolenaar 	{
430071d4279SBram Moolenaar 	    /* Advance to next entry. */
431071d4279SBram Moolenaar 	    dprev = dp;
432071d4279SBram Moolenaar 	    dp = dp->df_next;
433071d4279SBram Moolenaar 	}
434071d4279SBram Moolenaar     }
435071d4279SBram Moolenaar 
436071d4279SBram Moolenaar     dprev = NULL;
43749d7bf13SBram Moolenaar     dp = tp->tp_first_diff;
438071d4279SBram Moolenaar     while (dp != NULL)
439071d4279SBram Moolenaar     {
440071d4279SBram Moolenaar 	/* All counts are zero, remove this entry. */
441071d4279SBram Moolenaar 	for (i = 0; i < DB_COUNT; ++i)
44249d7bf13SBram Moolenaar 	    if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
443071d4279SBram Moolenaar 		break;
444071d4279SBram Moolenaar 	if (i == DB_COUNT)
445071d4279SBram Moolenaar 	{
446071d4279SBram Moolenaar 	    dnext = dp->df_next;
447071d4279SBram Moolenaar 	    vim_free(dp);
448071d4279SBram Moolenaar 	    dp = dnext;
449071d4279SBram Moolenaar 	    if (dprev == NULL)
45049d7bf13SBram Moolenaar 		tp->tp_first_diff = dnext;
451071d4279SBram Moolenaar 	    else
452071d4279SBram Moolenaar 		dprev->df_next = dnext;
453071d4279SBram Moolenaar 	}
454071d4279SBram Moolenaar 	else
455071d4279SBram Moolenaar 	{
456071d4279SBram Moolenaar 	    /* Advance to next entry. */
457071d4279SBram Moolenaar 	    dprev = dp;
458071d4279SBram Moolenaar 	    dp = dp->df_next;
459071d4279SBram Moolenaar 	}
460071d4279SBram Moolenaar 
461071d4279SBram Moolenaar     }
46249d7bf13SBram Moolenaar 
46349d7bf13SBram Moolenaar     if (tp == curtab)
46449d7bf13SBram Moolenaar     {
465071d4279SBram Moolenaar 	diff_redraw(TRUE);
466071d4279SBram Moolenaar 
46749d7bf13SBram Moolenaar 	/* Need to recompute the scroll binding, may remove or add filler
46849d7bf13SBram Moolenaar 	 * lines (e.g., when adding lines above w_topline). But it's slow when
46949d7bf13SBram Moolenaar 	 * making many changes, postpone until redrawing. */
47066fa271aSBram Moolenaar 	diff_need_scrollbind = TRUE;
471071d4279SBram Moolenaar     }
47249d7bf13SBram Moolenaar }
473071d4279SBram Moolenaar 
474071d4279SBram Moolenaar /*
475071d4279SBram Moolenaar  * Allocate a new diff block and link it between "dprev" and "dp".
476071d4279SBram Moolenaar  */
477071d4279SBram Moolenaar     static diff_T *
47849d7bf13SBram Moolenaar diff_alloc_new(tp, dprev, dp)
47949d7bf13SBram Moolenaar     tabpage_T	*tp;
480071d4279SBram Moolenaar     diff_T	*dprev;
481071d4279SBram Moolenaar     diff_T	*dp;
482071d4279SBram Moolenaar {
483071d4279SBram Moolenaar     diff_T	*dnew;
484071d4279SBram Moolenaar 
485071d4279SBram Moolenaar     dnew = (diff_T *)alloc((unsigned)sizeof(diff_T));
486071d4279SBram Moolenaar     if (dnew != NULL)
487071d4279SBram Moolenaar     {
488071d4279SBram Moolenaar 	dnew->df_next = dp;
489071d4279SBram Moolenaar 	if (dprev == NULL)
49049d7bf13SBram Moolenaar 	    tp->tp_first_diff = dnew;
491071d4279SBram Moolenaar 	else
492071d4279SBram Moolenaar 	    dprev->df_next = dnew;
493071d4279SBram Moolenaar     }
494071d4279SBram Moolenaar     return dnew;
495071d4279SBram Moolenaar }
496071d4279SBram Moolenaar 
497071d4279SBram Moolenaar /*
498071d4279SBram Moolenaar  * Check if the diff block "dp" can be made smaller for lines at the start and
499071d4279SBram Moolenaar  * end that are equal.  Called after inserting lines.
500071d4279SBram Moolenaar  * This may result in a change where all buffers have zero lines, the caller
501071d4279SBram Moolenaar  * must take care of removing it.
502071d4279SBram Moolenaar  */
503071d4279SBram Moolenaar     static void
50449d7bf13SBram Moolenaar diff_check_unchanged(tp, dp)
50549d7bf13SBram Moolenaar     tabpage_T	*tp;
506071d4279SBram Moolenaar     diff_T	*dp;
507071d4279SBram Moolenaar {
508071d4279SBram Moolenaar     int		i_org;
509071d4279SBram Moolenaar     int		i_new;
510071d4279SBram Moolenaar     int		off_org, off_new;
511071d4279SBram Moolenaar     char_u	*line_org;
512071d4279SBram Moolenaar     int		dir = FORWARD;
513071d4279SBram Moolenaar 
514071d4279SBram Moolenaar     /* Find the first buffers, use it as the original, compare the other
515071d4279SBram Moolenaar      * buffer lines against this one. */
516071d4279SBram Moolenaar     for (i_org = 0; i_org < DB_COUNT; ++i_org)
51749d7bf13SBram Moolenaar 	if (tp->tp_diffbuf[i_org] != NULL)
518071d4279SBram Moolenaar 	    break;
519071d4279SBram Moolenaar     if (i_org == DB_COUNT)	/* safety check */
520071d4279SBram Moolenaar 	return;
521071d4279SBram Moolenaar 
52249d7bf13SBram Moolenaar     if (diff_check_sanity(tp, dp) == FAIL)
523071d4279SBram Moolenaar 	return;
524071d4279SBram Moolenaar 
525071d4279SBram Moolenaar     /* First check lines at the top, then at the bottom. */
526071d4279SBram Moolenaar     off_org = 0;
527071d4279SBram Moolenaar     off_new = 0;
528071d4279SBram Moolenaar     for (;;)
529071d4279SBram Moolenaar     {
530071d4279SBram Moolenaar 	/* Repeat until a line is found which is different or the number of
531071d4279SBram Moolenaar 	 * lines has become zero. */
532071d4279SBram Moolenaar 	while (dp->df_count[i_org] > 0)
533071d4279SBram Moolenaar 	{
534071d4279SBram Moolenaar 	    /* Copy the line, the next ml_get() will invalidate it.  */
535071d4279SBram Moolenaar 	    if (dir == BACKWARD)
536071d4279SBram Moolenaar 		off_org = dp->df_count[i_org] - 1;
53749d7bf13SBram Moolenaar 	    line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org],
538071d4279SBram Moolenaar 					dp->df_lnum[i_org] + off_org, FALSE));
539071d4279SBram Moolenaar 	    if (line_org == NULL)
540071d4279SBram Moolenaar 		return;
541071d4279SBram Moolenaar 	    for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new)
542071d4279SBram Moolenaar 	    {
54349d7bf13SBram Moolenaar 		if (tp->tp_diffbuf[i_new] == NULL)
544071d4279SBram Moolenaar 		    continue;
545071d4279SBram Moolenaar 		if (dir == BACKWARD)
546071d4279SBram Moolenaar 		    off_new = dp->df_count[i_new] - 1;
547071d4279SBram Moolenaar 		/* if other buffer doesn't have this line, it was inserted */
548071d4279SBram Moolenaar 		if (off_new < 0 || off_new >= dp->df_count[i_new])
549071d4279SBram Moolenaar 		    break;
55049d7bf13SBram Moolenaar 		if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new],
551071d4279SBram Moolenaar 				   dp->df_lnum[i_new] + off_new, FALSE)) != 0)
552071d4279SBram Moolenaar 		    break;
553071d4279SBram Moolenaar 	    }
554071d4279SBram Moolenaar 	    vim_free(line_org);
555071d4279SBram Moolenaar 
556071d4279SBram Moolenaar 	    /* Stop when a line isn't equal in all diff buffers. */
557071d4279SBram Moolenaar 	    if (i_new != DB_COUNT)
558071d4279SBram Moolenaar 		break;
559071d4279SBram Moolenaar 
560071d4279SBram Moolenaar 	    /* Line matched in all buffers, remove it from the diff. */
561071d4279SBram Moolenaar 	    for (i_new = i_org; i_new < DB_COUNT; ++i_new)
56249d7bf13SBram Moolenaar 		if (tp->tp_diffbuf[i_new] != NULL)
563071d4279SBram Moolenaar 		{
564071d4279SBram Moolenaar 		    if (dir == FORWARD)
565071d4279SBram Moolenaar 			++dp->df_lnum[i_new];
566071d4279SBram Moolenaar 		    --dp->df_count[i_new];
567071d4279SBram Moolenaar 		}
568071d4279SBram Moolenaar 	}
569071d4279SBram Moolenaar 	if (dir == BACKWARD)
570071d4279SBram Moolenaar 	    break;
571071d4279SBram Moolenaar 	dir = BACKWARD;
572071d4279SBram Moolenaar     }
573071d4279SBram Moolenaar }
574071d4279SBram Moolenaar 
575071d4279SBram Moolenaar /*
576071d4279SBram Moolenaar  * Check if a diff block doesn't contain invalid line numbers.
577071d4279SBram Moolenaar  * This can happen when the diff program returns invalid results.
578071d4279SBram Moolenaar  */
579071d4279SBram Moolenaar     static int
58049d7bf13SBram Moolenaar diff_check_sanity(tp, dp)
58149d7bf13SBram Moolenaar     tabpage_T	*tp;
582071d4279SBram Moolenaar     diff_T	*dp;
583071d4279SBram Moolenaar {
584071d4279SBram Moolenaar     int		i;
585071d4279SBram Moolenaar 
586071d4279SBram Moolenaar     for (i = 0; i < DB_COUNT; ++i)
58749d7bf13SBram Moolenaar 	if (tp->tp_diffbuf[i] != NULL)
588071d4279SBram Moolenaar 	    if (dp->df_lnum[i] + dp->df_count[i] - 1
58949d7bf13SBram Moolenaar 				      > tp->tp_diffbuf[i]->b_ml.ml_line_count)
590071d4279SBram Moolenaar 		return FAIL;
591071d4279SBram Moolenaar     return OK;
592071d4279SBram Moolenaar }
593071d4279SBram Moolenaar 
594071d4279SBram Moolenaar /*
59549d7bf13SBram Moolenaar  * Mark all diff buffers in the current tab page for redraw.
596071d4279SBram Moolenaar  */
597071d4279SBram Moolenaar     static void
598071d4279SBram Moolenaar diff_redraw(dofold)
599071d4279SBram Moolenaar     int		dofold;	    /* also recompute the folds */
600071d4279SBram Moolenaar {
601071d4279SBram Moolenaar     win_T	*wp;
602071d4279SBram Moolenaar     int		n;
603071d4279SBram Moolenaar 
604071d4279SBram Moolenaar     for (wp = firstwin; wp != NULL; wp = wp->w_next)
605071d4279SBram Moolenaar 	if (wp->w_p_diff)
606071d4279SBram Moolenaar 	{
60760f8377eSBram Moolenaar 	    redraw_win_later(wp, SOME_VALID);
608071d4279SBram Moolenaar #ifdef FEAT_FOLDING
609071d4279SBram Moolenaar 	    if (dofold && foldmethodIsDiff(wp))
610071d4279SBram Moolenaar 		foldUpdateAll(wp);
611071d4279SBram Moolenaar #endif
612071d4279SBram Moolenaar 	    /* A change may have made filler lines invalid, need to take care
613071d4279SBram Moolenaar 	     * of that for other windows. */
614071d4279SBram Moolenaar 	    if (wp != curwin && wp->w_topfill > 0)
615071d4279SBram Moolenaar 	    {
616071d4279SBram Moolenaar 		n = diff_check(wp, wp->w_topline);
617071d4279SBram Moolenaar 		if (wp->w_topfill > n)
618071d4279SBram Moolenaar 		    wp->w_topfill = (n < 0 ? 0 : n);
619071d4279SBram Moolenaar 	    }
620071d4279SBram Moolenaar 	}
621071d4279SBram Moolenaar }
622071d4279SBram Moolenaar 
623071d4279SBram Moolenaar /*
624071d4279SBram Moolenaar  * Write buffer "buf" to file "name".
625071d4279SBram Moolenaar  * Always use 'fileformat' set to "unix".
626071d4279SBram Moolenaar  * Return FAIL for failure
627071d4279SBram Moolenaar  */
628071d4279SBram Moolenaar     static int
629071d4279SBram Moolenaar diff_write(buf, fname)
630071d4279SBram Moolenaar     buf_T	*buf;
631071d4279SBram Moolenaar     char_u	*fname;
632071d4279SBram Moolenaar {
633071d4279SBram Moolenaar     int		r;
634071d4279SBram Moolenaar     char_u	*save_ff;
635071d4279SBram Moolenaar 
636071d4279SBram Moolenaar     save_ff = buf->b_p_ff;
637071d4279SBram Moolenaar     buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
638071d4279SBram Moolenaar     r = buf_write(buf, fname, NULL, (linenr_T)1, buf->b_ml.ml_line_count,
639071d4279SBram Moolenaar 					     NULL, FALSE, FALSE, FALSE, TRUE);
640071d4279SBram Moolenaar     free_string_option(buf->b_p_ff);
641071d4279SBram Moolenaar     buf->b_p_ff = save_ff;
642071d4279SBram Moolenaar     return r;
643071d4279SBram Moolenaar }
644071d4279SBram Moolenaar 
645071d4279SBram Moolenaar /*
646071d4279SBram Moolenaar  * Completely update the diffs for the buffers involved.
647071d4279SBram Moolenaar  * This uses the ordinary "diff" command.
648071d4279SBram Moolenaar  * The buffers are written to a file, also for unmodified buffers (the file
649071d4279SBram Moolenaar  * could have been produced by autocommands, e.g. the netrw plugin).
650071d4279SBram Moolenaar  */
651071d4279SBram Moolenaar /*ARGSUSED*/
652071d4279SBram Moolenaar     void
653071d4279SBram Moolenaar ex_diffupdate(eap)
65449d7bf13SBram Moolenaar     exarg_T	*eap;	    /* can be NULL, it's not used */
655071d4279SBram Moolenaar {
656071d4279SBram Moolenaar     buf_T	*buf;
657071d4279SBram Moolenaar     int		idx_orig;
658071d4279SBram Moolenaar     int		idx_new;
659071d4279SBram Moolenaar     char_u	*tmp_orig;
660071d4279SBram Moolenaar     char_u	*tmp_new;
661071d4279SBram Moolenaar     char_u	*tmp_diff;
662071d4279SBram Moolenaar     FILE	*fd;
663071d4279SBram Moolenaar     int		ok;
664071d4279SBram Moolenaar 
665071d4279SBram Moolenaar     /* Delete all diffblocks. */
66649d7bf13SBram Moolenaar     diff_clear(curtab);
66749d7bf13SBram Moolenaar     curtab->tp_diff_invalid = FALSE;
668071d4279SBram Moolenaar 
669071d4279SBram Moolenaar     /* Use the first buffer as the original text. */
670071d4279SBram Moolenaar     for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig)
67149d7bf13SBram Moolenaar 	if (curtab->tp_diffbuf[idx_orig] != NULL)
672071d4279SBram Moolenaar 	    break;
673071d4279SBram Moolenaar     if (idx_orig == DB_COUNT)
674071d4279SBram Moolenaar 	return;
675071d4279SBram Moolenaar 
676071d4279SBram Moolenaar     /* Only need to do something when there is another buffer. */
677071d4279SBram Moolenaar     for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
67849d7bf13SBram Moolenaar 	if (curtab->tp_diffbuf[idx_new] != NULL)
679071d4279SBram Moolenaar 	    break;
680071d4279SBram Moolenaar     if (idx_new == DB_COUNT)
681071d4279SBram Moolenaar 	return;
682071d4279SBram Moolenaar 
683071d4279SBram Moolenaar     /* We need three temp file names. */
684071d4279SBram Moolenaar     tmp_orig = vim_tempname('o');
685071d4279SBram Moolenaar     tmp_new = vim_tempname('n');
686071d4279SBram Moolenaar     tmp_diff = vim_tempname('d');
687071d4279SBram Moolenaar     if (tmp_orig == NULL || tmp_new == NULL || tmp_diff == NULL)
688071d4279SBram Moolenaar 	goto theend;
689071d4279SBram Moolenaar 
690071d4279SBram Moolenaar     /*
691071d4279SBram Moolenaar      * Do a quick test if "diff" really works.  Otherwise it looks like there
692071d4279SBram Moolenaar      * are no differences.  Can't use the return value, it's non-zero when
693071d4279SBram Moolenaar      * there are differences.
694071d4279SBram Moolenaar      * May try twice, first with "-a" and then without.
695071d4279SBram Moolenaar      */
696071d4279SBram Moolenaar     for (;;)
697071d4279SBram Moolenaar     {
698071d4279SBram Moolenaar 	ok = FALSE;
699bfd8fc05SBram Moolenaar 	fd = mch_fopen((char *)tmp_orig, "w");
700071d4279SBram Moolenaar 	if (fd != NULL)
701071d4279SBram Moolenaar 	{
702071d4279SBram Moolenaar 	    fwrite("line1\n", (size_t)6, (size_t)1, fd);
703071d4279SBram Moolenaar 	    fclose(fd);
704bfd8fc05SBram Moolenaar 	    fd = mch_fopen((char *)tmp_new, "w");
705071d4279SBram Moolenaar 	    if (fd != NULL)
706071d4279SBram Moolenaar 	    {
707071d4279SBram Moolenaar 		fwrite("line2\n", (size_t)6, (size_t)1, fd);
708071d4279SBram Moolenaar 		fclose(fd);
709071d4279SBram Moolenaar 		diff_file(tmp_orig, tmp_new, tmp_diff);
710bfd8fc05SBram Moolenaar 		fd = mch_fopen((char *)tmp_diff, "r");
711071d4279SBram Moolenaar 		if (fd != NULL)
712071d4279SBram Moolenaar 		{
713071d4279SBram Moolenaar 		    char_u	linebuf[LBUFLEN];
714071d4279SBram Moolenaar 
715071d4279SBram Moolenaar 		    for (;;)
716071d4279SBram Moolenaar 		    {
717071d4279SBram Moolenaar 			/* There must be a line that contains "1c1". */
718071d4279SBram Moolenaar 			if (tag_fgets(linebuf, LBUFLEN, fd))
719071d4279SBram Moolenaar 			    break;
720071d4279SBram Moolenaar 			if (STRNCMP(linebuf, "1c1", 3) == 0)
721071d4279SBram Moolenaar 			    ok = TRUE;
722071d4279SBram Moolenaar 		    }
723071d4279SBram Moolenaar 		    fclose(fd);
724071d4279SBram Moolenaar 		}
725071d4279SBram Moolenaar 		mch_remove(tmp_diff);
726071d4279SBram Moolenaar 		mch_remove(tmp_new);
727071d4279SBram Moolenaar 	    }
728071d4279SBram Moolenaar 	    mch_remove(tmp_orig);
729071d4279SBram Moolenaar 	}
730071d4279SBram Moolenaar 
731071d4279SBram Moolenaar #ifdef FEAT_EVAL
732071d4279SBram Moolenaar 	/* When using 'diffexpr' break here. */
733071d4279SBram Moolenaar 	if (*p_dex != NUL)
734071d4279SBram Moolenaar 	    break;
735071d4279SBram Moolenaar #endif
736071d4279SBram Moolenaar 
737071d4279SBram Moolenaar #if defined(MSWIN) || defined(MSDOS)
738071d4279SBram Moolenaar 	/* If the "-a" argument works, also check if "--binary" works. */
739071d4279SBram Moolenaar 	if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE)
740071d4279SBram Moolenaar 	{
741071d4279SBram Moolenaar 	    diff_a_works = TRUE;
742071d4279SBram Moolenaar 	    diff_bin_works = TRUE;
743071d4279SBram Moolenaar 	    continue;
744071d4279SBram Moolenaar 	}
745071d4279SBram Moolenaar 	if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE)
746071d4279SBram Moolenaar 	{
747071d4279SBram Moolenaar 	    /* Tried --binary, but it failed. "-a" works though. */
748071d4279SBram Moolenaar 	    diff_bin_works = FALSE;
749071d4279SBram Moolenaar 	    ok = TRUE;
750071d4279SBram Moolenaar 	}
751071d4279SBram Moolenaar #endif
752071d4279SBram Moolenaar 
753071d4279SBram Moolenaar 	/* If we checked if "-a" works already, break here. */
754071d4279SBram Moolenaar 	if (diff_a_works != MAYBE)
755071d4279SBram Moolenaar 	    break;
756071d4279SBram Moolenaar 	diff_a_works = ok;
757071d4279SBram Moolenaar 
758071d4279SBram Moolenaar 	/* If "-a" works break here, otherwise retry without "-a". */
759071d4279SBram Moolenaar 	if (ok)
760071d4279SBram Moolenaar 	    break;
761071d4279SBram Moolenaar     }
762071d4279SBram Moolenaar     if (!ok)
763071d4279SBram Moolenaar     {
764071d4279SBram Moolenaar 	EMSG(_("E97: Cannot create diffs"));
765071d4279SBram Moolenaar 	diff_a_works = MAYBE;
766071d4279SBram Moolenaar #if defined(MSWIN) || defined(MSDOS)
767071d4279SBram Moolenaar 	diff_bin_works = MAYBE;
768071d4279SBram Moolenaar #endif
769071d4279SBram Moolenaar 	goto theend;
770071d4279SBram Moolenaar     }
771071d4279SBram Moolenaar 
772071d4279SBram Moolenaar     /* Write the first buffer to a tempfile. */
77349d7bf13SBram Moolenaar     buf = curtab->tp_diffbuf[idx_orig];
774071d4279SBram Moolenaar     if (diff_write(buf, tmp_orig) == FAIL)
775071d4279SBram Moolenaar 	goto theend;
776071d4279SBram Moolenaar 
777071d4279SBram Moolenaar     /* Make a difference between the first buffer and every other. */
778071d4279SBram Moolenaar     for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
779071d4279SBram Moolenaar     {
78049d7bf13SBram Moolenaar 	buf = curtab->tp_diffbuf[idx_new];
781071d4279SBram Moolenaar 	if (buf == NULL)
782071d4279SBram Moolenaar 	    continue;
783071d4279SBram Moolenaar 	if (diff_write(buf, tmp_new) == FAIL)
784071d4279SBram Moolenaar 	    continue;
785071d4279SBram Moolenaar 	diff_file(tmp_orig, tmp_new, tmp_diff);
786071d4279SBram Moolenaar 
787071d4279SBram Moolenaar 	/* Read the diff output and add each entry to the diff list. */
788071d4279SBram Moolenaar 	diff_read(idx_orig, idx_new, tmp_diff);
789071d4279SBram Moolenaar 	mch_remove(tmp_diff);
790071d4279SBram Moolenaar 	mch_remove(tmp_new);
791071d4279SBram Moolenaar     }
792071d4279SBram Moolenaar     mch_remove(tmp_orig);
793071d4279SBram Moolenaar 
794071d4279SBram Moolenaar     diff_redraw(TRUE);
795071d4279SBram Moolenaar 
796071d4279SBram Moolenaar theend:
797071d4279SBram Moolenaar     vim_free(tmp_orig);
798071d4279SBram Moolenaar     vim_free(tmp_new);
799071d4279SBram Moolenaar     vim_free(tmp_diff);
800071d4279SBram Moolenaar }
801071d4279SBram Moolenaar 
802071d4279SBram Moolenaar /*
803071d4279SBram Moolenaar  * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
804071d4279SBram Moolenaar  */
805071d4279SBram Moolenaar     static void
806071d4279SBram Moolenaar diff_file(tmp_orig, tmp_new, tmp_diff)
807071d4279SBram Moolenaar     char_u	*tmp_orig;
808071d4279SBram Moolenaar     char_u	*tmp_new;
809071d4279SBram Moolenaar     char_u	*tmp_diff;
810071d4279SBram Moolenaar {
811071d4279SBram Moolenaar     char_u	*cmd;
812071d4279SBram Moolenaar 
813071d4279SBram Moolenaar #ifdef FEAT_EVAL
814071d4279SBram Moolenaar     if (*p_dex != NUL)
815071d4279SBram Moolenaar 	/* Use 'diffexpr' to generate the diff file. */
816071d4279SBram Moolenaar 	eval_diff(tmp_orig, tmp_new, tmp_diff);
817071d4279SBram Moolenaar     else
818071d4279SBram Moolenaar #endif
819071d4279SBram Moolenaar     {
820071d4279SBram Moolenaar 	cmd = alloc((unsigned)(STRLEN(tmp_orig) + STRLEN(tmp_new)
821071d4279SBram Moolenaar 				+ STRLEN(tmp_diff) + STRLEN(p_srr) + 27));
822071d4279SBram Moolenaar 	if (cmd != NULL)
823071d4279SBram Moolenaar 	{
82495fb60acSBram Moolenaar 	    /* We don't want $DIFF_OPTIONS to get in the way. */
82595fb60acSBram Moolenaar 	    if (getenv("DIFF_OPTIONS"))
82695fb60acSBram Moolenaar 		vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)"");
82795fb60acSBram Moolenaar 
828071d4279SBram Moolenaar 	    /* Build the diff command and execute it.  Always use -a, binary
829071d4279SBram Moolenaar 	     * differences are of no use.  Ignore errors, diff returns
830071d4279SBram Moolenaar 	     * non-zero when differences have been found. */
831071d4279SBram Moolenaar 	    sprintf((char *)cmd, "diff %s%s%s%s%s %s",
832071d4279SBram Moolenaar 		    diff_a_works == FALSE ? "" : "-a ",
833071d4279SBram Moolenaar #if defined(MSWIN) || defined(MSDOS)
834071d4279SBram Moolenaar 		    diff_bin_works == TRUE ? "--binary " : "",
835071d4279SBram Moolenaar #else
836071d4279SBram Moolenaar 		    "",
837071d4279SBram Moolenaar #endif
838071d4279SBram Moolenaar 		    (diff_flags & DIFF_IWHITE) ? "-b " : "",
839071d4279SBram Moolenaar 		    (diff_flags & DIFF_ICASE) ? "-i " : "",
840071d4279SBram Moolenaar 		    tmp_orig, tmp_new);
841071d4279SBram Moolenaar 	    append_redir(cmd, p_srr, tmp_diff);
8427fc904b6SBram Moolenaar #ifdef FEAT_AUTOCMD
8437fc904b6SBram Moolenaar 	    ++autocmd_block;	/* Avoid ShellCmdPost stuff */
8447fc904b6SBram Moolenaar #endif
845071d4279SBram Moolenaar 	    (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
8467fc904b6SBram Moolenaar #ifdef FEAT_AUTOCMD
8477fc904b6SBram Moolenaar 	    --autocmd_block;
8487fc904b6SBram Moolenaar #endif
849071d4279SBram Moolenaar 	    vim_free(cmd);
850071d4279SBram Moolenaar 	}
851071d4279SBram Moolenaar     }
852071d4279SBram Moolenaar }
853071d4279SBram Moolenaar 
854071d4279SBram Moolenaar /*
855071d4279SBram Moolenaar  * Create a new version of a file from the current buffer and a diff file.
856071d4279SBram Moolenaar  * The buffer is written to a file, also for unmodified buffers (the file
857071d4279SBram Moolenaar  * could have been produced by autocommands, e.g. the netrw plugin).
858071d4279SBram Moolenaar  */
859071d4279SBram Moolenaar     void
860071d4279SBram Moolenaar ex_diffpatch(eap)
861071d4279SBram Moolenaar     exarg_T	*eap;
862071d4279SBram Moolenaar {
863071d4279SBram Moolenaar     char_u	*tmp_orig;	/* name of original temp file */
864071d4279SBram Moolenaar     char_u	*tmp_new;	/* name of patched temp file */
865071d4279SBram Moolenaar     char_u	*buf = NULL;
866071d4279SBram Moolenaar     win_T	*old_curwin = curwin;
867071d4279SBram Moolenaar     char_u	*newname = NULL;	/* name of patched file buffer */
868071d4279SBram Moolenaar #ifdef UNIX
869071d4279SBram Moolenaar     char_u	dirbuf[MAXPATHL];
870071d4279SBram Moolenaar     char_u	*fullname = NULL;
871071d4279SBram Moolenaar #endif
872071d4279SBram Moolenaar #ifdef FEAT_BROWSE
873071d4279SBram Moolenaar     char_u	*browseFile = NULL;
874071d4279SBram Moolenaar     int		browse_flag = cmdmod.browse;
875071d4279SBram Moolenaar #endif
876071d4279SBram Moolenaar 
877071d4279SBram Moolenaar #ifdef FEAT_BROWSE
878071d4279SBram Moolenaar     if (cmdmod.browse)
879071d4279SBram Moolenaar     {
8807171abeaSBram Moolenaar 	browseFile = do_browse(0, (char_u *)_("Patch file"),
881071d4279SBram Moolenaar 			 eap->arg, NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL);
882071d4279SBram Moolenaar 	if (browseFile == NULL)
883071d4279SBram Moolenaar 	    return;		/* operation cancelled */
884071d4279SBram Moolenaar 	eap->arg = browseFile;
885071d4279SBram Moolenaar 	cmdmod.browse = FALSE;	/* don't let do_ecmd() browse again */
886071d4279SBram Moolenaar     }
887071d4279SBram Moolenaar #endif
888071d4279SBram Moolenaar 
889071d4279SBram Moolenaar     /* We need two temp file names. */
890071d4279SBram Moolenaar     tmp_orig = vim_tempname('o');
891071d4279SBram Moolenaar     tmp_new = vim_tempname('n');
892071d4279SBram Moolenaar     if (tmp_orig == NULL || tmp_new == NULL)
893071d4279SBram Moolenaar 	goto theend;
894071d4279SBram Moolenaar 
895071d4279SBram Moolenaar     /* Write the current buffer to "tmp_orig". */
896071d4279SBram Moolenaar     if (buf_write(curbuf, tmp_orig, NULL,
897071d4279SBram Moolenaar 		(linenr_T)1, curbuf->b_ml.ml_line_count,
898071d4279SBram Moolenaar 				     NULL, FALSE, FALSE, FALSE, TRUE) == FAIL)
899071d4279SBram Moolenaar 	goto theend;
900071d4279SBram Moolenaar 
901071d4279SBram Moolenaar #ifdef UNIX
902071d4279SBram Moolenaar     /* Get the absolute path of the patchfile, changing directory below. */
903071d4279SBram Moolenaar     fullname = FullName_save(eap->arg, FALSE);
904071d4279SBram Moolenaar #endif
905071d4279SBram Moolenaar     buf = alloc((unsigned)(STRLEN(tmp_orig) + (
906071d4279SBram Moolenaar # ifdef UNIX
907071d4279SBram Moolenaar 		    fullname != NULL ? STRLEN(fullname) :
908071d4279SBram Moolenaar # endif
909071d4279SBram Moolenaar 		    STRLEN(eap->arg)) + STRLEN(tmp_new) + 16));
910071d4279SBram Moolenaar     if (buf == NULL)
911071d4279SBram Moolenaar 	goto theend;
912071d4279SBram Moolenaar 
913071d4279SBram Moolenaar #ifdef UNIX
914071d4279SBram Moolenaar     /* Temporaraly chdir to /tmp, to avoid patching files in the current
915071d4279SBram Moolenaar      * directory when the patch file contains more than one patch.  When we
916071d4279SBram Moolenaar      * have our own temp dir use that instead, it will be cleaned up when we
917071d4279SBram Moolenaar      * exit (any .rej files created).  Don't change directory if we can't
918071d4279SBram Moolenaar      * return to the current. */
919071d4279SBram Moolenaar     if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0)
920071d4279SBram Moolenaar 	dirbuf[0] = NUL;
921071d4279SBram Moolenaar     else
922071d4279SBram Moolenaar     {
923071d4279SBram Moolenaar # ifdef TEMPDIRNAMES
924071d4279SBram Moolenaar 	if (vim_tempdir != NULL)
925071d4279SBram Moolenaar 	    mch_chdir((char *)vim_tempdir);
926071d4279SBram Moolenaar 	else
927071d4279SBram Moolenaar # endif
928071d4279SBram Moolenaar 	    mch_chdir("/tmp");
929071d4279SBram Moolenaar 	shorten_fnames(TRUE);
930071d4279SBram Moolenaar     }
931071d4279SBram Moolenaar #endif
932071d4279SBram Moolenaar 
933071d4279SBram Moolenaar #ifdef FEAT_EVAL
934071d4279SBram Moolenaar     if (*p_pex != NUL)
935071d4279SBram Moolenaar 	/* Use 'patchexpr' to generate the new file. */
936071d4279SBram Moolenaar 	eval_patch(tmp_orig,
937071d4279SBram Moolenaar # ifdef UNIX
938071d4279SBram Moolenaar 		fullname != NULL ? fullname :
939071d4279SBram Moolenaar # endif
940071d4279SBram Moolenaar 		eap->arg, tmp_new);
941071d4279SBram Moolenaar     else
942071d4279SBram Moolenaar #endif
943071d4279SBram Moolenaar     {
944071d4279SBram Moolenaar 	/* Build the patch command and execute it.  Ignore errors.  Switch to
945071d4279SBram Moolenaar 	 * cooked mode to allow the user to respond to prompts. */
946071d4279SBram Moolenaar 	sprintf((char *)buf, "patch -o %s %s < \"%s\"", tmp_new, tmp_orig,
947071d4279SBram Moolenaar # ifdef UNIX
948071d4279SBram Moolenaar 		fullname != NULL ? fullname :
949071d4279SBram Moolenaar # endif
950071d4279SBram Moolenaar 		eap->arg);
9517fc904b6SBram Moolenaar #ifdef FEAT_AUTOCMD
9527fc904b6SBram Moolenaar 	++autocmd_block;	/* Avoid ShellCmdPost stuff */
9537fc904b6SBram Moolenaar #endif
954071d4279SBram Moolenaar 	(void)call_shell(buf, SHELL_FILTER | SHELL_COOKED);
9557fc904b6SBram Moolenaar #ifdef FEAT_AUTOCMD
9567fc904b6SBram Moolenaar 	--autocmd_block;
9577fc904b6SBram Moolenaar #endif
958071d4279SBram Moolenaar     }
959071d4279SBram Moolenaar 
960071d4279SBram Moolenaar #ifdef UNIX
961071d4279SBram Moolenaar     if (dirbuf[0] != NUL)
962071d4279SBram Moolenaar     {
963071d4279SBram Moolenaar 	if (mch_chdir((char *)dirbuf) != 0)
964071d4279SBram Moolenaar 	    EMSG(_(e_prev_dir));
965071d4279SBram Moolenaar 	shorten_fnames(TRUE);
966071d4279SBram Moolenaar     }
967071d4279SBram Moolenaar #endif
968071d4279SBram Moolenaar 
969071d4279SBram Moolenaar     /* patch probably has written over the screen */
970071d4279SBram Moolenaar     redraw_later(CLEAR);
971071d4279SBram Moolenaar 
972071d4279SBram Moolenaar     /* Delete any .orig or .rej file created. */
973071d4279SBram Moolenaar     STRCPY(buf, tmp_new);
974071d4279SBram Moolenaar     STRCAT(buf, ".orig");
975071d4279SBram Moolenaar     mch_remove(buf);
976071d4279SBram Moolenaar     STRCPY(buf, tmp_new);
977071d4279SBram Moolenaar     STRCAT(buf, ".rej");
978071d4279SBram Moolenaar     mch_remove(buf);
979071d4279SBram Moolenaar 
980071d4279SBram Moolenaar     if (curbuf->b_fname != NULL)
981071d4279SBram Moolenaar     {
982071d4279SBram Moolenaar 	newname = vim_strnsave(curbuf->b_fname,
983071d4279SBram Moolenaar 					  (int)(STRLEN(curbuf->b_fname) + 4));
984071d4279SBram Moolenaar 	if (newname != NULL)
985071d4279SBram Moolenaar 	    STRCAT(newname, ".new");
986071d4279SBram Moolenaar     }
987071d4279SBram Moolenaar 
988071d4279SBram Moolenaar #ifdef FEAT_GUI
989071d4279SBram Moolenaar     need_mouse_correct = TRUE;
990071d4279SBram Moolenaar #endif
99180a94a58SBram Moolenaar     /* don't use a new tab page, each tab page has its own diffs */
99280a94a58SBram Moolenaar     cmdmod.tab = 0;
99380a94a58SBram Moolenaar 
994c4675a19SBram Moolenaar     if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
995071d4279SBram Moolenaar     {
996071d4279SBram Moolenaar 	/* Pretend it was a ":split fname" command */
997071d4279SBram Moolenaar 	eap->cmdidx = CMD_split;
998071d4279SBram Moolenaar 	eap->arg = tmp_new;
999071d4279SBram Moolenaar 	do_exedit(eap, old_curwin);
1000071d4279SBram Moolenaar 
1001071d4279SBram Moolenaar 	if (curwin != old_curwin)		/* split must have worked */
1002071d4279SBram Moolenaar 	{
1003071d4279SBram Moolenaar 	    /* Set 'diff', 'scrollbind' on and 'wrap' off. */
1004071d4279SBram Moolenaar 	    diff_win_options(curwin, TRUE);
1005071d4279SBram Moolenaar 	    diff_win_options(old_curwin, TRUE);
1006071d4279SBram Moolenaar 
1007071d4279SBram Moolenaar 	    if (newname != NULL)
1008071d4279SBram Moolenaar 	    {
1009071d4279SBram Moolenaar 		/* do a ":file filename.new" on the patched buffer */
1010071d4279SBram Moolenaar 		eap->arg = newname;
1011071d4279SBram Moolenaar 		ex_file(eap);
1012071d4279SBram Moolenaar 
1013071d4279SBram Moolenaar #ifdef FEAT_AUTOCMD
1014071d4279SBram Moolenaar 		/* Do filetype detection with the new name. */
1015910f66f9SBram Moolenaar 		if (au_has_group((char_u *)"filetypedetect"))
1016071d4279SBram Moolenaar 		    do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
1017071d4279SBram Moolenaar #endif
1018071d4279SBram Moolenaar 	    }
1019071d4279SBram Moolenaar 	}
1020071d4279SBram Moolenaar     }
1021071d4279SBram Moolenaar 
1022071d4279SBram Moolenaar theend:
1023071d4279SBram Moolenaar     if (tmp_orig != NULL)
1024071d4279SBram Moolenaar 	mch_remove(tmp_orig);
1025071d4279SBram Moolenaar     vim_free(tmp_orig);
1026071d4279SBram Moolenaar     if (tmp_new != NULL)
1027071d4279SBram Moolenaar 	mch_remove(tmp_new);
1028071d4279SBram Moolenaar     vim_free(tmp_new);
1029071d4279SBram Moolenaar     vim_free(newname);
1030071d4279SBram Moolenaar     vim_free(buf);
1031071d4279SBram Moolenaar #ifdef UNIX
1032071d4279SBram Moolenaar     vim_free(fullname);
1033071d4279SBram Moolenaar #endif
1034071d4279SBram Moolenaar #ifdef FEAT_BROWSE
1035071d4279SBram Moolenaar     vim_free(browseFile);
1036071d4279SBram Moolenaar     cmdmod.browse = browse_flag;
1037071d4279SBram Moolenaar #endif
1038071d4279SBram Moolenaar }
1039071d4279SBram Moolenaar 
1040071d4279SBram Moolenaar /*
1041071d4279SBram Moolenaar  * Split the window and edit another file, setting options to show the diffs.
1042071d4279SBram Moolenaar  */
1043071d4279SBram Moolenaar     void
1044071d4279SBram Moolenaar ex_diffsplit(eap)
1045071d4279SBram Moolenaar     exarg_T	*eap;
1046071d4279SBram Moolenaar {
1047071d4279SBram Moolenaar     win_T	*old_curwin = curwin;
1048071d4279SBram Moolenaar 
1049071d4279SBram Moolenaar #ifdef FEAT_GUI
1050071d4279SBram Moolenaar     need_mouse_correct = TRUE;
1051071d4279SBram Moolenaar #endif
105280a94a58SBram Moolenaar     /* don't use a new tab page, each tab page has its own diffs */
105380a94a58SBram Moolenaar     cmdmod.tab = 0;
105480a94a58SBram Moolenaar 
1055c4675a19SBram Moolenaar     if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
1056071d4279SBram Moolenaar     {
1057071d4279SBram Moolenaar 	/* Pretend it was a ":split fname" command */
1058071d4279SBram Moolenaar 	eap->cmdidx = CMD_split;
10594be06f9eSBram Moolenaar 	curwin->w_p_diff = TRUE;
1060071d4279SBram Moolenaar 	do_exedit(eap, old_curwin);
1061071d4279SBram Moolenaar 
1062071d4279SBram Moolenaar 	if (curwin != old_curwin)		/* split must have worked */
1063071d4279SBram Moolenaar 	{
1064071d4279SBram Moolenaar 	    /* Set 'diff', 'scrollbind' on and 'wrap' off. */
1065071d4279SBram Moolenaar 	    diff_win_options(curwin, TRUE);
1066071d4279SBram Moolenaar 	    diff_win_options(old_curwin, TRUE);
1067071d4279SBram Moolenaar 	}
1068071d4279SBram Moolenaar     }
1069071d4279SBram Moolenaar }
1070071d4279SBram Moolenaar 
1071071d4279SBram Moolenaar /*
1072071d4279SBram Moolenaar  * Set options to show difs for the current window.
1073071d4279SBram Moolenaar  */
1074071d4279SBram Moolenaar /*ARGSUSED*/
1075071d4279SBram Moolenaar     void
1076071d4279SBram Moolenaar ex_diffthis(eap)
1077071d4279SBram Moolenaar     exarg_T	*eap;
1078071d4279SBram Moolenaar {
1079071d4279SBram Moolenaar     /* Set 'diff', 'scrollbind' on and 'wrap' off. */
1080071d4279SBram Moolenaar     diff_win_options(curwin, TRUE);
1081071d4279SBram Moolenaar }
1082071d4279SBram Moolenaar 
1083071d4279SBram Moolenaar /*
1084071d4279SBram Moolenaar  * Set options in window "wp" for diff mode.
1085071d4279SBram Moolenaar  */
1086071d4279SBram Moolenaar     void
1087071d4279SBram Moolenaar diff_win_options(wp, addbuf)
1088071d4279SBram Moolenaar     win_T	*wp;
1089071d4279SBram Moolenaar     int		addbuf;		/* Add buffer to diff. */
1090071d4279SBram Moolenaar {
1091071d4279SBram Moolenaar     wp->w_p_diff = TRUE;
1092071d4279SBram Moolenaar     wp->w_p_scb = TRUE;
1093071d4279SBram Moolenaar     wp->w_p_wrap = FALSE;
1094071d4279SBram Moolenaar # ifdef FEAT_FOLDING
1095071d4279SBram Moolenaar     {
1096071d4279SBram Moolenaar 	win_T	    *old_curwin = curwin;
1097071d4279SBram Moolenaar 
1098071d4279SBram Moolenaar 	curwin = wp;
1099071d4279SBram Moolenaar 	curbuf = curwin->w_buffer;
1100071d4279SBram Moolenaar 	set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff",
11015e3cb7e8SBram Moolenaar 						       OPT_LOCAL|OPT_FREE, 0);
1102071d4279SBram Moolenaar 	curwin = old_curwin;
1103071d4279SBram Moolenaar 	curbuf = curwin->w_buffer;
1104c4675a19SBram Moolenaar 	wp->w_p_fdc = diff_foldcolumn;
1105071d4279SBram Moolenaar 	wp->w_p_fen = TRUE;
1106071d4279SBram Moolenaar 	wp->w_p_fdl = 0;
1107071d4279SBram Moolenaar 	foldUpdateAll(wp);
11082df6dcc5SBram Moolenaar 	/* make sure topline is not halfway a fold */
11092df6dcc5SBram Moolenaar 	changed_window_setting_win(wp);
1110071d4279SBram Moolenaar     }
1111071d4279SBram Moolenaar # endif
1112071d4279SBram Moolenaar #ifdef FEAT_SCROLLBIND
1113071d4279SBram Moolenaar     if (vim_strchr(p_sbo, 'h') == NULL)
1114071d4279SBram Moolenaar 	do_cmdline_cmd((char_u *)"set sbo+=hor");
1115071d4279SBram Moolenaar #endif
1116071d4279SBram Moolenaar 
1117071d4279SBram Moolenaar     if (addbuf)
1118071d4279SBram Moolenaar 	diff_buf_add(wp->w_buffer);
1119071d4279SBram Moolenaar     redraw_win_later(wp, NOT_VALID);
1120071d4279SBram Moolenaar }
1121071d4279SBram Moolenaar 
1122071d4279SBram Moolenaar /*
11232df6dcc5SBram Moolenaar  * Set options not to show diffs.  For the current window or all windows.
1124f740b29aSBram Moolenaar  * Only in the current tab page.
11252df6dcc5SBram Moolenaar  */
11262df6dcc5SBram Moolenaar     void
11272df6dcc5SBram Moolenaar ex_diffoff(eap)
11282df6dcc5SBram Moolenaar     exarg_T	*eap;
11292df6dcc5SBram Moolenaar {
11302df6dcc5SBram Moolenaar     win_T	*wp;
11312df6dcc5SBram Moolenaar     win_T	*old_curwin = curwin;
11322df6dcc5SBram Moolenaar #ifdef FEAT_SCROLLBIND
11332df6dcc5SBram Moolenaar     int		diffwin = FALSE;
11342df6dcc5SBram Moolenaar #endif
11352df6dcc5SBram Moolenaar 
11362df6dcc5SBram Moolenaar     for (wp = firstwin; wp != NULL; wp = wp->w_next)
11372df6dcc5SBram Moolenaar     {
11382df6dcc5SBram Moolenaar 	if (wp == curwin || eap->forceit)
11392df6dcc5SBram Moolenaar 	{
11402df6dcc5SBram Moolenaar 	    /* Set 'diff', 'scrollbind' off and 'wrap' on. */
11412df6dcc5SBram Moolenaar 	    wp->w_p_diff = FALSE;
11422df6dcc5SBram Moolenaar 	    wp->w_p_scb = FALSE;
11432df6dcc5SBram Moolenaar 	    wp->w_p_wrap = TRUE;
11442df6dcc5SBram Moolenaar #ifdef FEAT_FOLDING
11452df6dcc5SBram Moolenaar 	    curwin = wp;
11462df6dcc5SBram Moolenaar 	    curbuf = curwin->w_buffer;
11472df6dcc5SBram Moolenaar 	    set_string_option_direct((char_u *)"fdm", -1,
11485e3cb7e8SBram Moolenaar 				   (char_u *)"manual", OPT_LOCAL|OPT_FREE, 0);
11492df6dcc5SBram Moolenaar 	    curwin = old_curwin;
11502df6dcc5SBram Moolenaar 	    curbuf = curwin->w_buffer;
11512df6dcc5SBram Moolenaar 	    wp->w_p_fdc = 0;
11522df6dcc5SBram Moolenaar 	    wp->w_p_fen = FALSE;
11532df6dcc5SBram Moolenaar 	    wp->w_p_fdl = 0;
11542df6dcc5SBram Moolenaar 	    foldUpdateAll(wp);
11552df6dcc5SBram Moolenaar 	    /* make sure topline is not halfway a fold */
11562df6dcc5SBram Moolenaar 	    changed_window_setting_win(wp);
11572df6dcc5SBram Moolenaar #endif
11582df6dcc5SBram Moolenaar 	    diff_buf_adjust(wp);
11592df6dcc5SBram Moolenaar 	}
11602df6dcc5SBram Moolenaar #ifdef FEAT_SCROLLBIND
11612df6dcc5SBram Moolenaar 	diffwin |= wp->w_p_diff;
11622df6dcc5SBram Moolenaar #endif
11632df6dcc5SBram Moolenaar     }
11642df6dcc5SBram Moolenaar 
11652df6dcc5SBram Moolenaar #ifdef FEAT_SCROLLBIND
11662df6dcc5SBram Moolenaar     /* Remove "hor" from from 'scrollopt' if there are no diff windows left. */
11672df6dcc5SBram Moolenaar     if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
11682df6dcc5SBram Moolenaar 	do_cmdline_cmd((char_u *)"set sbo-=hor");
11692df6dcc5SBram Moolenaar #endif
11702df6dcc5SBram Moolenaar }
11712df6dcc5SBram Moolenaar 
11722df6dcc5SBram Moolenaar /*
1173071d4279SBram Moolenaar  * Read the diff output and add each entry to the diff list.
1174071d4279SBram Moolenaar  */
1175071d4279SBram Moolenaar     static void
1176071d4279SBram Moolenaar diff_read(idx_orig, idx_new, fname)
1177071d4279SBram Moolenaar     int		idx_orig;	/* idx of original file */
1178071d4279SBram Moolenaar     int		idx_new;	/* idx of new file */
1179071d4279SBram Moolenaar     char_u	*fname;		/* name of diff output file */
1180071d4279SBram Moolenaar {
1181071d4279SBram Moolenaar     FILE	*fd;
1182071d4279SBram Moolenaar     diff_T	*dprev = NULL;
118349d7bf13SBram Moolenaar     diff_T	*dp = curtab->tp_first_diff;
1184071d4279SBram Moolenaar     diff_T	*dn, *dpl;
1185071d4279SBram Moolenaar     long	f1, l1, f2, l2;
1186071d4279SBram Moolenaar     char_u	linebuf[LBUFLEN];   /* only need to hold the diff line */
1187071d4279SBram Moolenaar     int		difftype;
1188071d4279SBram Moolenaar     char_u	*p;
1189071d4279SBram Moolenaar     long	off;
1190071d4279SBram Moolenaar     int		i;
1191071d4279SBram Moolenaar     linenr_T	lnum_orig, lnum_new;
1192071d4279SBram Moolenaar     long	count_orig, count_new;
1193071d4279SBram Moolenaar     int		notset = TRUE;	    /* block "*dp" not set yet */
1194071d4279SBram Moolenaar 
1195bfd8fc05SBram Moolenaar     fd = mch_fopen((char *)fname, "r");
1196071d4279SBram Moolenaar     if (fd == NULL)
1197071d4279SBram Moolenaar     {
1198071d4279SBram Moolenaar 	EMSG(_("E98: Cannot read diff output"));
1199071d4279SBram Moolenaar 	return;
1200071d4279SBram Moolenaar     }
1201071d4279SBram Moolenaar 
1202071d4279SBram Moolenaar     for (;;)
1203071d4279SBram Moolenaar     {
1204071d4279SBram Moolenaar 	if (tag_fgets(linebuf, LBUFLEN, fd))
1205071d4279SBram Moolenaar 	    break;		/* end of file */
1206071d4279SBram Moolenaar 	if (!isdigit(*linebuf))
1207071d4279SBram Moolenaar 	    continue;		/* not the start of a diff block */
1208071d4279SBram Moolenaar 
1209071d4279SBram Moolenaar 	/* This line must be one of three formats:
1210071d4279SBram Moolenaar 	 * {first}[,{last}]c{first}[,{last}]
1211071d4279SBram Moolenaar 	 * {first}a{first}[,{last}]
1212071d4279SBram Moolenaar 	 * {first}[,{last}]d{first}
1213071d4279SBram Moolenaar 	 */
1214071d4279SBram Moolenaar 	p = linebuf;
1215071d4279SBram Moolenaar 	f1 = getdigits(&p);
1216071d4279SBram Moolenaar 	if (*p == ',')
1217071d4279SBram Moolenaar 	{
1218071d4279SBram Moolenaar 	    ++p;
1219071d4279SBram Moolenaar 	    l1 = getdigits(&p);
1220071d4279SBram Moolenaar 	}
1221071d4279SBram Moolenaar 	else
1222071d4279SBram Moolenaar 	    l1 = f1;
1223071d4279SBram Moolenaar 	if (*p != 'a' && *p != 'c' && *p != 'd')
1224071d4279SBram Moolenaar 	    continue;		/* invalid diff format */
1225071d4279SBram Moolenaar 	difftype = *p++;
1226071d4279SBram Moolenaar 	f2 = getdigits(&p);
1227071d4279SBram Moolenaar 	if (*p == ',')
1228071d4279SBram Moolenaar 	{
1229071d4279SBram Moolenaar 	    ++p;
1230071d4279SBram Moolenaar 	    l2 = getdigits(&p);
1231071d4279SBram Moolenaar 	}
1232071d4279SBram Moolenaar 	else
1233071d4279SBram Moolenaar 	    l2 = f2;
1234071d4279SBram Moolenaar 	if (l1 < f1 || l2 < f2)
1235071d4279SBram Moolenaar 	    continue;		/* invalid line range */
1236071d4279SBram Moolenaar 
1237071d4279SBram Moolenaar 	if (difftype == 'a')
1238071d4279SBram Moolenaar 	{
1239071d4279SBram Moolenaar 	    lnum_orig = f1 + 1;
1240071d4279SBram Moolenaar 	    count_orig = 0;
1241071d4279SBram Moolenaar 	}
1242071d4279SBram Moolenaar 	else
1243071d4279SBram Moolenaar 	{
1244071d4279SBram Moolenaar 	    lnum_orig = f1;
1245071d4279SBram Moolenaar 	    count_orig = l1 - f1 + 1;
1246071d4279SBram Moolenaar 	}
1247071d4279SBram Moolenaar 	if (difftype == 'd')
1248071d4279SBram Moolenaar 	{
1249071d4279SBram Moolenaar 	    lnum_new = f2 + 1;
1250071d4279SBram Moolenaar 	    count_new = 0;
1251071d4279SBram Moolenaar 	}
1252071d4279SBram Moolenaar 	else
1253071d4279SBram Moolenaar 	{
1254071d4279SBram Moolenaar 	    lnum_new = f2;
1255071d4279SBram Moolenaar 	    count_new = l2 - f2 + 1;
1256071d4279SBram Moolenaar 	}
1257071d4279SBram Moolenaar 
1258071d4279SBram Moolenaar 	/* Go over blocks before the change, for which orig and new are equal.
1259071d4279SBram Moolenaar 	 * Copy blocks from orig to new. */
1260071d4279SBram Moolenaar 	while (dp != NULL
1261071d4279SBram Moolenaar 		&& lnum_orig > dp->df_lnum[idx_orig] + dp->df_count[idx_orig])
1262071d4279SBram Moolenaar 	{
1263071d4279SBram Moolenaar 	    if (notset)
1264071d4279SBram Moolenaar 		diff_copy_entry(dprev, dp, idx_orig, idx_new);
1265071d4279SBram Moolenaar 	    dprev = dp;
1266071d4279SBram Moolenaar 	    dp = dp->df_next;
1267071d4279SBram Moolenaar 	    notset = TRUE;
1268071d4279SBram Moolenaar 	}
1269071d4279SBram Moolenaar 
1270071d4279SBram Moolenaar 	if (dp != NULL
1271071d4279SBram Moolenaar 		&& lnum_orig <= dp->df_lnum[idx_orig] + dp->df_count[idx_orig]
1272071d4279SBram Moolenaar 		&& lnum_orig + count_orig >= dp->df_lnum[idx_orig])
1273071d4279SBram Moolenaar 	{
1274071d4279SBram Moolenaar 	    /* New block overlaps with existing block(s).
1275071d4279SBram Moolenaar 	     * First find last block that overlaps. */
1276071d4279SBram Moolenaar 	    for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next)
1277071d4279SBram Moolenaar 		if (lnum_orig + count_orig < dpl->df_next->df_lnum[idx_orig])
1278071d4279SBram Moolenaar 		    break;
1279071d4279SBram Moolenaar 
1280071d4279SBram Moolenaar 	    /* If the newly found block starts before the old one, set the
1281071d4279SBram Moolenaar 	     * start back a number of lines. */
1282071d4279SBram Moolenaar 	    off = dp->df_lnum[idx_orig] - lnum_orig;
1283071d4279SBram Moolenaar 	    if (off > 0)
1284071d4279SBram Moolenaar 	    {
1285071d4279SBram Moolenaar 		for (i = idx_orig; i < idx_new; ++i)
128649d7bf13SBram Moolenaar 		    if (curtab->tp_diffbuf[i] != NULL)
1287071d4279SBram Moolenaar 			dp->df_lnum[i] -= off;
1288071d4279SBram Moolenaar 		dp->df_lnum[idx_new] = lnum_new;
1289071d4279SBram Moolenaar 		dp->df_count[idx_new] = count_new;
1290071d4279SBram Moolenaar 	    }
1291071d4279SBram Moolenaar 	    else if (notset)
1292071d4279SBram Moolenaar 	    {
1293071d4279SBram Moolenaar 		/* new block inside existing one, adjust new block */
1294071d4279SBram Moolenaar 		dp->df_lnum[idx_new] = lnum_new + off;
1295071d4279SBram Moolenaar 		dp->df_count[idx_new] = count_new - off;
1296071d4279SBram Moolenaar 	    }
1297071d4279SBram Moolenaar 	    else
1298071d4279SBram Moolenaar 		/* second overlap of new block with existing block */
1299071d4279SBram Moolenaar 		dp->df_count[idx_new] += count_new - count_orig;
1300071d4279SBram Moolenaar 
1301071d4279SBram Moolenaar 	    /* Adjust the size of the block to include all the lines to the
1302071d4279SBram Moolenaar 	     * end of the existing block or the new diff, whatever ends last. */
1303071d4279SBram Moolenaar 	    off = (lnum_orig + count_orig)
1304071d4279SBram Moolenaar 			 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]);
1305071d4279SBram Moolenaar 	    if (off < 0)
1306071d4279SBram Moolenaar 	    {
1307071d4279SBram Moolenaar 		/* new change ends in existing block, adjust the end if not
1308071d4279SBram Moolenaar 		 * done already */
1309071d4279SBram Moolenaar 		if (notset)
1310071d4279SBram Moolenaar 		    dp->df_count[idx_new] += -off;
1311071d4279SBram Moolenaar 		off = 0;
1312071d4279SBram Moolenaar 	    }
1313071d4279SBram Moolenaar 	    for (i = idx_orig; i < idx_new + !notset; ++i)
131449d7bf13SBram Moolenaar 		if (curtab->tp_diffbuf[i] != NULL)
1315071d4279SBram Moolenaar 		    dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
1316071d4279SBram Moolenaar 						       - dp->df_lnum[i] + off;
1317071d4279SBram Moolenaar 
1318071d4279SBram Moolenaar 	    /* Delete the diff blocks that have been merged into one. */
1319071d4279SBram Moolenaar 	    dn = dp->df_next;
1320071d4279SBram Moolenaar 	    dp->df_next = dpl->df_next;
1321071d4279SBram Moolenaar 	    while (dn != dp->df_next)
1322071d4279SBram Moolenaar 	    {
1323071d4279SBram Moolenaar 		dpl = dn->df_next;
1324071d4279SBram Moolenaar 		vim_free(dn);
1325071d4279SBram Moolenaar 		dn = dpl;
1326071d4279SBram Moolenaar 	    }
1327071d4279SBram Moolenaar 	}
1328071d4279SBram Moolenaar 	else
1329071d4279SBram Moolenaar 	{
1330071d4279SBram Moolenaar 	    /* Allocate a new diffblock. */
133149d7bf13SBram Moolenaar 	    dp = diff_alloc_new(curtab, dprev, dp);
1332071d4279SBram Moolenaar 	    if (dp == NULL)
1333071d4279SBram Moolenaar 		return;
1334071d4279SBram Moolenaar 
1335071d4279SBram Moolenaar 	    dp->df_lnum[idx_orig] = lnum_orig;
1336071d4279SBram Moolenaar 	    dp->df_count[idx_orig] = count_orig;
1337071d4279SBram Moolenaar 	    dp->df_lnum[idx_new] = lnum_new;
1338071d4279SBram Moolenaar 	    dp->df_count[idx_new] = count_new;
1339071d4279SBram Moolenaar 
1340071d4279SBram Moolenaar 	    /* Set values for other buffers, these must be equal to the
1341071d4279SBram Moolenaar 	     * original buffer, otherwise there would have been a change
1342071d4279SBram Moolenaar 	     * already. */
1343071d4279SBram Moolenaar 	    for (i = idx_orig + 1; i < idx_new; ++i)
134449d7bf13SBram Moolenaar 		if (curtab->tp_diffbuf[i] != NULL)
1345071d4279SBram Moolenaar 		    diff_copy_entry(dprev, dp, idx_orig, i);
1346071d4279SBram Moolenaar 	}
1347071d4279SBram Moolenaar 	notset = FALSE;		/* "*dp" has been set */
1348071d4279SBram Moolenaar     }
1349071d4279SBram Moolenaar 
1350071d4279SBram Moolenaar     /* for remaining diff blocks orig and new are equal */
1351071d4279SBram Moolenaar     while (dp != NULL)
1352071d4279SBram Moolenaar     {
1353071d4279SBram Moolenaar 	if (notset)
1354071d4279SBram Moolenaar 	    diff_copy_entry(dprev, dp, idx_orig, idx_new);
1355071d4279SBram Moolenaar 	dprev = dp;
1356071d4279SBram Moolenaar 	dp = dp->df_next;
1357071d4279SBram Moolenaar 	notset = TRUE;
1358071d4279SBram Moolenaar     }
1359071d4279SBram Moolenaar 
1360071d4279SBram Moolenaar     fclose(fd);
1361071d4279SBram Moolenaar }
1362071d4279SBram Moolenaar 
1363071d4279SBram Moolenaar /*
1364071d4279SBram Moolenaar  * Copy an entry at "dp" from "idx_orig" to "idx_new".
1365071d4279SBram Moolenaar  */
1366071d4279SBram Moolenaar     static void
1367071d4279SBram Moolenaar diff_copy_entry(dprev, dp, idx_orig, idx_new)
1368071d4279SBram Moolenaar     diff_T	*dprev;
1369071d4279SBram Moolenaar     diff_T	*dp;
1370071d4279SBram Moolenaar     int		idx_orig;
1371071d4279SBram Moolenaar     int		idx_new;
1372071d4279SBram Moolenaar {
1373071d4279SBram Moolenaar     long	off;
1374071d4279SBram Moolenaar 
1375071d4279SBram Moolenaar     if (dprev == NULL)
1376071d4279SBram Moolenaar 	off = 0;
1377071d4279SBram Moolenaar     else
1378071d4279SBram Moolenaar 	off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig])
1379071d4279SBram Moolenaar 	    - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]);
1380071d4279SBram Moolenaar     dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off;
1381071d4279SBram Moolenaar     dp->df_count[idx_new] = dp->df_count[idx_orig];
1382071d4279SBram Moolenaar }
1383071d4279SBram Moolenaar 
1384071d4279SBram Moolenaar /*
138549d7bf13SBram Moolenaar  * Clear the list of diffblocks for tab page "tp".
1386071d4279SBram Moolenaar  */
1387ea408854SBram Moolenaar     void
138849d7bf13SBram Moolenaar diff_clear(tp)
138949d7bf13SBram Moolenaar     tabpage_T	*tp;
1390071d4279SBram Moolenaar {
1391071d4279SBram Moolenaar     diff_T	*p, *next_p;
1392071d4279SBram Moolenaar 
139349d7bf13SBram Moolenaar     for (p = tp->tp_first_diff; p != NULL; p = next_p)
1394071d4279SBram Moolenaar     {
1395071d4279SBram Moolenaar 	next_p = p->df_next;
1396071d4279SBram Moolenaar 	vim_free(p);
1397071d4279SBram Moolenaar     }
139849d7bf13SBram Moolenaar     tp->tp_first_diff = NULL;
1399071d4279SBram Moolenaar }
1400071d4279SBram Moolenaar 
1401071d4279SBram Moolenaar /*
1402071d4279SBram Moolenaar  * Check diff status for line "lnum" in buffer "buf":
1403071d4279SBram Moolenaar  * Returns 0 for nothing special
1404071d4279SBram Moolenaar  * Returns -1 for a line that should be highlighted as changed.
1405071d4279SBram Moolenaar  * Returns -2 for a line that should be highlighted as added/deleted.
1406071d4279SBram Moolenaar  * Returns > 0 for inserting that many filler lines above it (never happens
1407071d4279SBram Moolenaar  * when 'diffopt' doesn't contain "filler").
1408071d4279SBram Moolenaar  * This should only be used for windows where 'diff' is set.
1409071d4279SBram Moolenaar  */
1410071d4279SBram Moolenaar     int
1411071d4279SBram Moolenaar diff_check(wp, lnum)
1412071d4279SBram Moolenaar     win_T	*wp;
1413071d4279SBram Moolenaar     linenr_T	lnum;
1414071d4279SBram Moolenaar {
141549d7bf13SBram Moolenaar     int		idx;		/* index in tp_diffbuf[] for this buffer */
1416071d4279SBram Moolenaar     diff_T	*dp;
1417071d4279SBram Moolenaar     int		maxcount;
1418071d4279SBram Moolenaar     int		i;
1419071d4279SBram Moolenaar     buf_T	*buf = wp->w_buffer;
1420071d4279SBram Moolenaar     int		cmp;
1421071d4279SBram Moolenaar 
142249d7bf13SBram Moolenaar     if (curtab->tp_diff_invalid)
1423071d4279SBram Moolenaar 	ex_diffupdate(NULL);		/* update after a big change */
1424071d4279SBram Moolenaar 
142549d7bf13SBram Moolenaar     if (curtab->tp_first_diff == NULL || !wp->w_p_diff)	/* no diffs at all */
1426071d4279SBram Moolenaar 	return 0;
1427071d4279SBram Moolenaar 
1428071d4279SBram Moolenaar     /* safety check: "lnum" must be a buffer line */
1429071d4279SBram Moolenaar     if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1)
1430071d4279SBram Moolenaar 	return 0;
1431071d4279SBram Moolenaar 
1432071d4279SBram Moolenaar     idx = diff_buf_idx(buf);
1433071d4279SBram Moolenaar     if (idx == DB_COUNT)
1434071d4279SBram Moolenaar 	return 0;		/* no diffs for buffer "buf" */
1435071d4279SBram Moolenaar 
1436071d4279SBram Moolenaar #ifdef FEAT_FOLDING
1437071d4279SBram Moolenaar     /* A closed fold never has filler lines. */
1438071d4279SBram Moolenaar     if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL))
1439071d4279SBram Moolenaar 	return 0;
1440071d4279SBram Moolenaar #endif
1441071d4279SBram Moolenaar 
1442071d4279SBram Moolenaar     /* search for a change that includes "lnum" in the list of diffblocks. */
144349d7bf13SBram Moolenaar     for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1444071d4279SBram Moolenaar 	if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
1445071d4279SBram Moolenaar 	    break;
1446071d4279SBram Moolenaar     if (dp == NULL || lnum < dp->df_lnum[idx])
1447071d4279SBram Moolenaar 	return 0;
1448071d4279SBram Moolenaar 
1449071d4279SBram Moolenaar     if (lnum < dp->df_lnum[idx] + dp->df_count[idx])
1450071d4279SBram Moolenaar     {
1451071d4279SBram Moolenaar 	int	zero = FALSE;
1452071d4279SBram Moolenaar 
1453071d4279SBram Moolenaar 	/* Changed or inserted line.  If the other buffers have a count of
1454071d4279SBram Moolenaar 	 * zero, the lines were inserted.  If the other buffers have the same
1455071d4279SBram Moolenaar 	 * count, check if the lines are identical. */
1456071d4279SBram Moolenaar 	cmp = FALSE;
1457071d4279SBram Moolenaar 	for (i = 0; i < DB_COUNT; ++i)
145849d7bf13SBram Moolenaar 	    if (i != idx && curtab->tp_diffbuf[i] != NULL)
1459071d4279SBram Moolenaar 	    {
1460071d4279SBram Moolenaar 		if (dp->df_count[i] == 0)
1461071d4279SBram Moolenaar 		    zero = TRUE;
1462071d4279SBram Moolenaar 		else
1463071d4279SBram Moolenaar 		{
1464071d4279SBram Moolenaar 		    if (dp->df_count[i] != dp->df_count[idx])
1465071d4279SBram Moolenaar 			return -1;	    /* nr of lines changed. */
1466071d4279SBram Moolenaar 		    cmp = TRUE;
1467071d4279SBram Moolenaar 		}
1468071d4279SBram Moolenaar 	    }
1469071d4279SBram Moolenaar 	if (cmp)
1470071d4279SBram Moolenaar 	{
1471071d4279SBram Moolenaar 	    /* Compare all lines.  If they are equal the lines were inserted
1472071d4279SBram Moolenaar 	     * in some buffers, deleted in others, but not changed. */
1473071d4279SBram Moolenaar 	    for (i = 0; i < DB_COUNT; ++i)
147449d7bf13SBram Moolenaar 		if (i != idx && curtab->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
1475071d4279SBram Moolenaar 		    if (!diff_equal_entry(dp, idx, i))
1476071d4279SBram Moolenaar 			return -1;
1477071d4279SBram Moolenaar 	}
1478071d4279SBram Moolenaar 	/* If there is no buffer with zero lines then there is no difference
1479071d4279SBram Moolenaar 	 * any longer.  Happens when making a change (or undo) that removes
1480071d4279SBram Moolenaar 	 * the difference.  Can't remove the entry here, we might be halfway
1481071d4279SBram Moolenaar 	 * updating the window.  Just report the text as unchanged.  Other
1482071d4279SBram Moolenaar 	 * windows might still show the change though. */
1483071d4279SBram Moolenaar 	if (zero == FALSE)
1484071d4279SBram Moolenaar 	    return 0;
1485071d4279SBram Moolenaar 	return -2;
1486071d4279SBram Moolenaar     }
1487071d4279SBram Moolenaar 
1488071d4279SBram Moolenaar     /* If 'diffopt' doesn't contain "filler", return 0. */
1489071d4279SBram Moolenaar     if (!(diff_flags & DIFF_FILLER))
1490071d4279SBram Moolenaar 	return 0;
1491071d4279SBram Moolenaar 
1492071d4279SBram Moolenaar     /* Insert filler lines above the line just below the change.  Will return
1493071d4279SBram Moolenaar      * 0 when this buf had the max count. */
1494071d4279SBram Moolenaar     maxcount = 0;
1495071d4279SBram Moolenaar     for (i = 0; i < DB_COUNT; ++i)
149649d7bf13SBram Moolenaar 	if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount)
1497071d4279SBram Moolenaar 	    maxcount = dp->df_count[i];
1498071d4279SBram Moolenaar     return maxcount - dp->df_count[idx];
1499071d4279SBram Moolenaar }
1500071d4279SBram Moolenaar 
1501071d4279SBram Moolenaar /*
1502071d4279SBram Moolenaar  * Compare two entries in diff "*dp" and return TRUE if they are equal.
1503071d4279SBram Moolenaar  */
1504071d4279SBram Moolenaar     static int
1505071d4279SBram Moolenaar diff_equal_entry(dp, idx1, idx2)
1506071d4279SBram Moolenaar     diff_T	*dp;
1507071d4279SBram Moolenaar     int		idx1;
1508071d4279SBram Moolenaar     int		idx2;
1509071d4279SBram Moolenaar {
1510071d4279SBram Moolenaar     int		i;
1511071d4279SBram Moolenaar     char_u	*line;
1512071d4279SBram Moolenaar     int		cmp;
1513071d4279SBram Moolenaar 
1514071d4279SBram Moolenaar     if (dp->df_count[idx1] != dp->df_count[idx2])
1515071d4279SBram Moolenaar 	return FALSE;
151649d7bf13SBram Moolenaar     if (diff_check_sanity(curtab, dp) == FAIL)
1517071d4279SBram Moolenaar 	return FALSE;
1518071d4279SBram Moolenaar     for (i = 0; i < dp->df_count[idx1]; ++i)
1519071d4279SBram Moolenaar     {
152049d7bf13SBram Moolenaar 	line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1],
1521071d4279SBram Moolenaar 					       dp->df_lnum[idx1] + i, FALSE));
1522071d4279SBram Moolenaar 	if (line == NULL)
1523071d4279SBram Moolenaar 	    return FALSE;
152449d7bf13SBram Moolenaar 	cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2],
1525071d4279SBram Moolenaar 					       dp->df_lnum[idx2] + i, FALSE));
1526071d4279SBram Moolenaar 	vim_free(line);
1527071d4279SBram Moolenaar 	if (cmp != 0)
1528071d4279SBram Moolenaar 	    return FALSE;
1529071d4279SBram Moolenaar     }
1530071d4279SBram Moolenaar     return TRUE;
1531071d4279SBram Moolenaar }
1532071d4279SBram Moolenaar 
1533071d4279SBram Moolenaar /*
1534071d4279SBram Moolenaar  * Compare strings "s1" and "s2" according to 'diffopt'.
1535071d4279SBram Moolenaar  * Return non-zero when they are different.
1536071d4279SBram Moolenaar  */
1537071d4279SBram Moolenaar     static int
1538071d4279SBram Moolenaar diff_cmp(s1, s2)
1539071d4279SBram Moolenaar     char_u	*s1;
1540071d4279SBram Moolenaar     char_u	*s2;
1541071d4279SBram Moolenaar {
1542071d4279SBram Moolenaar     char_u	*p1, *p2;
1543071d4279SBram Moolenaar #ifdef FEAT_MBYTE
1544071d4279SBram Moolenaar     int		l;
1545071d4279SBram Moolenaar #endif
1546071d4279SBram Moolenaar 
1547071d4279SBram Moolenaar     if ((diff_flags & (DIFF_ICASE | DIFF_IWHITE)) == 0)
1548071d4279SBram Moolenaar 	return STRCMP(s1, s2);
1549071d4279SBram Moolenaar     if ((diff_flags & DIFF_ICASE) && !(diff_flags & DIFF_IWHITE))
1550071d4279SBram Moolenaar 	return MB_STRICMP(s1, s2);
1551071d4279SBram Moolenaar 
1552071d4279SBram Moolenaar     /* Ignore white space changes and possibly ignore case. */
1553071d4279SBram Moolenaar     p1 = s1;
1554071d4279SBram Moolenaar     p2 = s2;
1555071d4279SBram Moolenaar     while (*p1 != NUL && *p2 != NUL)
1556071d4279SBram Moolenaar     {
1557071d4279SBram Moolenaar 	if (vim_iswhite(*p1) && vim_iswhite(*p2))
1558071d4279SBram Moolenaar 	{
1559071d4279SBram Moolenaar 	    p1 = skipwhite(p1);
1560071d4279SBram Moolenaar 	    p2 = skipwhite(p2);
1561071d4279SBram Moolenaar 	}
1562071d4279SBram Moolenaar 	else
1563071d4279SBram Moolenaar 	{
1564071d4279SBram Moolenaar #ifdef FEAT_MBYTE
15650fa313a7SBram Moolenaar 	    l  = (*mb_ptr2len)(p1);
15660fa313a7SBram Moolenaar 	    if (l != (*mb_ptr2len)(p2))
1567071d4279SBram Moolenaar 		break;
1568071d4279SBram Moolenaar 	    if (l > 1)
1569071d4279SBram Moolenaar 	    {
1570071d4279SBram Moolenaar 		if (STRNCMP(p1, p2, l) != 0
1571071d4279SBram Moolenaar 			&& (!enc_utf8
1572071d4279SBram Moolenaar 			    || !(diff_flags & DIFF_ICASE)
1573071d4279SBram Moolenaar 			    || utf_fold(utf_ptr2char(p1))
1574071d4279SBram Moolenaar 					       != utf_fold(utf_ptr2char(p2))))
1575071d4279SBram Moolenaar 		    break;
1576071d4279SBram Moolenaar 		p1 += l;
1577071d4279SBram Moolenaar 		p2 += l;
1578071d4279SBram Moolenaar 	    }
1579071d4279SBram Moolenaar 	    else
1580071d4279SBram Moolenaar #endif
1581071d4279SBram Moolenaar 	    {
1582071d4279SBram Moolenaar 		if (*p1 != *p2 && (!(diff_flags & DIFF_ICASE)
1583071d4279SBram Moolenaar 				     || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2)))
1584071d4279SBram Moolenaar 		    break;
1585071d4279SBram Moolenaar 		++p1;
1586071d4279SBram Moolenaar 		++p2;
1587071d4279SBram Moolenaar 	    }
1588071d4279SBram Moolenaar 	}
1589071d4279SBram Moolenaar     }
1590071d4279SBram Moolenaar 
1591071d4279SBram Moolenaar     /* Ignore trailing white space. */
1592071d4279SBram Moolenaar     p1 = skipwhite(p1);
1593071d4279SBram Moolenaar     p2 = skipwhite(p2);
1594071d4279SBram Moolenaar     if (*p1 != NUL || *p2 != NUL)
1595071d4279SBram Moolenaar 	return 1;
1596071d4279SBram Moolenaar     return 0;
1597071d4279SBram Moolenaar }
1598071d4279SBram Moolenaar 
1599071d4279SBram Moolenaar /*
1600071d4279SBram Moolenaar  * Return the number of filler lines above "lnum".
1601071d4279SBram Moolenaar  */
1602071d4279SBram Moolenaar     int
1603071d4279SBram Moolenaar diff_check_fill(wp, lnum)
1604071d4279SBram Moolenaar     win_T	*wp;
1605071d4279SBram Moolenaar     linenr_T	lnum;
1606071d4279SBram Moolenaar {
1607071d4279SBram Moolenaar     int		n;
1608071d4279SBram Moolenaar 
1609071d4279SBram Moolenaar     /* be quick when there are no filler lines */
1610071d4279SBram Moolenaar     if (!(diff_flags & DIFF_FILLER))
1611071d4279SBram Moolenaar 	return 0;
1612071d4279SBram Moolenaar     n = diff_check(wp, lnum);
1613071d4279SBram Moolenaar     if (n <= 0)
1614071d4279SBram Moolenaar 	return 0;
1615071d4279SBram Moolenaar     return n;
1616071d4279SBram Moolenaar }
1617071d4279SBram Moolenaar 
1618071d4279SBram Moolenaar /*
1619071d4279SBram Moolenaar  * Set the topline of "towin" to match the position in "fromwin", so that they
1620071d4279SBram Moolenaar  * show the same diff'ed lines.
1621071d4279SBram Moolenaar  */
1622071d4279SBram Moolenaar     void
1623071d4279SBram Moolenaar diff_set_topline(fromwin, towin)
1624071d4279SBram Moolenaar     win_T	*fromwin;
1625071d4279SBram Moolenaar     win_T	*towin;
1626071d4279SBram Moolenaar {
1627071d4279SBram Moolenaar     buf_T	*buf = fromwin->w_buffer;
1628071d4279SBram Moolenaar     linenr_T	lnum = fromwin->w_topline;
1629071d4279SBram Moolenaar     int		idx;
1630071d4279SBram Moolenaar     diff_T	*dp;
1631071d4279SBram Moolenaar     int		i;
1632071d4279SBram Moolenaar 
1633071d4279SBram Moolenaar     idx = diff_buf_idx(buf);
1634071d4279SBram Moolenaar     if (idx == DB_COUNT)
1635071d4279SBram Moolenaar 	return;		/* safety check */
1636071d4279SBram Moolenaar 
163749d7bf13SBram Moolenaar     if (curtab->tp_diff_invalid)
1638071d4279SBram Moolenaar 	ex_diffupdate(NULL);		/* update after a big change */
1639071d4279SBram Moolenaar 
1640071d4279SBram Moolenaar     towin->w_topfill = 0;
1641071d4279SBram Moolenaar 
1642071d4279SBram Moolenaar     /* search for a change that includes "lnum" in the list of diffblocks. */
164349d7bf13SBram Moolenaar     for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1644071d4279SBram Moolenaar 	if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
1645071d4279SBram Moolenaar 	    break;
1646071d4279SBram Moolenaar     if (dp == NULL)
1647071d4279SBram Moolenaar     {
1648071d4279SBram Moolenaar 	/* After last change, compute topline relative to end of file; no
1649071d4279SBram Moolenaar 	 * filler lines. */
1650071d4279SBram Moolenaar 	towin->w_topline = towin->w_buffer->b_ml.ml_line_count
1651071d4279SBram Moolenaar 					   - (buf->b_ml.ml_line_count - lnum);
1652071d4279SBram Moolenaar     }
1653071d4279SBram Moolenaar     else
1654071d4279SBram Moolenaar     {
1655071d4279SBram Moolenaar 	/* Find index for "towin". */
1656071d4279SBram Moolenaar 	i = diff_buf_idx(towin->w_buffer);
1657071d4279SBram Moolenaar 	if (i == DB_COUNT)
1658071d4279SBram Moolenaar 	    return;		/* safety check */
1659071d4279SBram Moolenaar 
1660071d4279SBram Moolenaar 	towin->w_topline = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]);
1661071d4279SBram Moolenaar 	if (lnum >= dp->df_lnum[idx])
1662071d4279SBram Moolenaar 	{
1663071d4279SBram Moolenaar 	    /* Inside a change: compute filler lines. */
1664071d4279SBram Moolenaar 	    if (dp->df_count[i] == dp->df_count[idx])
1665071d4279SBram Moolenaar 		towin->w_topfill = fromwin->w_topfill;
1666071d4279SBram Moolenaar 	    else if (dp->df_count[i] > dp->df_count[idx])
1667071d4279SBram Moolenaar 	    {
1668071d4279SBram Moolenaar 		if (lnum == dp->df_lnum[idx] + dp->df_count[idx])
1669071d4279SBram Moolenaar 		    towin->w_topline = dp->df_lnum[i] + dp->df_count[i]
1670071d4279SBram Moolenaar 							 - fromwin->w_topfill;
1671071d4279SBram Moolenaar 	    }
1672071d4279SBram Moolenaar 	    else
1673071d4279SBram Moolenaar 	    {
1674071d4279SBram Moolenaar 		if (towin->w_topline >= dp->df_lnum[i] + dp->df_count[i])
1675071d4279SBram Moolenaar 		{
1676071d4279SBram Moolenaar 		    if (diff_flags & DIFF_FILLER)
1677071d4279SBram Moolenaar 			towin->w_topfill = dp->df_lnum[idx]
1678071d4279SBram Moolenaar 						   + dp->df_count[idx] - lnum;
1679071d4279SBram Moolenaar 		    towin->w_topline = dp->df_lnum[i] + dp->df_count[i];
1680071d4279SBram Moolenaar 		}
1681071d4279SBram Moolenaar 	    }
1682071d4279SBram Moolenaar 	}
1683071d4279SBram Moolenaar     }
1684071d4279SBram Moolenaar 
1685071d4279SBram Moolenaar     /* safety check (if diff info gets outdated strange things may happen) */
1686071d4279SBram Moolenaar     towin->w_botfill = FALSE;
1687071d4279SBram Moolenaar     if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count)
1688071d4279SBram Moolenaar     {
1689071d4279SBram Moolenaar 	towin->w_topline = towin->w_buffer->b_ml.ml_line_count;
1690071d4279SBram Moolenaar 	towin->w_botfill = TRUE;
1691071d4279SBram Moolenaar     }
1692071d4279SBram Moolenaar     if (towin->w_topline < 1)
1693071d4279SBram Moolenaar     {
1694071d4279SBram Moolenaar 	towin->w_topline = 1;
1695071d4279SBram Moolenaar 	towin->w_topfill = 0;
1696071d4279SBram Moolenaar     }
1697071d4279SBram Moolenaar 
1698071d4279SBram Moolenaar     /* When w_topline changes need to recompute w_botline and cursor position */
1699071d4279SBram Moolenaar     invalidate_botline_win(towin);
1700071d4279SBram Moolenaar     changed_line_abv_curs_win(towin);
1701071d4279SBram Moolenaar 
1702071d4279SBram Moolenaar     check_topfill(towin, FALSE);
1703071d4279SBram Moolenaar #ifdef FEAT_FOLDING
1704071d4279SBram Moolenaar     (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline,
1705071d4279SBram Moolenaar 							    NULL, TRUE, NULL);
1706071d4279SBram Moolenaar #endif
1707071d4279SBram Moolenaar }
1708071d4279SBram Moolenaar 
1709071d4279SBram Moolenaar /*
1710071d4279SBram Moolenaar  * This is called when 'diffopt' is changed.
1711071d4279SBram Moolenaar  */
1712071d4279SBram Moolenaar     int
1713071d4279SBram Moolenaar diffopt_changed()
1714071d4279SBram Moolenaar {
1715071d4279SBram Moolenaar     char_u	*p;
1716071d4279SBram Moolenaar     int		diff_context_new = 6;
1717071d4279SBram Moolenaar     int		diff_flags_new = 0;
1718c4675a19SBram Moolenaar     int		diff_foldcolumn_new = 2;
171949d7bf13SBram Moolenaar     tabpage_T	*tp;
1720071d4279SBram Moolenaar 
1721071d4279SBram Moolenaar     p = p_dip;
1722071d4279SBram Moolenaar     while (*p != NUL)
1723071d4279SBram Moolenaar     {
1724071d4279SBram Moolenaar 	if (STRNCMP(p, "filler", 6) == 0)
1725071d4279SBram Moolenaar 	{
1726071d4279SBram Moolenaar 	    p += 6;
1727071d4279SBram Moolenaar 	    diff_flags_new |= DIFF_FILLER;
1728071d4279SBram Moolenaar 	}
1729071d4279SBram Moolenaar 	else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8]))
1730071d4279SBram Moolenaar 	{
1731071d4279SBram Moolenaar 	    p += 8;
1732071d4279SBram Moolenaar 	    diff_context_new = getdigits(&p);
1733071d4279SBram Moolenaar 	}
1734071d4279SBram Moolenaar 	else if (STRNCMP(p, "icase", 5) == 0)
1735071d4279SBram Moolenaar 	{
1736071d4279SBram Moolenaar 	    p += 5;
1737071d4279SBram Moolenaar 	    diff_flags_new |= DIFF_ICASE;
1738071d4279SBram Moolenaar 	}
1739071d4279SBram Moolenaar 	else if (STRNCMP(p, "iwhite", 6) == 0)
1740071d4279SBram Moolenaar 	{
1741071d4279SBram Moolenaar 	    p += 6;
1742071d4279SBram Moolenaar 	    diff_flags_new |= DIFF_IWHITE;
1743071d4279SBram Moolenaar 	}
1744c4675a19SBram Moolenaar 	else if (STRNCMP(p, "horizontal", 10) == 0)
1745c4675a19SBram Moolenaar 	{
1746c4675a19SBram Moolenaar 	    p += 10;
1747c4675a19SBram Moolenaar 	    diff_flags_new |= DIFF_HORIZONTAL;
1748c4675a19SBram Moolenaar 	}
1749c4675a19SBram Moolenaar 	else if (STRNCMP(p, "vertical", 8) == 0)
1750c4675a19SBram Moolenaar 	{
1751c4675a19SBram Moolenaar 	    p += 8;
1752c4675a19SBram Moolenaar 	    diff_flags_new |= DIFF_VERTICAL;
1753c4675a19SBram Moolenaar 	}
1754c4675a19SBram Moolenaar 	else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11]))
1755c4675a19SBram Moolenaar 	{
1756c4675a19SBram Moolenaar 	    p += 11;
1757c4675a19SBram Moolenaar 	    diff_foldcolumn_new = getdigits(&p);
1758c4675a19SBram Moolenaar 	}
1759071d4279SBram Moolenaar 	if (*p != ',' && *p != NUL)
1760071d4279SBram Moolenaar 	    return FAIL;
1761071d4279SBram Moolenaar 	if (*p == ',')
1762071d4279SBram Moolenaar 	    ++p;
1763071d4279SBram Moolenaar     }
1764071d4279SBram Moolenaar 
1765c4675a19SBram Moolenaar     /* Can't have both "horizontal" and "vertical". */
1766c4675a19SBram Moolenaar     if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL))
1767c4675a19SBram Moolenaar 	return FAIL;
1768c4675a19SBram Moolenaar 
1769071d4279SBram Moolenaar     /* If "icase" or "iwhite" was added or removed, need to update the diff. */
1770071d4279SBram Moolenaar     if (diff_flags != diff_flags_new)
177149d7bf13SBram Moolenaar 	for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
177249d7bf13SBram Moolenaar 	    tp->tp_diff_invalid = TRUE;
1773071d4279SBram Moolenaar 
1774071d4279SBram Moolenaar     diff_flags = diff_flags_new;
1775071d4279SBram Moolenaar     diff_context = diff_context_new;
1776c4675a19SBram Moolenaar     diff_foldcolumn = diff_foldcolumn_new;
1777071d4279SBram Moolenaar 
1778071d4279SBram Moolenaar     diff_redraw(TRUE);
1779071d4279SBram Moolenaar 
1780071d4279SBram Moolenaar     /* recompute the scroll binding with the new option value, may
1781071d4279SBram Moolenaar      * remove or add filler lines */
1782071d4279SBram Moolenaar     check_scrollbind((linenr_T)0, 0L);
1783071d4279SBram Moolenaar 
1784071d4279SBram Moolenaar     return OK;
1785071d4279SBram Moolenaar }
1786071d4279SBram Moolenaar 
1787071d4279SBram Moolenaar /*
1788c4675a19SBram Moolenaar  * Return TRUE if 'diffopt' contains "horizontal".
1789c4675a19SBram Moolenaar  */
1790c4675a19SBram Moolenaar     int
1791c4675a19SBram Moolenaar diffopt_horizontal()
1792c4675a19SBram Moolenaar {
1793c4675a19SBram Moolenaar     return (diff_flags & DIFF_HORIZONTAL) != 0;
1794c4675a19SBram Moolenaar }
1795c4675a19SBram Moolenaar 
1796c4675a19SBram Moolenaar /*
1797071d4279SBram Moolenaar  * Find the difference within a changed line.
1798071d4279SBram Moolenaar  * Returns TRUE if the line was added, no other buffer has it.
1799071d4279SBram Moolenaar  */
1800071d4279SBram Moolenaar     int
1801071d4279SBram Moolenaar diff_find_change(wp, lnum, startp, endp)
1802071d4279SBram Moolenaar     win_T	*wp;
1803071d4279SBram Moolenaar     linenr_T	lnum;
1804071d4279SBram Moolenaar     int		*startp;	/* first char of the change */
1805071d4279SBram Moolenaar     int		*endp;		/* last char of the change */
1806071d4279SBram Moolenaar {
1807071d4279SBram Moolenaar     char_u	*line_org;
1808071d4279SBram Moolenaar     char_u	*line_new;
1809071d4279SBram Moolenaar     int		i;
18109e54a0e7SBram Moolenaar     int		si_org, si_new;
18119e54a0e7SBram Moolenaar     int		ei_org, ei_new;
1812071d4279SBram Moolenaar     diff_T	*dp;
1813071d4279SBram Moolenaar     int		idx;
1814071d4279SBram Moolenaar     int		off;
1815071d4279SBram Moolenaar     int		added = TRUE;
1816071d4279SBram Moolenaar 
1817071d4279SBram Moolenaar     /* Make a copy of the line, the next ml_get() will invalidate it. */
1818071d4279SBram Moolenaar     line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));
1819071d4279SBram Moolenaar     if (line_org == NULL)
1820071d4279SBram Moolenaar 	return FALSE;
1821071d4279SBram Moolenaar 
1822071d4279SBram Moolenaar     idx = diff_buf_idx(wp->w_buffer);
1823071d4279SBram Moolenaar     if (idx == DB_COUNT)	/* cannot happen */
1824071d4279SBram Moolenaar 	return FALSE;
1825071d4279SBram Moolenaar 
1826071d4279SBram Moolenaar     /* search for a change that includes "lnum" in the list of diffblocks. */
182749d7bf13SBram Moolenaar     for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1828071d4279SBram Moolenaar 	if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
1829071d4279SBram Moolenaar 	    break;
183049d7bf13SBram Moolenaar     if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
1831071d4279SBram Moolenaar 	return FALSE;
1832071d4279SBram Moolenaar 
1833071d4279SBram Moolenaar     off = lnum - dp->df_lnum[idx];
1834071d4279SBram Moolenaar 
1835071d4279SBram Moolenaar     for (i = 0; i < DB_COUNT; ++i)
183649d7bf13SBram Moolenaar 	if (curtab->tp_diffbuf[i] != NULL && i != idx)
1837071d4279SBram Moolenaar 	{
1838071d4279SBram Moolenaar 	    /* Skip lines that are not in the other change (filler lines). */
1839071d4279SBram Moolenaar 	    if (off >= dp->df_count[i])
1840071d4279SBram Moolenaar 		continue;
1841071d4279SBram Moolenaar 	    added = FALSE;
18429e54a0e7SBram Moolenaar 	    line_new = ml_get_buf(curtab->tp_diffbuf[i],
18439e54a0e7SBram Moolenaar 						 dp->df_lnum[i] + off, FALSE);
1844071d4279SBram Moolenaar 
1845071d4279SBram Moolenaar 	    /* Search for start of difference */
18469e54a0e7SBram Moolenaar 	    si_org = si_new = 0;
18479e54a0e7SBram Moolenaar 	    while (line_org[si_org] != NUL)
18489e54a0e7SBram Moolenaar 	    {
18499e54a0e7SBram Moolenaar 		if ((diff_flags & DIFF_IWHITE)
18509e54a0e7SBram Moolenaar 			&& vim_iswhite(line_org[si_org])
18519e54a0e7SBram Moolenaar 			&& vim_iswhite(line_new[si_new]))
18529e54a0e7SBram Moolenaar 		{
1853*a93fa7eeSBram Moolenaar 		    si_org = (int)(skipwhite(line_org + si_org) - line_org);
1854*a93fa7eeSBram Moolenaar 		    si_new = (int)(skipwhite(line_new + si_new) - line_new);
18559e54a0e7SBram Moolenaar 		}
18569e54a0e7SBram Moolenaar 		else
18579e54a0e7SBram Moolenaar 		{
18589e54a0e7SBram Moolenaar 		    if (line_org[si_org] != line_new[si_new])
18599e54a0e7SBram Moolenaar 			break;
18609e54a0e7SBram Moolenaar 		    ++si_org;
18619e54a0e7SBram Moolenaar 		    ++si_new;
18629e54a0e7SBram Moolenaar 		}
18639e54a0e7SBram Moolenaar 	    }
1864071d4279SBram Moolenaar #ifdef FEAT_MBYTE
1865071d4279SBram Moolenaar 	    if (has_mbyte)
1866071d4279SBram Moolenaar 	    {
1867071d4279SBram Moolenaar 		/* Move back to first byte of character in both lines (may
1868071d4279SBram Moolenaar 		 * have "nn^" in line_org and "n^ in line_new). */
18699e54a0e7SBram Moolenaar 		si_org -= (*mb_head_off)(line_org, line_org + si_org);
18709e54a0e7SBram Moolenaar 		si_new -= (*mb_head_off)(line_new, line_new + si_new);
1871071d4279SBram Moolenaar 	    }
1872071d4279SBram Moolenaar #endif
18739e54a0e7SBram Moolenaar 	    if (*startp > si_org)
18749e54a0e7SBram Moolenaar 		*startp = si_org;
1875071d4279SBram Moolenaar 
1876071d4279SBram Moolenaar 	    /* Search for end of difference, if any. */
18779e54a0e7SBram Moolenaar 	    if (line_org[si_org] != NUL || line_new[si_new] != NUL)
1878071d4279SBram Moolenaar 	    {
1879071d4279SBram Moolenaar 		ei_org = (int)STRLEN(line_org);
1880071d4279SBram Moolenaar 		ei_new = (int)STRLEN(line_new);
18819e54a0e7SBram Moolenaar 		while (ei_org >= *startp && ei_new >= si_new
18829e54a0e7SBram Moolenaar 						&& ei_org >= 0 && ei_new >= 0)
1883071d4279SBram Moolenaar 		{
18849e54a0e7SBram Moolenaar 		    if ((diff_flags & DIFF_IWHITE)
18859e54a0e7SBram Moolenaar 			    && vim_iswhite(line_org[ei_org])
18869e54a0e7SBram Moolenaar 			    && vim_iswhite(line_new[ei_new]))
18879e54a0e7SBram Moolenaar 		    {
18889e54a0e7SBram Moolenaar 			while (ei_org >= *startp
18899e54a0e7SBram Moolenaar 					     && vim_iswhite(line_org[ei_org]))
18909e54a0e7SBram Moolenaar 			    --ei_org;
18919e54a0e7SBram Moolenaar 			while (ei_new >= si_new
18929e54a0e7SBram Moolenaar 					     && vim_iswhite(line_new[ei_new]))
18939e54a0e7SBram Moolenaar 			    --ei_new;
18949e54a0e7SBram Moolenaar 		    }
18959e54a0e7SBram Moolenaar 		    else
18969e54a0e7SBram Moolenaar 		    {
18979e54a0e7SBram Moolenaar 			if (line_org[ei_org] != line_new[ei_new])
18989e54a0e7SBram Moolenaar 			    break;
1899071d4279SBram Moolenaar 			--ei_org;
1900071d4279SBram Moolenaar 			--ei_new;
1901071d4279SBram Moolenaar 		    }
19029e54a0e7SBram Moolenaar 		}
1903071d4279SBram Moolenaar 		if (*endp < ei_org)
1904071d4279SBram Moolenaar 		    *endp = ei_org;
1905071d4279SBram Moolenaar 	    }
1906071d4279SBram Moolenaar 	}
1907071d4279SBram Moolenaar 
1908071d4279SBram Moolenaar     vim_free(line_org);
1909071d4279SBram Moolenaar     return added;
1910071d4279SBram Moolenaar }
1911071d4279SBram Moolenaar 
1912071d4279SBram Moolenaar #if defined(FEAT_FOLDING) || defined(PROTO)
1913071d4279SBram Moolenaar /*
1914071d4279SBram Moolenaar  * Return TRUE if line "lnum" is not close to a diff block, this line should
1915071d4279SBram Moolenaar  * be in a fold.
1916071d4279SBram Moolenaar  * Return FALSE if there are no diff blocks at all in this window.
1917071d4279SBram Moolenaar  */
1918071d4279SBram Moolenaar     int
1919071d4279SBram Moolenaar diff_infold(wp, lnum)
1920071d4279SBram Moolenaar     win_T	*wp;
1921071d4279SBram Moolenaar     linenr_T	lnum;
1922071d4279SBram Moolenaar {
1923071d4279SBram Moolenaar     int		i;
1924071d4279SBram Moolenaar     int		idx = -1;
1925071d4279SBram Moolenaar     int		other = FALSE;
1926071d4279SBram Moolenaar     diff_T	*dp;
1927071d4279SBram Moolenaar 
1928071d4279SBram Moolenaar     /* Return if 'diff' isn't set. */
1929071d4279SBram Moolenaar     if (!wp->w_p_diff)
1930071d4279SBram Moolenaar 	return FALSE;
1931071d4279SBram Moolenaar 
1932071d4279SBram Moolenaar     for (i = 0; i < DB_COUNT; ++i)
1933071d4279SBram Moolenaar     {
193449d7bf13SBram Moolenaar 	if (curtab->tp_diffbuf[i] == wp->w_buffer)
1935071d4279SBram Moolenaar 	    idx = i;
193649d7bf13SBram Moolenaar 	else if (curtab->tp_diffbuf[i] != NULL)
1937071d4279SBram Moolenaar 	    other = TRUE;
1938071d4279SBram Moolenaar     }
1939071d4279SBram Moolenaar 
1940071d4279SBram Moolenaar     /* return here if there are no diffs in the window */
1941071d4279SBram Moolenaar     if (idx == -1 || !other)
1942071d4279SBram Moolenaar 	return FALSE;
1943071d4279SBram Moolenaar 
194449d7bf13SBram Moolenaar     if (curtab->tp_diff_invalid)
1945071d4279SBram Moolenaar 	ex_diffupdate(NULL);		/* update after a big change */
1946071d4279SBram Moolenaar 
1947071d4279SBram Moolenaar     /* Return if there are no diff blocks.  All lines will be folded. */
194849d7bf13SBram Moolenaar     if (curtab->tp_first_diff == NULL)
1949071d4279SBram Moolenaar 	return TRUE;
1950071d4279SBram Moolenaar 
195149d7bf13SBram Moolenaar     for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1952071d4279SBram Moolenaar     {
1953071d4279SBram Moolenaar 	/* If this change is below the line there can't be any further match. */
1954071d4279SBram Moolenaar 	if (dp->df_lnum[idx] - diff_context > lnum)
1955071d4279SBram Moolenaar 	    break;
1956071d4279SBram Moolenaar 	/* If this change ends before the line we have a match. */
1957071d4279SBram Moolenaar 	if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum)
1958071d4279SBram Moolenaar 	    return FALSE;
1959071d4279SBram Moolenaar     }
1960071d4279SBram Moolenaar     return TRUE;
1961071d4279SBram Moolenaar }
1962071d4279SBram Moolenaar #endif
1963071d4279SBram Moolenaar 
1964071d4279SBram Moolenaar /*
1965071d4279SBram Moolenaar  * "dp" and "do" commands.
1966071d4279SBram Moolenaar  */
1967071d4279SBram Moolenaar     void
1968071d4279SBram Moolenaar nv_diffgetput(put)
1969071d4279SBram Moolenaar     int		put;
1970071d4279SBram Moolenaar {
1971071d4279SBram Moolenaar     exarg_T	ea;
1972071d4279SBram Moolenaar 
1973071d4279SBram Moolenaar     ea.arg = (char_u *)"";
1974071d4279SBram Moolenaar     if (put)
1975071d4279SBram Moolenaar 	ea.cmdidx = CMD_diffput;
1976071d4279SBram Moolenaar     else
1977071d4279SBram Moolenaar 	ea.cmdidx = CMD_diffget;
1978071d4279SBram Moolenaar     ea.addr_count = 0;
1979071d4279SBram Moolenaar     ea.line1 = curwin->w_cursor.lnum;
1980071d4279SBram Moolenaar     ea.line2 = curwin->w_cursor.lnum;
1981071d4279SBram Moolenaar     ex_diffgetput(&ea);
1982071d4279SBram Moolenaar }
1983071d4279SBram Moolenaar 
1984071d4279SBram Moolenaar /*
1985071d4279SBram Moolenaar  * ":diffget"
1986071d4279SBram Moolenaar  * ":diffput"
1987071d4279SBram Moolenaar  */
1988071d4279SBram Moolenaar     void
1989071d4279SBram Moolenaar ex_diffgetput(eap)
1990071d4279SBram Moolenaar     exarg_T	*eap;
1991071d4279SBram Moolenaar {
1992071d4279SBram Moolenaar     linenr_T	lnum;
1993071d4279SBram Moolenaar     int		count;
1994071d4279SBram Moolenaar     linenr_T	off = 0;
1995071d4279SBram Moolenaar     diff_T	*dp;
1996071d4279SBram Moolenaar     diff_T	*dprev;
1997071d4279SBram Moolenaar     diff_T	*dfree;
1998071d4279SBram Moolenaar     int		idx_cur;
1999071d4279SBram Moolenaar     int		idx_other;
2000071d4279SBram Moolenaar     int		idx_from;
2001071d4279SBram Moolenaar     int		idx_to;
2002071d4279SBram Moolenaar     int		i;
2003071d4279SBram Moolenaar     int		added;
2004071d4279SBram Moolenaar     char_u	*p;
2005071d4279SBram Moolenaar     aco_save_T	aco;
2006071d4279SBram Moolenaar     buf_T	*buf;
2007071d4279SBram Moolenaar     int		start_skip, end_skip;
2008071d4279SBram Moolenaar     int		new_count;
2009280f126eSBram Moolenaar     int		buf_empty;
2010071d4279SBram Moolenaar 
2011071d4279SBram Moolenaar     /* Find the current buffer in the list of diff buffers. */
2012071d4279SBram Moolenaar     idx_cur = diff_buf_idx(curbuf);
2013071d4279SBram Moolenaar     if (idx_cur == DB_COUNT)
2014071d4279SBram Moolenaar     {
2015071d4279SBram Moolenaar 	EMSG(_("E99: Current buffer is not in diff mode"));
2016071d4279SBram Moolenaar 	return;
2017071d4279SBram Moolenaar     }
2018071d4279SBram Moolenaar 
2019071d4279SBram Moolenaar     if (*eap->arg == NUL)
2020071d4279SBram Moolenaar     {
2021071d4279SBram Moolenaar 	/* No argument: Find the other buffer in the list of diff buffers. */
2022071d4279SBram Moolenaar 	for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
202349d7bf13SBram Moolenaar 	    if (curtab->tp_diffbuf[idx_other] != curbuf
202449d7bf13SBram Moolenaar 		    && curtab->tp_diffbuf[idx_other] != NULL
20251e015460SBram Moolenaar 		    && (eap->cmdidx != CMD_diffput
202649d7bf13SBram Moolenaar 					       || curtab->tp_diffbuf[idx_other]->b_p_ma))
2027071d4279SBram Moolenaar 		break;
2028071d4279SBram Moolenaar 	if (idx_other == DB_COUNT)
2029071d4279SBram Moolenaar 	{
2030071d4279SBram Moolenaar 	    EMSG(_("E100: No other buffer in diff mode"));
2031071d4279SBram Moolenaar 	    return;
2032071d4279SBram Moolenaar 	}
2033071d4279SBram Moolenaar 
2034071d4279SBram Moolenaar 	/* Check that there isn't a third buffer in the list */
2035071d4279SBram Moolenaar 	for (i = idx_other + 1; i < DB_COUNT; ++i)
203649d7bf13SBram Moolenaar 	    if (curtab->tp_diffbuf[i] != curbuf
203749d7bf13SBram Moolenaar 		    && curtab->tp_diffbuf[i] != NULL
203849d7bf13SBram Moolenaar 		    && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma))
2039071d4279SBram Moolenaar 	    {
2040071d4279SBram Moolenaar 		EMSG(_("E101: More than two buffers in diff mode, don't know which one to use"));
2041071d4279SBram Moolenaar 		return;
2042071d4279SBram Moolenaar 	    }
2043071d4279SBram Moolenaar     }
2044071d4279SBram Moolenaar     else
2045071d4279SBram Moolenaar     {
2046071d4279SBram Moolenaar 	/* Buffer number or pattern given.  Ignore trailing white space. */
2047071d4279SBram Moolenaar 	p = eap->arg + STRLEN(eap->arg);
2048071d4279SBram Moolenaar 	while (p > eap->arg && vim_iswhite(p[-1]))
2049071d4279SBram Moolenaar 	    --p;
2050071d4279SBram Moolenaar 	for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i)
2051071d4279SBram Moolenaar 	    ;
2052071d4279SBram Moolenaar 	if (eap->arg + i == p)	    /* digits only */
2053071d4279SBram Moolenaar 	    i = atol((char *)eap->arg);
2054071d4279SBram Moolenaar 	else
2055071d4279SBram Moolenaar 	{
2056071d4279SBram Moolenaar 	    i = buflist_findpat(eap->arg, p, FALSE, TRUE);
2057071d4279SBram Moolenaar 	    if (i < 0)
2058071d4279SBram Moolenaar 		return;		/* error message already given */
2059071d4279SBram Moolenaar 	}
2060071d4279SBram Moolenaar 	buf = buflist_findnr(i);
2061071d4279SBram Moolenaar 	if (buf == NULL)
2062071d4279SBram Moolenaar 	{
2063071d4279SBram Moolenaar 	    EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg);
2064071d4279SBram Moolenaar 	    return;
2065071d4279SBram Moolenaar 	}
2066071d4279SBram Moolenaar 	idx_other = diff_buf_idx(buf);
2067071d4279SBram Moolenaar 	if (idx_other == DB_COUNT)
2068071d4279SBram Moolenaar 	{
2069071d4279SBram Moolenaar 	    EMSG2(_("E103: Buffer \"%s\" is not in diff mode"), eap->arg);
2070071d4279SBram Moolenaar 	    return;
2071071d4279SBram Moolenaar 	}
2072071d4279SBram Moolenaar     }
2073071d4279SBram Moolenaar 
2074071d4279SBram Moolenaar     diff_busy = TRUE;
2075071d4279SBram Moolenaar 
2076071d4279SBram Moolenaar     /* When no range given include the line above or below the cursor. */
2077071d4279SBram Moolenaar     if (eap->addr_count == 0)
2078071d4279SBram Moolenaar     {
2079071d4279SBram Moolenaar 	/* Make it possible that ":diffget" on the last line gets line below
2080071d4279SBram Moolenaar 	 * the cursor line when there is no difference above the cursor. */
2081071d4279SBram Moolenaar 	if (eap->cmdidx == CMD_diffget
2082071d4279SBram Moolenaar 		&& eap->line1 == curbuf->b_ml.ml_line_count
2083071d4279SBram Moolenaar 		&& diff_check(curwin, eap->line1) == 0
2084071d4279SBram Moolenaar 		&& (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0))
2085071d4279SBram Moolenaar 	    ++eap->line2;
2086071d4279SBram Moolenaar 	else if (eap->line1 > 0)
2087071d4279SBram Moolenaar 	    --eap->line1;
2088071d4279SBram Moolenaar     }
2089071d4279SBram Moolenaar 
2090071d4279SBram Moolenaar     if (eap->cmdidx == CMD_diffget)
2091071d4279SBram Moolenaar     {
2092071d4279SBram Moolenaar 	idx_from = idx_other;
2093071d4279SBram Moolenaar 	idx_to = idx_cur;
2094071d4279SBram Moolenaar     }
2095071d4279SBram Moolenaar     else
2096071d4279SBram Moolenaar     {
2097071d4279SBram Moolenaar 	idx_from = idx_cur;
2098071d4279SBram Moolenaar 	idx_to = idx_other;
2099071d4279SBram Moolenaar 	/* Need to make the other buffer the current buffer to be able to make
2100071d4279SBram Moolenaar 	 * changes in it. */
2101071d4279SBram Moolenaar 	/* set curwin/curbuf to buf and save a few things */
210249d7bf13SBram Moolenaar 	aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]);
2103071d4279SBram Moolenaar     }
2104071d4279SBram Moolenaar 
2105910f66f9SBram Moolenaar     /* May give the warning for a changed buffer here, which can trigger the
2106910f66f9SBram Moolenaar      * FileChangedRO autocommand, which may do nasty things and mess
2107910f66f9SBram Moolenaar      * everything up. */
2108910f66f9SBram Moolenaar     if (!curbuf->b_changed)
2109910f66f9SBram Moolenaar     {
2110910f66f9SBram Moolenaar 	change_warning(0);
2111910f66f9SBram Moolenaar 	if (diff_buf_idx(curbuf) != idx_to)
2112910f66f9SBram Moolenaar 	{
2113910f66f9SBram Moolenaar 	    EMSG(_("E787: Buffer changed unexpectedly"));
2114910f66f9SBram Moolenaar 	    return;
2115910f66f9SBram Moolenaar 	}
2116910f66f9SBram Moolenaar     }
2117910f66f9SBram Moolenaar 
2118071d4279SBram Moolenaar     dprev = NULL;
211949d7bf13SBram Moolenaar     for (dp = curtab->tp_first_diff; dp != NULL; )
2120071d4279SBram Moolenaar     {
2121071d4279SBram Moolenaar 	if (dp->df_lnum[idx_cur] > eap->line2 + off)
2122071d4279SBram Moolenaar 	    break;	/* past the range that was specified */
2123071d4279SBram Moolenaar 
2124071d4279SBram Moolenaar 	dfree = NULL;
2125071d4279SBram Moolenaar 	lnum = dp->df_lnum[idx_to];
2126071d4279SBram Moolenaar 	count = dp->df_count[idx_to];
2127071d4279SBram Moolenaar 	if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off
2128071d4279SBram Moolenaar 		&& u_save(lnum - 1, lnum + count) != FAIL)
2129071d4279SBram Moolenaar 	{
2130071d4279SBram Moolenaar 	    /* Inside the specified range and saving for undo worked. */
2131071d4279SBram Moolenaar 	    start_skip = 0;
2132071d4279SBram Moolenaar 	    end_skip = 0;
2133071d4279SBram Moolenaar 	    if (eap->addr_count > 0)
2134071d4279SBram Moolenaar 	    {
2135071d4279SBram Moolenaar 		/* A range was specified: check if lines need to be skipped. */
2136071d4279SBram Moolenaar 		start_skip = eap->line1 + off - dp->df_lnum[idx_cur];
2137071d4279SBram Moolenaar 		if (start_skip > 0)
2138071d4279SBram Moolenaar 		{
2139071d4279SBram Moolenaar 		    /* range starts below start of current diff block */
2140071d4279SBram Moolenaar 		    if (start_skip > count)
2141071d4279SBram Moolenaar 		    {
2142071d4279SBram Moolenaar 			lnum += count;
2143071d4279SBram Moolenaar 			count = 0;
2144071d4279SBram Moolenaar 		    }
2145071d4279SBram Moolenaar 		    else
2146071d4279SBram Moolenaar 		    {
2147071d4279SBram Moolenaar 			count -= start_skip;
2148071d4279SBram Moolenaar 			lnum += start_skip;
2149071d4279SBram Moolenaar 		    }
2150071d4279SBram Moolenaar 		}
2151071d4279SBram Moolenaar 		else
2152071d4279SBram Moolenaar 		    start_skip = 0;
2153071d4279SBram Moolenaar 
2154071d4279SBram Moolenaar 		end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1
2155071d4279SBram Moolenaar 							 - (eap->line2 + off);
2156071d4279SBram Moolenaar 		if (end_skip > 0)
2157071d4279SBram Moolenaar 		{
2158071d4279SBram Moolenaar 		    /* range ends above end of current/from diff block */
2159071d4279SBram Moolenaar 		    if (idx_cur == idx_from)	/* :diffput */
2160071d4279SBram Moolenaar 		    {
2161071d4279SBram Moolenaar 			i = dp->df_count[idx_cur] - start_skip - end_skip;
2162071d4279SBram Moolenaar 			if (count > i)
2163071d4279SBram Moolenaar 			    count = i;
2164071d4279SBram Moolenaar 		    }
2165071d4279SBram Moolenaar 		    else			/* :diffget */
2166071d4279SBram Moolenaar 		    {
2167071d4279SBram Moolenaar 			count -= end_skip;
2168071d4279SBram Moolenaar 			end_skip = dp->df_count[idx_from] - start_skip - count;
2169071d4279SBram Moolenaar 			if (end_skip < 0)
2170071d4279SBram Moolenaar 			    end_skip = 0;
2171071d4279SBram Moolenaar 		    }
2172071d4279SBram Moolenaar 		}
2173071d4279SBram Moolenaar 		else
2174071d4279SBram Moolenaar 		    end_skip = 0;
2175071d4279SBram Moolenaar 	    }
2176071d4279SBram Moolenaar 
2177280f126eSBram Moolenaar 	    buf_empty = FALSE;
2178071d4279SBram Moolenaar 	    added = 0;
2179071d4279SBram Moolenaar 	    for (i = 0; i < count; ++i)
2180071d4279SBram Moolenaar 	    {
2181280f126eSBram Moolenaar 		/* remember deleting the last line of the buffer */
2182280f126eSBram Moolenaar 		buf_empty = curbuf->b_ml.ml_line_count == 1;
2183071d4279SBram Moolenaar 		ml_delete(lnum, FALSE);
2184071d4279SBram Moolenaar 		--added;
2185071d4279SBram Moolenaar 	    }
2186071d4279SBram Moolenaar 	    for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i)
2187071d4279SBram Moolenaar 	    {
2188071d4279SBram Moolenaar 		linenr_T nr;
2189071d4279SBram Moolenaar 
2190071d4279SBram Moolenaar 		nr = dp->df_lnum[idx_from] + start_skip + i;
219149d7bf13SBram Moolenaar 		if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count)
2192071d4279SBram Moolenaar 		    break;
2193910f66f9SBram Moolenaar 		p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from],
2194910f66f9SBram Moolenaar 								  nr, FALSE));
2195071d4279SBram Moolenaar 		if (p != NULL)
2196071d4279SBram Moolenaar 		{
2197071d4279SBram Moolenaar 		    ml_append(lnum + i - 1, p, 0, FALSE);
2198071d4279SBram Moolenaar 		    vim_free(p);
2199071d4279SBram Moolenaar 		    ++added;
2200280f126eSBram Moolenaar 		    if (buf_empty && curbuf->b_ml.ml_line_count == 2)
2201280f126eSBram Moolenaar 		    {
2202280f126eSBram Moolenaar 			/* Added the first line into an empty buffer, need to
2203280f126eSBram Moolenaar 			 * delete the dummy empty line. */
2204280f126eSBram Moolenaar 			buf_empty = FALSE;
2205280f126eSBram Moolenaar 			ml_delete((linenr_T)2, FALSE);
2206280f126eSBram Moolenaar 		    }
2207071d4279SBram Moolenaar 		}
2208071d4279SBram Moolenaar 	    }
2209071d4279SBram Moolenaar 	    new_count = dp->df_count[idx_to] + added;
2210071d4279SBram Moolenaar 	    dp->df_count[idx_to] = new_count;
2211071d4279SBram Moolenaar 
2212071d4279SBram Moolenaar 	    if (start_skip == 0 && end_skip == 0)
2213071d4279SBram Moolenaar 	    {
2214071d4279SBram Moolenaar 		/* Check if there are any other buffers and if the diff is
2215071d4279SBram Moolenaar 		 * equal in them. */
2216071d4279SBram Moolenaar 		for (i = 0; i < DB_COUNT; ++i)
2217910f66f9SBram Moolenaar 		    if (curtab->tp_diffbuf[i] != NULL && i != idx_from
2218910f66f9SBram Moolenaar 								&& i != idx_to
2219071d4279SBram Moolenaar 			    && !diff_equal_entry(dp, idx_from, i))
2220071d4279SBram Moolenaar 			break;
2221071d4279SBram Moolenaar 		if (i == DB_COUNT)
2222071d4279SBram Moolenaar 		{
2223071d4279SBram Moolenaar 		    /* delete the diff entry, the buffers are now equal here */
2224071d4279SBram Moolenaar 		    dfree = dp;
2225071d4279SBram Moolenaar 		    dp = dp->df_next;
2226071d4279SBram Moolenaar 		    if (dprev == NULL)
222749d7bf13SBram Moolenaar 			curtab->tp_first_diff = dp;
2228071d4279SBram Moolenaar 		    else
2229071d4279SBram Moolenaar 			dprev->df_next = dp;
2230071d4279SBram Moolenaar 		}
2231071d4279SBram Moolenaar 	    }
2232071d4279SBram Moolenaar 
2233071d4279SBram Moolenaar 	    /* Adjust marks.  This will change the following entries! */
2234071d4279SBram Moolenaar 	    if (added != 0)
2235071d4279SBram Moolenaar 	    {
2236071d4279SBram Moolenaar 		mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added);
2237071d4279SBram Moolenaar 		if (curwin->w_cursor.lnum >= lnum)
2238071d4279SBram Moolenaar 		{
2239071d4279SBram Moolenaar 		    /* Adjust the cursor position if it's in/after the changed
2240071d4279SBram Moolenaar 		     * lines. */
2241071d4279SBram Moolenaar 		    if (curwin->w_cursor.lnum >= lnum + count)
2242071d4279SBram Moolenaar 			curwin->w_cursor.lnum += added;
2243071d4279SBram Moolenaar 		    else if (added < 0)
2244071d4279SBram Moolenaar 			curwin->w_cursor.lnum = lnum;
2245071d4279SBram Moolenaar 		}
2246071d4279SBram Moolenaar 	    }
2247071d4279SBram Moolenaar 	    changed_lines(lnum, 0, lnum + count, (long)added);
2248071d4279SBram Moolenaar 
2249071d4279SBram Moolenaar 	    if (dfree != NULL)
2250071d4279SBram Moolenaar 	    {
2251071d4279SBram Moolenaar 		/* Diff is deleted, update folds in other windows. */
2252071d4279SBram Moolenaar #ifdef FEAT_FOLDING
2253071d4279SBram Moolenaar 		diff_fold_update(dfree, idx_to);
2254071d4279SBram Moolenaar #endif
2255071d4279SBram Moolenaar 		vim_free(dfree);
2256071d4279SBram Moolenaar 	    }
2257071d4279SBram Moolenaar 	    else
2258071d4279SBram Moolenaar 		/* mark_adjust() may have changed the count in a wrong way */
2259071d4279SBram Moolenaar 		dp->df_count[idx_to] = new_count;
2260071d4279SBram Moolenaar 
2261071d4279SBram Moolenaar 	    /* When changing the current buffer, keep track of line numbers */
2262071d4279SBram Moolenaar 	    if (idx_cur == idx_to)
2263071d4279SBram Moolenaar 		off += added;
2264071d4279SBram Moolenaar 	}
2265071d4279SBram Moolenaar 
2266071d4279SBram Moolenaar 	/* If before the range or not deleted, go to next diff. */
2267071d4279SBram Moolenaar 	if (dfree == NULL)
2268071d4279SBram Moolenaar 	{
2269071d4279SBram Moolenaar 	    dprev = dp;
2270071d4279SBram Moolenaar 	    dp = dp->df_next;
2271071d4279SBram Moolenaar 	}
2272071d4279SBram Moolenaar     }
2273071d4279SBram Moolenaar 
2274071d4279SBram Moolenaar     /* restore curwin/curbuf and a few other things */
2275071d4279SBram Moolenaar     if (idx_other == idx_to)
2276071d4279SBram Moolenaar     {
2277071d4279SBram Moolenaar 	/* Syncing undo only works for the current buffer, but we change
2278071d4279SBram Moolenaar 	 * another buffer.  Sync undo if the command was typed.  This isn't
2279071d4279SBram Moolenaar 	 * 100% right when ":diffput" is used in a function or mapping. */
2280071d4279SBram Moolenaar 	if (KeyTyped)
2281779b74b2SBram Moolenaar 	    u_sync(FALSE);
2282071d4279SBram Moolenaar 	aucmd_restbuf(&aco);
2283071d4279SBram Moolenaar     }
2284071d4279SBram Moolenaar 
2285071d4279SBram Moolenaar     diff_busy = FALSE;
2286071d4279SBram Moolenaar 
2287071d4279SBram Moolenaar     /* Check that the cursor is on a valid character and update it's position.
2288071d4279SBram Moolenaar      * When there were filler lines the topline has become invalid. */
2289071d4279SBram Moolenaar     check_cursor();
2290071d4279SBram Moolenaar     changed_line_abv_curs();
2291071d4279SBram Moolenaar 
2292071d4279SBram Moolenaar     /* Also need to redraw the other buffers. */
2293071d4279SBram Moolenaar     diff_redraw(FALSE);
2294071d4279SBram Moolenaar }
2295071d4279SBram Moolenaar 
2296071d4279SBram Moolenaar #ifdef FEAT_FOLDING
2297071d4279SBram Moolenaar /*
2298071d4279SBram Moolenaar  * Update folds for all diff buffers for entry "dp".
2299071d4279SBram Moolenaar  * Skip buffer with index "skip_idx".
2300071d4279SBram Moolenaar  * When there are no diffs, all folds are removed.
2301071d4279SBram Moolenaar  */
2302071d4279SBram Moolenaar     static void
2303071d4279SBram Moolenaar diff_fold_update(dp, skip_idx)
2304071d4279SBram Moolenaar     diff_T	*dp;
2305071d4279SBram Moolenaar     int		skip_idx;
2306071d4279SBram Moolenaar {
2307071d4279SBram Moolenaar     int		i;
2308071d4279SBram Moolenaar     win_T	*wp;
2309071d4279SBram Moolenaar 
2310071d4279SBram Moolenaar     for (wp = firstwin; wp != NULL; wp = wp->w_next)
2311071d4279SBram Moolenaar 	for (i = 0; i < DB_COUNT; ++i)
231249d7bf13SBram Moolenaar 	    if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx)
2313071d4279SBram Moolenaar 		foldUpdate(wp, dp->df_lnum[i],
2314071d4279SBram Moolenaar 					    dp->df_lnum[i] + dp->df_count[i]);
2315071d4279SBram Moolenaar }
2316071d4279SBram Moolenaar #endif
2317071d4279SBram Moolenaar 
2318071d4279SBram Moolenaar /*
2319071d4279SBram Moolenaar  * Return TRUE if buffer "buf" is in diff-mode.
2320071d4279SBram Moolenaar  */
2321071d4279SBram Moolenaar     int
2322071d4279SBram Moolenaar diff_mode_buf(buf)
2323071d4279SBram Moolenaar     buf_T	*buf;
2324071d4279SBram Moolenaar {
232549d7bf13SBram Moolenaar     tabpage_T	*tp;
232649d7bf13SBram Moolenaar 
232749d7bf13SBram Moolenaar     for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
232849d7bf13SBram Moolenaar 	if (diff_buf_idx_tp(buf, tp) != DB_COUNT)
232949d7bf13SBram Moolenaar 	    return TRUE;
233049d7bf13SBram Moolenaar     return FALSE;
2331071d4279SBram Moolenaar }
2332071d4279SBram Moolenaar 
2333071d4279SBram Moolenaar /*
2334071d4279SBram Moolenaar  * Move "count" times in direction "dir" to the next diff block.
2335071d4279SBram Moolenaar  * Return FAIL if there isn't such a diff block.
2336071d4279SBram Moolenaar  */
2337071d4279SBram Moolenaar     int
2338071d4279SBram Moolenaar diff_move_to(dir, count)
2339071d4279SBram Moolenaar     int		dir;
2340071d4279SBram Moolenaar     long	count;
2341071d4279SBram Moolenaar {
2342071d4279SBram Moolenaar     int		idx;
2343071d4279SBram Moolenaar     linenr_T	lnum = curwin->w_cursor.lnum;
2344071d4279SBram Moolenaar     diff_T	*dp;
2345071d4279SBram Moolenaar 
2346071d4279SBram Moolenaar     idx = diff_buf_idx(curbuf);
234749d7bf13SBram Moolenaar     if (idx == DB_COUNT || curtab->tp_first_diff == NULL)
2348071d4279SBram Moolenaar 	return FAIL;
2349071d4279SBram Moolenaar 
235049d7bf13SBram Moolenaar     if (curtab->tp_diff_invalid)
2351071d4279SBram Moolenaar 	ex_diffupdate(NULL);		/* update after a big change */
2352071d4279SBram Moolenaar 
235349d7bf13SBram Moolenaar     if (curtab->tp_first_diff == NULL)		/* no diffs today */
2354071d4279SBram Moolenaar 	return FAIL;
2355071d4279SBram Moolenaar 
2356071d4279SBram Moolenaar     while (--count >= 0)
2357071d4279SBram Moolenaar     {
2358071d4279SBram Moolenaar 	/* Check if already before first diff. */
235949d7bf13SBram Moolenaar 	if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx])
2360071d4279SBram Moolenaar 	    break;
2361071d4279SBram Moolenaar 
236249d7bf13SBram Moolenaar 	for (dp = curtab->tp_first_diff; ; dp = dp->df_next)
2363071d4279SBram Moolenaar 	{
2364071d4279SBram Moolenaar 	    if (dp == NULL)
2365071d4279SBram Moolenaar 		break;
2366071d4279SBram Moolenaar 	    if ((dir == FORWARD && lnum < dp->df_lnum[idx])
2367071d4279SBram Moolenaar 		    || (dir == BACKWARD
2368071d4279SBram Moolenaar 			&& (dp->df_next == NULL
2369071d4279SBram Moolenaar 			    || lnum <= dp->df_next->df_lnum[idx])))
2370071d4279SBram Moolenaar 	    {
2371071d4279SBram Moolenaar 		lnum = dp->df_lnum[idx];
2372071d4279SBram Moolenaar 		break;
2373071d4279SBram Moolenaar 	    }
2374071d4279SBram Moolenaar 	}
2375071d4279SBram Moolenaar     }
2376071d4279SBram Moolenaar 
2377071d4279SBram Moolenaar     /* don't end up past the end of the file */
2378071d4279SBram Moolenaar     if (lnum > curbuf->b_ml.ml_line_count)
2379071d4279SBram Moolenaar 	lnum = curbuf->b_ml.ml_line_count;
2380071d4279SBram Moolenaar 
2381071d4279SBram Moolenaar     /* When the cursor didn't move at all we fail. */
2382071d4279SBram Moolenaar     if (lnum == curwin->w_cursor.lnum)
2383071d4279SBram Moolenaar 	return FAIL;
2384071d4279SBram Moolenaar 
2385071d4279SBram Moolenaar     setpcmark();
2386071d4279SBram Moolenaar     curwin->w_cursor.lnum = lnum;
2387071d4279SBram Moolenaar     curwin->w_cursor.col = 0;
2388071d4279SBram Moolenaar 
2389071d4279SBram Moolenaar     return OK;
2390071d4279SBram Moolenaar }
2391071d4279SBram Moolenaar 
2392071d4279SBram Moolenaar #if defined(FEAT_FOLDING) || defined(PROTO)
2393071d4279SBram Moolenaar /*
2394071d4279SBram Moolenaar  * For line "lnum" in the current window find the equivalent lnum in window
2395071d4279SBram Moolenaar  * "wp", compensating for inserted/deleted lines.
2396071d4279SBram Moolenaar  */
2397071d4279SBram Moolenaar     linenr_T
2398071d4279SBram Moolenaar diff_lnum_win(lnum, wp)
2399071d4279SBram Moolenaar     linenr_T	lnum;
2400071d4279SBram Moolenaar     win_T	*wp;
2401071d4279SBram Moolenaar {
2402071d4279SBram Moolenaar     diff_T	*dp;
2403071d4279SBram Moolenaar     int		idx;
2404071d4279SBram Moolenaar     int		i;
2405071d4279SBram Moolenaar     linenr_T	n;
2406071d4279SBram Moolenaar 
2407071d4279SBram Moolenaar     idx = diff_buf_idx(curbuf);
2408071d4279SBram Moolenaar     if (idx == DB_COUNT)		/* safety check */
2409071d4279SBram Moolenaar 	return (linenr_T)0;
2410071d4279SBram Moolenaar 
241149d7bf13SBram Moolenaar     if (curtab->tp_diff_invalid)
2412071d4279SBram Moolenaar 	ex_diffupdate(NULL);		/* update after a big change */
2413071d4279SBram Moolenaar 
2414071d4279SBram Moolenaar     /* search for a change that includes "lnum" in the list of diffblocks. */
241549d7bf13SBram Moolenaar     for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
2416071d4279SBram Moolenaar 	if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
2417071d4279SBram Moolenaar 	    break;
2418071d4279SBram Moolenaar 
2419071d4279SBram Moolenaar     /* When after the last change, compute relative to the last line number. */
2420071d4279SBram Moolenaar     if (dp == NULL)
2421071d4279SBram Moolenaar 	return wp->w_buffer->b_ml.ml_line_count
2422071d4279SBram Moolenaar 					- (curbuf->b_ml.ml_line_count - lnum);
2423071d4279SBram Moolenaar 
2424071d4279SBram Moolenaar     /* Find index for "wp". */
2425071d4279SBram Moolenaar     i = diff_buf_idx(wp->w_buffer);
2426071d4279SBram Moolenaar     if (i == DB_COUNT)			/* safety check */
2427071d4279SBram Moolenaar 	return (linenr_T)0;
2428071d4279SBram Moolenaar 
2429071d4279SBram Moolenaar     n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]);
2430071d4279SBram Moolenaar     if (n > dp->df_lnum[i] + dp->df_count[i])
2431071d4279SBram Moolenaar 	n = dp->df_lnum[i] + dp->df_count[i];
2432071d4279SBram Moolenaar     return n;
2433071d4279SBram Moolenaar }
2434071d4279SBram Moolenaar #endif
2435071d4279SBram Moolenaar 
2436071d4279SBram Moolenaar #endif	/* FEAT_DIFF */
2437