Mercurial > vim

annotate src/diff.c @ 16029:43b5514f084c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added tag v8.1.1019 for changeset 8ad2cda3757d62fc27bd7df41de1685e9876d1d9
author Bram Moolenaar <Bram@vim.org>
date Tue, 19 Mar 2019 22:00:07 +0100
parents ced614446eaa
children ef00b6bc186b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10042
4aead6a9b7a9 commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents: 10013
diff changeset
1 /* vi:set ts=8 sts=4 sw=4 noet:
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3 * VIM - Vi IMproved by Bram Moolenaar
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5 * Do ":help uganda" in Vim to read copying and usage conditions.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 * Do ":help credits" in Vim to see a list of people who contributed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7 * See README.txt for an overview of the Vim source code.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 /*
1788
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
11 * diff.c: code for diff'ing two, three or four buffers.
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
12 *
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
13 * There are three ways to diff:
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
14 * - Shell out to an external diff program, using files.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
15 * - Use the compiled-in xdiff library.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
16 * - Let 'diffexpr' do the work, using files.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
17 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
18
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19 #include "vim.h"
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
20 #include "xdiff/xdiff.h"
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
21
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
22 #if defined(FEAT_DIFF) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
23
14776
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget
Christian Brabandt <cb@256bit.org>
parents: 14770
diff changeset
24 static int diff_busy = FALSE; // using diff structs, don't change them
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget
Christian Brabandt <cb@256bit.org>
parents: 14770
diff changeset
25 static int diff_need_update = FALSE; // ex_diffupdate needs to be called
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
27 /* flags obtained from the 'diffopt' option */
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
28 #define DIFF_FILLER 0x001 // display filler lines
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
29 #define DIFF_IBLANK 0x002 // ignore empty lines
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
30 #define DIFF_ICASE 0x004 // ignore case
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
31 #define DIFF_IWHITE 0x008 // ignore change in white space
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
32 #define DIFF_IWHITEALL 0x010 // ignore all white space changes
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
33 #define DIFF_IWHITEEOL 0x020 // ignore change in white space at EOL
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
34 #define DIFF_HORIZONTAL 0x040 // horizontal splits
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
35 #define DIFF_VERTICAL 0x080 // vertical splits
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
36 #define DIFF_HIDDEN_OFF 0x100 // diffoff when hidden
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
37 #define DIFF_INTERNAL 0x200 // use internal xdiff algorithm
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
38 #define ALL_WHITE_DIFF (DIFF_IWHITE | DIFF_IWHITEALL | DIFF_IWHITEEOL)
14716
973d3f4d8017 patch 8.1.0370: not using internal diff if 'diffopt' is not changed
Christian Brabandt <cb@256bit.org>
parents: 14696
diff changeset
39 static int diff_flags = DIFF_INTERNAL | DIFF_FILLER;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
40
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
41 static long diff_algorithm = 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
42
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
43 #define LBUFLEN 50 /* length of line in diff file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
44
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
45 static int diff_a_works = MAYBE; /* TRUE when "diff -a" works, FALSE when it
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
46 doesn't work, MAYBE when not checked yet */
8212
05b88224cea1 commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents: 7817
diff changeset
47 #if defined(MSWIN)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
48 static int diff_bin_works = MAYBE; /* TRUE when "diff --binary" works, FALSE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
49 when it doesn't work, MAYBE when not
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
50 checked yet */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
51 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
52
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
53 // used for diff input
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
54 typedef struct {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
55 char_u *din_fname; // used for external diff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
56 mmfile_t din_mmfile; // used for internal diff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
57 } diffin_T;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
58
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
59 // used for diff result
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
60 typedef struct {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
61 char_u *dout_fname; // used for external diff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
62 garray_T dout_ga; // used for internal diff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
63 } diffout_T;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
64
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
65 // two diff inputs and one result
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
66 typedef struct {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
67 diffin_T dio_orig; // original file input
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
68 diffin_T dio_new; // new file input
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
69 diffout_T dio_diff; // diff result
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
70 int dio_internal; // using internal diff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
71 } diffio_T;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
72
7799
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
73 static int diff_buf_idx(buf_T *buf);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
74 static int diff_buf_idx_tp(buf_T *buf, tabpage_T *tp);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
75 static void diff_mark_adjust_tp(tabpage_T *tp, int idx, linenr_T line1, linenr_T line2, long amount, long amount_after);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
76 static void diff_check_unchanged(tabpage_T *tp, diff_T *dp);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
77 static int diff_check_sanity(tabpage_T *tp, diff_T *dp);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
78 static void diff_redraw(int dofold);
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
79 static int check_external_diff(diffio_T *diffio);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
80 static int diff_file(diffio_T *diffio);
7799
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
81 static int diff_equal_entry(diff_T *dp, int idx1, int idx2);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
82 static int diff_cmp(char_u *s1, char_u *s2);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
83 #ifdef FEAT_FOLDING
7799
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
84 static void diff_fold_update(diff_T *dp, int skip_idx);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
85 #endif
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
86 static void diff_read(int idx_orig, int idx_new, diffout_T *fname);
7799
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
87 static void diff_copy_entry(diff_T *dprev, diff_T *dp, int idx_orig, int idx_new);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
88 static diff_T *diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp);
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
89 static int parse_diff_ed(char_u *line, linenr_T *lnum_orig, long *count_orig, linenr_T *lnum_new, long *count_new);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
90 static int parse_diff_unified(char_u *line, linenr_T *lnum_orig, long *count_orig, linenr_T *lnum_new, long *count_new);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
91 static int xdiff_out(void *priv, mmbuffer_t *mb, int nbuf);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
92
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
93 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
94 * Called when deleting or unloading a buffer: No longer make a diff with it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
95 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
96 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
97 diff_buf_delete(buf_T *buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
98 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
99 int i;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
100 tabpage_T *tp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
101
9649
fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents: 9487
diff changeset
102 FOR_ALL_TABPAGES(tp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
103 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
104 i = diff_buf_idx_tp(buf, tp);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
105 if (i != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
106 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
107 tp->tp_diffbuf[i] = NULL;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
108 tp->tp_diff_invalid = TRUE;
1761
0836531167ab updated for version 7.2-059
vimboss
parents: 1757
diff changeset
109 if (tp == curtab)
0836531167ab updated for version 7.2-059
vimboss
parents: 1757
diff changeset
110 diff_redraw(TRUE);
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
111 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
112 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
113 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
114
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
115 /*
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
116 * Check if the current buffer should be added to or removed from the list of
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
117 * diff buffers.
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
118 */
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
119 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
120 diff_buf_adjust(win_T *win)
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
121 {
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
122 win_T *wp;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
123 int i;
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
124
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
125 if (!win->w_p_diff)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
126 {
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
127 /* When there is no window showing a diff for this buffer, remove
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
128 * it from the diffs. */
9649
fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents: 9487
diff changeset
129 FOR_ALL_WINDOWS(wp)
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
130 if (wp->w_buffer == win->w_buffer && wp->w_p_diff)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
131 break;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
132 if (wp == NULL)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
133 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
134 i = diff_buf_idx(win->w_buffer);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
135 if (i != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
136 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
137 curtab->tp_diffbuf[i] = NULL;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
138 curtab->tp_diff_invalid = TRUE;
1761
0836531167ab updated for version 7.2-059
vimboss
parents: 1757
diff changeset
139 diff_redraw(TRUE);
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
140 }
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
141 }
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
142 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
143 else
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
144 diff_buf_add(win->w_buffer);
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
145 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
146
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
147 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
148 * Add a buffer to make diffs for.
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
149 * Call this when a new buffer is being edited in the current window where
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
150 * 'diff' is set.
1788
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
151 * Marks the current buffer as being part of the diff and requiring updating.
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
152 * This must be done before any autocmd, because a command may use info
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
153 * about the screen contents.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
154 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
155 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
156 diff_buf_add(buf_T *buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
157 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
158 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
159
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
160 if (diff_buf_idx(buf) != DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
161 return; /* It's already there. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
162
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
163 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
164 if (curtab->tp_diffbuf[i] == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
165 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
166 curtab->tp_diffbuf[i] = buf;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
167 curtab->tp_diff_invalid = TRUE;
1761
0836531167ab updated for version 7.2-059
vimboss
parents: 1757
diff changeset
168 diff_redraw(TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
169 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
170 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
171
15490
98c35d312987 patch 8.1.0753: printf format not checked for semsg()
Bram Moolenaar <Bram@vim.org>
parents: 15470
diff changeset
172 semsg(_("E96: Cannot diff more than %d buffers"), DB_COUNT);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
173 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
174
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
175 /*
10821
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
176 * Remove all buffers to make diffs for.
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
177 */
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
178 static void
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
179 diff_buf_clear(void)
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
180 {
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
181 int i;
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
182
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
183 for (i = 0; i < DB_COUNT; ++i)
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
184 if (curtab->tp_diffbuf[i] != NULL)
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
185 {
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
186 curtab->tp_diffbuf[i] = NULL;
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
187 curtab->tp_diff_invalid = TRUE;
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
188 diff_redraw(TRUE);
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
189 }
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
190 }
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
191
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
192 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
193 * Find buffer "buf" in the list of diff buffers for the current tab page.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
194 * Return its index or DB_COUNT if not found.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
195 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
196 static int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
197 diff_buf_idx(buf_T *buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
198 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
199 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
200
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
201 for (idx = 0; idx < DB_COUNT; ++idx)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
202 if (curtab->tp_diffbuf[idx] == buf)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
203 break;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
204 return idx;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
205 }
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
206
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
207 /*
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
208 * Find buffer "buf" in the list of diff buffers for tab page "tp".
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
209 * Return its index or DB_COUNT if not found.
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
210 */
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
211 static int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
212 diff_buf_idx_tp(buf_T *buf, tabpage_T *tp)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
213 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
214 int idx;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
215
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
216 for (idx = 0; idx < DB_COUNT; ++idx)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
217 if (tp->tp_diffbuf[idx] == buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
218 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
219 return idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
220 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
221
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
222 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
223 * Mark the diff info involving buffer "buf" as invalid, it will be updated
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
224 * when info is requested.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
225 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
226 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
227 diff_invalidate(buf_T *buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
228 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
229 tabpage_T *tp;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
230 int i;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
231
9649
fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents: 9487
diff changeset
232 FOR_ALL_TABPAGES(tp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
233 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
234 i = diff_buf_idx_tp(buf, tp);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
235 if (i != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
236 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
237 tp->tp_diff_invalid = TRUE;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
238 if (tp == curtab)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
239 diff_redraw(TRUE);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
240 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
241 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
242 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
243
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
244 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
245 * Called by mark_adjust(): update line numbers in "curbuf".
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
246 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
247 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
248 diff_mark_adjust(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
249 linenr_T line1,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
250 linenr_T line2,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
251 long amount,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
252 long amount_after)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
253 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
254 int idx;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
255 tabpage_T *tp;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
256
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
257 /* Handle all tab pages that use the current buffer in a diff. */
9649
fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents: 9487
diff changeset
258 FOR_ALL_TABPAGES(tp)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
259 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
260 idx = diff_buf_idx_tp(curbuf, tp);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
261 if (idx != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
262 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
263 }
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
264 }
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
265
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
266 /*
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
267 * Update line numbers in tab page "tp" for "curbuf" with index "idx".
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
268 * This attempts to update the changes as much as possible:
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
269 * When inserting/deleting lines outside of existing change blocks, create a
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
270 * new change block and update the line numbers in following blocks.
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
271 * When inserting/deleting lines in existing change blocks, update them.
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
272 */
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
273 static void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
274 diff_mark_adjust_tp(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
275 tabpage_T *tp,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
276 int idx,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
277 linenr_T line1,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
278 linenr_T line2,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
279 long amount,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
280 long amount_after)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
281 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
282 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
283 diff_T *dprev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
284 diff_T *dnext;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
285 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
286 int inserted, deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
287 int n, off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
288 linenr_T last;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
289 linenr_T lnum_deleted = line1; /* lnum of remaining deletion */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
290 int check_unchanged;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
291
14764
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly
Christian Brabandt <cb@256bit.org>
parents: 14762
diff changeset
292 if (diff_internal())
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly
Christian Brabandt <cb@256bit.org>
parents: 14762
diff changeset
293 {
14780
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
294 // Will update diffs before redrawing. Set _invalid to update the
14764
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly
Christian Brabandt <cb@256bit.org>
parents: 14762
diff changeset
295 // diffs themselves, set _update to also update folds properly just
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly
Christian Brabandt <cb@256bit.org>
parents: 14762
diff changeset
296 // before redrawing.
14972
5d52b21b2e7f patch 8.1.0497: :%diffput changes order of lines
Bram Moolenaar <Bram@vim.org>
parents: 14893
diff changeset
297 // Do update marks here, it is needed for :%diffput.
14764
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly
Christian Brabandt <cb@256bit.org>
parents: 14762
diff changeset
298 tp->tp_diff_invalid = TRUE;
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly
Christian Brabandt <cb@256bit.org>
parents: 14762
diff changeset
299 tp->tp_diff_update = TRUE;
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly
Christian Brabandt <cb@256bit.org>
parents: 14762
diff changeset
300 }
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly
Christian Brabandt <cb@256bit.org>
parents: 14762
diff changeset
301
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
302 if (line2 == MAXLNUM)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
303 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
304 /* mark_adjust(99, MAXLNUM, 9, 0): insert lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
305 inserted = amount;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
306 deleted = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
307 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
308 else if (amount_after > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
309 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
310 /* mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines*/
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
311 inserted = amount_after;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
312 deleted = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
313 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
314 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
315 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
316 /* mark_adjust(98, 99, MAXLNUM, -2): delete lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
317 inserted = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
318 deleted = -amount_after;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
319 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
320
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
321 dprev = NULL;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
322 dp = tp->tp_first_diff;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
323 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
324 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
325 /* If the change is after the previous diff block and before the next
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
326 * diff block, thus not touching an existing change, create a new diff
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
327 * block. Don't do this when ex_diffgetput() is busy. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
328 if ((dp == NULL || dp->df_lnum[idx] - 1 > line2
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
329 || (line2 == MAXLNUM && dp->df_lnum[idx] > line1))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
330 && (dprev == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
331 || dprev->df_lnum[idx] + dprev->df_count[idx] < line1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
332 && !diff_busy)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
333 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
334 dnext = diff_alloc_new(tp, dprev, dp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
335 if (dnext == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
336 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
337
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
338 dnext->df_lnum[idx] = line1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
339 dnext->df_count[idx] = inserted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
340 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
341 if (tp->tp_diffbuf[i] != NULL && i != idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
342 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
343 if (dprev == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
344 dnext->df_lnum[i] = line1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
345 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
346 dnext->df_lnum[i] = line1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
347 + (dprev->df_lnum[i] + dprev->df_count[i])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
348 - (dprev->df_lnum[idx] + dprev->df_count[idx]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
349 dnext->df_count[i] = deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
350 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
351 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
352
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
353 /* if at end of the list, quit */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
354 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
355 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
356
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
357 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
358 * Check for these situations:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
359 * 1 2 3
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
360 * 1 2 3
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
361 * line1 2 3 4 5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
362 * 2 3 4 5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
363 * 2 3 4 5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
364 * line2 2 3 4 5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
365 * 3 5 6
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
366 * 3 5 6
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
367 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
368 /* compute last line of this change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
369 last = dp->df_lnum[idx] + dp->df_count[idx] - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
370
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
371 /* 1. change completely above line1: nothing to do */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
372 if (last >= line1 - 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
373 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
374 /* 6. change below line2: only adjust for amount_after; also when
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
375 * "deleted" became zero when deleted all lines between two diffs */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
376 if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
377 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
378 if (amount_after == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
379 break; /* nothing left to change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
380 dp->df_lnum[idx] += amount_after;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
381 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
382 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
383 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
384 check_unchanged = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
385
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
386 /* 2. 3. 4. 5.: inserted/deleted lines touching this diff. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
387 if (deleted > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
388 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
389 if (dp->df_lnum[idx] >= line1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
390 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
391 off = dp->df_lnum[idx] - lnum_deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
392 if (last <= line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
393 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
394 /* 4. delete all lines of diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
395 if (dp->df_next != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
396 && dp->df_next->df_lnum[idx] - 1 <= line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
397 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
398 /* delete continues in next diff, only do
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
399 * lines until that one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
400 n = dp->df_next->df_lnum[idx] - lnum_deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
401 deleted -= n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
402 n -= dp->df_count[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
403 lnum_deleted = dp->df_next->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
404 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
405 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
406 n = deleted - dp->df_count[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
407 dp->df_count[idx] = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
408 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
409 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
410 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
411 /* 5. delete lines at or just before top of diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
412 n = off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
413 dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
414 check_unchanged = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
415 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
416 dp->df_lnum[idx] = line1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
417 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
418 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
419 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
420 off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
421 if (last < line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
422 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
423 /* 2. delete at end of of diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
424 dp->df_count[idx] -= last - lnum_deleted + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
425 if (dp->df_next != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
426 && dp->df_next->df_lnum[idx] - 1 <= line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
427 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
428 /* delete continues in next diff, only do
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
429 * lines until that one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
430 n = dp->df_next->df_lnum[idx] - 1 - last;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
431 deleted -= dp->df_next->df_lnum[idx]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
432 - lnum_deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
433 lnum_deleted = dp->df_next->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
434 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
435 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
436 n = line2 - last;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
437 check_unchanged = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
438 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
439 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
440 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
441 /* 3. delete lines inside the diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
442 n = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
443 dp->df_count[idx] -= deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
444 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
445 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
446
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
447 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
448 if (tp->tp_diffbuf[i] != NULL && i != idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
449 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
450 dp->df_lnum[i] -= off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
451 dp->df_count[i] += n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
452 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
453 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
454 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
455 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
456 if (dp->df_lnum[idx] <= line1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
457 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
458 /* inserted lines somewhere in this diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
459 dp->df_count[idx] += inserted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
460 check_unchanged = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
461 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
462 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
463 /* inserted lines somewhere above this diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
464 dp->df_lnum[idx] += inserted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
465 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
466
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
467 if (check_unchanged)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
468 /* Check if inserted lines are equal, may reduce the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
469 * size of the diff. TODO: also check for equal lines
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
470 * in the middle and perhaps split the block. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
471 diff_check_unchanged(tp, dp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
472 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
473 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
474
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
475 /* check if this block touches the previous one, may merge them. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
476 if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
477 == dp->df_lnum[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
478 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
479 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
480 if (tp->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
481 dprev->df_count[i] += dp->df_count[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
482 dprev->df_next = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
483 vim_free(dp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
484 dp = dprev->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
485 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
486 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
487 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
488 /* Advance to next entry. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
489 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
490 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
491 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
492 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
493
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
494 dprev = NULL;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
495 dp = tp->tp_first_diff;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
496 while (dp != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
497 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
498 /* All counts are zero, remove this entry. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
499 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
500 if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
501 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
502 if (i == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
503 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
504 dnext = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
505 vim_free(dp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
506 dp = dnext;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
507 if (dprev == NULL)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
508 tp->tp_first_diff = dnext;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
509 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
510 dprev->df_next = dnext;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
511 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
512 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
513 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
514 /* Advance to next entry. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
515 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
516 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
517 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
518
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
519 }
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
520
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
521 if (tp == curtab)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
522 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
523 diff_redraw(TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
524
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
525 /* Need to recompute the scroll binding, may remove or add filler
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
526 * lines (e.g., when adding lines above w_topline). But it's slow when
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
527 * making many changes, postpone until redrawing. */
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
528 diff_need_scrollbind = TRUE;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
529 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
530 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
531
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
532 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
533 * Allocate a new diff block and link it between "dprev" and "dp".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
534 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
535 static diff_T *
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
536 diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
537 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
538 diff_T *dnew;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
539
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
540 dnew = (diff_T *)alloc((unsigned)sizeof(diff_T));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
541 if (dnew != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
542 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
543 dnew->df_next = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
544 if (dprev == NULL)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
545 tp->tp_first_diff = dnew;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
546 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
547 dprev->df_next = dnew;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
548 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
549 return dnew;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
550 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
551
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
552 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
553 * Check if the diff block "dp" can be made smaller for lines at the start and
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
554 * end that are equal. Called after inserting lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
555 * This may result in a change where all buffers have zero lines, the caller
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
556 * must take care of removing it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
557 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
558 static void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
559 diff_check_unchanged(tabpage_T *tp, diff_T *dp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
560 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
561 int i_org;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
562 int i_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
563 int off_org, off_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
564 char_u *line_org;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
565 int dir = FORWARD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
566
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
567 /* Find the first buffers, use it as the original, compare the other
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
568 * buffer lines against this one. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
569 for (i_org = 0; i_org < DB_COUNT; ++i_org)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
570 if (tp->tp_diffbuf[i_org] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
571 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
572 if (i_org == DB_COUNT) /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
573 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
574
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
575 if (diff_check_sanity(tp, dp) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
576 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
577
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
578 /* First check lines at the top, then at the bottom. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
579 off_org = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
580 off_new = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
581 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
582 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
583 /* Repeat until a line is found which is different or the number of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
584 * lines has become zero. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
585 while (dp->df_count[i_org] > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
586 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
587 /* Copy the line, the next ml_get() will invalidate it. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
588 if (dir == BACKWARD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
589 off_org = dp->df_count[i_org] - 1;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
590 line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org],
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
591 dp->df_lnum[i_org] + off_org, FALSE));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
592 if (line_org == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
593 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
594 for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
595 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
596 if (tp->tp_diffbuf[i_new] == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
597 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
598 if (dir == BACKWARD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
599 off_new = dp->df_count[i_new] - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
600 /* if other buffer doesn't have this line, it was inserted */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
601 if (off_new < 0 || off_new >= dp->df_count[i_new])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
602 break;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
603 if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new],
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
604 dp->df_lnum[i_new] + off_new, FALSE)) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
605 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
606 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
607 vim_free(line_org);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
608
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
609 /* Stop when a line isn't equal in all diff buffers. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
610 if (i_new != DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
611 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
612
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
613 /* Line matched in all buffers, remove it from the diff. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
614 for (i_new = i_org; i_new < DB_COUNT; ++i_new)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
615 if (tp->tp_diffbuf[i_new] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
616 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
617 if (dir == FORWARD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
618 ++dp->df_lnum[i_new];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
619 --dp->df_count[i_new];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
620 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
621 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
622 if (dir == BACKWARD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
623 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
624 dir = BACKWARD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
625 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
626 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
627
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
628 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
629 * Check if a diff block doesn't contain invalid line numbers.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
630 * This can happen when the diff program returns invalid results.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
631 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
632 static int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
633 diff_check_sanity(tabpage_T *tp, diff_T *dp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
634 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
635 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
636
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
637 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
638 if (tp->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
639 if (dp->df_lnum[i] + dp->df_count[i] - 1
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
640 > tp->tp_diffbuf[i]->b_ml.ml_line_count)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
641 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
642 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
643 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
644
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
645 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
646 * Mark all diff buffers in the current tab page for redraw.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
647 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
648 static void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
649 diff_redraw(
14764
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly
Christian Brabandt <cb@256bit.org>
parents: 14762
diff changeset
650 int dofold) // also recompute the folds
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
651 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
652 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
653 int n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
654
9649
fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents: 9487
diff changeset
655 FOR_ALL_WINDOWS(wp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
656 if (wp->w_p_diff)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
657 {
738
5c9e7c6e6e2e updated for version 7.0222
vimboss
parents: 694
diff changeset
658 redraw_win_later(wp, SOME_VALID);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
659 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
660 if (dofold && foldmethodIsDiff(wp))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
661 foldUpdateAll(wp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
662 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
663 /* A change may have made filler lines invalid, need to take care
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
664 * of that for other windows. */
3904
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 3524
diff changeset
665 n = diff_check(wp, wp->w_topline);
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 3524
diff changeset
666 if ((wp != curwin && wp->w_topfill > 0) || n > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
667 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
668 if (wp->w_topfill > n)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
669 wp->w_topfill = (n < 0 ? 0 : n);
3904
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 3524
diff changeset
670 else if (n > 0 && n > wp->w_topfill)
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 3524
diff changeset
671 wp->w_topfill = n;
5934
e3d2b8d83bb3 updated for version 7.4.308
Bram Moolenaar <bram@vim.org>
parents: 5358
diff changeset
672 check_topfill(wp, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
673 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
674 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
675 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
676
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
677 static void
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
678 clear_diffin(diffin_T *din)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
679 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
680 if (din->din_fname == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
681 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
682 vim_free(din->din_mmfile.ptr);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
683 din->din_mmfile.ptr = NULL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
684 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
685 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
686 mch_remove(din->din_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
687 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
688
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
689 static void
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
690 clear_diffout(diffout_T *dout)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
691 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
692 if (dout->dout_fname == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
693 ga_clear_strings(&dout->dout_ga);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
694 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
695 mch_remove(dout->dout_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
696 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
697
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
698 /*
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
699 * Write buffer "buf" to a memory buffer.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
700 * Return FAIL for failure.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
701 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
702 static int
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
703 diff_write_buffer(buf_T *buf, diffin_T *din)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
704 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
705 linenr_T lnum;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
706 char_u *s;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
707 long len = 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
708 char_u *ptr;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
709
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
710 // xdiff requires one big block of memory with all the text.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
711 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
14766
7a11facdf74b patch 8.1.0395: compiler warning on 64-bit MS-Windows
Christian Brabandt <cb@256bit.org>
parents: 14764
diff changeset
712 len += (long)STRLEN(ml_get_buf(buf, lnum, FALSE)) + 1;
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
713 ptr = lalloc(len, TRUE);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
714 if (ptr == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
715 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
716 // Allocating memory failed. This can happen, because we try to read
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
717 // the whole buffer text into memory. Set the failed flag, the diff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
718 // will be retried with external diff. The flag is never reset.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
719 buf->b_diff_failed = TRUE;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
720 if (p_verbose > 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
721 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
722 verbose_enter();
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
723 smsg(_("Not enough memory to use internal diff for buffer \"%s\""),
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
724 buf->b_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
725 verbose_leave();
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
726 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
727 return FAIL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
728 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
729 din->din_mmfile.ptr = (char *)ptr;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
730 din->din_mmfile.size = len;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
731
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
732 len = 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
733 for (lnum = 1; lnum <= buf->b_ml.ml_line_count; ++lnum)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
734 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
735 for (s = ml_get_buf(buf, lnum, FALSE); *s != NUL; )
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
736 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
737 if (diff_flags & DIFF_ICASE)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
738 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
739 int c;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
740 int orig_len;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
741 char_u cbuf[MB_MAXBYTES + 1];
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
742
15595
1ec942f1b648 patch 8.1.0805: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents: 15490
diff changeset
743 // xdiff doesn't support ignoring case, fold-case the text.
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
744 c = PTR2CHAR(s);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
745 c = enc_utf8 ? utf_fold(c) : MB_TOLOWER(c);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
746 orig_len = MB_PTR2LEN(s);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
747 if (mb_char2bytes(c, cbuf) != orig_len)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
748 // TODO: handle byte length difference
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
749 mch_memmove(ptr + len, s, orig_len);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
750 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
751 mch_memmove(ptr + len, cbuf, orig_len);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
752
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
753 s += orig_len;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
754 len += orig_len;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
755 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
756 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
757 ptr[len++] = *s++;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
758 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
759 ptr[len++] = NL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
760 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
761 return OK;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
762 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
763
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
764 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
765 * Write buffer "buf" to file or memory buffer.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
766 * Return FAIL for failure.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
767 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
768 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
769 diff_write(buf_T *buf, diffin_T *din)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
770 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
771 int r;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
772 char_u *save_ff;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
773
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
774 if (din->din_fname == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
775 return diff_write_buffer(buf, din);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
776
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
777 // Always use 'fileformat' set to "unix".
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
778 save_ff = buf->b_p_ff;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
779 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
780 r = buf_write(buf, din->din_fname, NULL,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
781 (linenr_T)1, buf->b_ml.ml_line_count,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
782 NULL, FALSE, FALSE, FALSE, TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
783 free_string_option(buf->b_p_ff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
784 buf->b_p_ff = save_ff;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
785 return r;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
786 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
787
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
788 /*
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
789 * Update the diffs for all buffers involved.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
790 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
791 static void
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
792 diff_try_update(
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
793 diffio_T *dio,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
794 int idx_orig,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
795 exarg_T *eap) // "eap" can be NULL
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
796 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
797 buf_T *buf;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
798 int idx_new;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
799
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
800 if (dio->dio_internal)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
801 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
802 ga_init2(&dio->dio_diff.dout_ga, sizeof(char *), 1000);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
803 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
804 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
805 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
806 // We need three temp file names.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
807 dio->dio_orig.din_fname = vim_tempname('o', TRUE);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
808 dio->dio_new.din_fname = vim_tempname('n', TRUE);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
809 dio->dio_diff.dout_fname = vim_tempname('d', TRUE);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
810 if (dio->dio_orig.din_fname == NULL
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
811 || dio->dio_new.din_fname == NULL
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
812 || dio->dio_diff.dout_fname == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
813 goto theend;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
814 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
815
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
816 // Check external diff is actually working.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
817 if (!dio->dio_internal && check_external_diff(dio) == FAIL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
818 goto theend;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
819
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
820 // :diffupdate!
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
821 if (eap != NULL && eap->forceit)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
822 for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
823 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
824 buf = curtab->tp_diffbuf[idx_new];
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
825 if (buf_valid(buf))
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
826 buf_check_timestamp(buf, FALSE);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
827 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
828
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
829 // Write the first buffer to a tempfile or mmfile_t.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
830 buf = curtab->tp_diffbuf[idx_orig];
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
831 if (diff_write(buf, &dio->dio_orig) == FAIL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
832 goto theend;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
833
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
834 // Make a difference between the first buffer and every other.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
835 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
836 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
837 buf = curtab->tp_diffbuf[idx_new];
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
838 if (buf == NULL || buf->b_ml.ml_mfp == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
839 continue; // skip buffer that isn't loaded
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
840
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
841 // Write the other buffer and diff with the first one.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
842 if (diff_write(buf, &dio->dio_new) == FAIL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
843 continue;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
844 if (diff_file(dio) == FAIL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
845 continue;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
846
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
847 // Read the diff output and add each entry to the diff list.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
848 diff_read(idx_orig, idx_new, &dio->dio_diff);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
849
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
850 clear_diffin(&dio->dio_new);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
851 clear_diffout(&dio->dio_diff);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
852 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
853 clear_diffin(&dio->dio_orig);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
854
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
855 theend:
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
856 vim_free(dio->dio_orig.din_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
857 vim_free(dio->dio_new.din_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
858 vim_free(dio->dio_diff.dout_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
859 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
860
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
861 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
862 * Return TRUE if the options are set to use the internal diff library.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
863 * Note that if the internal diff failed for one of the buffers, the external
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
864 * diff will be used anyway.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
865 */
14764
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly
Christian Brabandt <cb@256bit.org>
parents: 14762
diff changeset
866 int
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
867 diff_internal(void)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
868 {
15971
ced614446eaa patch 8.1.0991: cannot build with a mix of features
Bram Moolenaar <Bram@vim.org>
parents: 15900
diff changeset
869 return (diff_flags & DIFF_INTERNAL) != 0
ced614446eaa patch 8.1.0991: cannot build with a mix of features
Bram Moolenaar <Bram@vim.org>
parents: 15900
diff changeset
870 #ifdef FEAT_EVAL
ced614446eaa patch 8.1.0991: cannot build with a mix of features
Bram Moolenaar <Bram@vim.org>
parents: 15900
diff changeset
871 && *p_dex == NUL
ced614446eaa patch 8.1.0991: cannot build with a mix of features
Bram Moolenaar <Bram@vim.org>
parents: 15900
diff changeset
872 #endif
ced614446eaa patch 8.1.0991: cannot build with a mix of features
Bram Moolenaar <Bram@vim.org>
parents: 15900
diff changeset
873 ;
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
874 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
875
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
876 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
877 * Return TRUE if the internal diff failed for one of the diff buffers.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
878 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
879 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
880 diff_internal_failed(void)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
881 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
882 int idx;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
883
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
884 // Only need to do something when there is another buffer.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
885 for (idx = 0; idx < DB_COUNT; ++idx)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
886 if (curtab->tp_diffbuf[idx] != NULL
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
887 && curtab->tp_diffbuf[idx]->b_diff_failed)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
888 return TRUE;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
889 return FALSE;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
890 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
891
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
892 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
893 * Completely update the diffs for the buffers involved.
14764
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly
Christian Brabandt <cb@256bit.org>
parents: 14762
diff changeset
894 * When using the external "diff" command the buffers are written to a file,
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly
Christian Brabandt <cb@256bit.org>
parents: 14762
diff changeset
895 * also for unmodified buffers (the file could have been produced by
f562b9fbd0d3 patch 8.1.0394: diffs are not always updated correctly
Christian Brabandt <cb@256bit.org>
parents: 14762
diff changeset
896 * autocommands, e.g. the netrw plugin).
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
897 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
898 void
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
899 ex_diffupdate(exarg_T *eap) // "eap" can be NULL
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
900 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
901 int idx_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
902 int idx_new;
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
903 diffio_T diffio;
14780
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
904 int had_diffs = curtab->tp_first_diff != NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
905
14776
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget
Christian Brabandt <cb@256bit.org>
parents: 14770
diff changeset
906 if (diff_busy)
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget
Christian Brabandt <cb@256bit.org>
parents: 14770
diff changeset
907 {
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget
Christian Brabandt <cb@256bit.org>
parents: 14770
diff changeset
908 diff_need_update = TRUE;
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget
Christian Brabandt <cb@256bit.org>
parents: 14770
diff changeset
909 return;
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget
Christian Brabandt <cb@256bit.org>
parents: 14770
diff changeset
910 }
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget
Christian Brabandt <cb@256bit.org>
parents: 14770
diff changeset
911
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
912 // Delete all diffblocks.
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
913 diff_clear(curtab);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
914 curtab->tp_diff_invalid = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
915
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
916 // Use the first buffer as the original text.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
917 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
918 if (curtab->tp_diffbuf[idx_orig] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
919 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
920 if (idx_orig == DB_COUNT)
14780
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
921 goto theend;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
922
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
923 // Only need to do something when there is another buffer.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
924 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
925 if (curtab->tp_diffbuf[idx_new] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
926 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
927 if (idx_new == DB_COUNT)
14780
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
928 goto theend;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
929
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
930 // Only use the internal method if it did not fail for one of the buffers.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
931 vim_memset(&diffio, 0, sizeof(diffio));
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
932 diffio.dio_internal = diff_internal() && !diff_internal_failed();
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
933
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
934 diff_try_update(&diffio, idx_orig, eap);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
935 if (diffio.dio_internal && diff_internal_failed())
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
936 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
937 // Internal diff failed, use external diff instead.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
938 vim_memset(&diffio, 0, sizeof(diffio));
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
939 diff_try_update(&diffio, idx_orig, eap);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
940 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
941
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
942 // force updating cursor position on screen
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
943 curwin->w_valid_cursor.lnum = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
944
14780
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
945 theend:
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
946 // A redraw is needed if there were diffs and they were cleared, or there
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
947 // are diffs now, which means they got updated.
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
948 if (had_diffs || curtab->tp_first_diff != NULL)
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
949 {
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
950 diff_redraw(TRUE);
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
951 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
952 }
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
953 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
954
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
955 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
956 * Do a quick test if "diff" really works. Otherwise it looks like there
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
957 * are no differences. Can't use the return value, it's non-zero when
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
958 * there are differences.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
959 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
960 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
961 check_external_diff(diffio_T *diffio)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
962 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
963 FILE *fd;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
964 int ok;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
965 int io_error = FALSE;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
966
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
967 // May try twice, first with "-a" and then without.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
968 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
969 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
970 ok = FALSE;
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
971 fd = mch_fopen((char *)diffio->dio_orig.din_fname, "w");
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
972 if (fd == NULL)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
973 io_error = TRUE;
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
974 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
975 {
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
976 if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
977 io_error = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
978 fclose(fd);
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
979 fd = mch_fopen((char *)diffio->dio_new.din_fname, "w");
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
980 if (fd == NULL)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
981 io_error = TRUE;
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
982 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
983 {
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
984 if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
985 io_error = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
986 fclose(fd);
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
987 fd = NULL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
988 if (diff_file(diffio) == OK)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
989 fd = mch_fopen((char *)diffio->dio_diff.dout_fname, "r");
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
990 if (fd == NULL)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
991 io_error = TRUE;
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
992 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
993 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
994 char_u linebuf[LBUFLEN];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
995
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
996 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
997 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
998 /* There must be a line that contains "1c1". */
15840
734b1928a5aa patch 8.1.0927: USE_CR is never defined
Bram Moolenaar <Bram@vim.org>
parents: 15595
diff changeset
999 if (vim_fgets(linebuf, LBUFLEN, fd))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1000 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1001 if (STRNCMP(linebuf, "1c1", 3) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1002 ok = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1003 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1004 fclose(fd);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1005 }
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1006 mch_remove(diffio->dio_diff.dout_fname);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1007 mch_remove(diffio->dio_new.din_fname);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1008 }
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1009 mch_remove(diffio->dio_orig.din_fname);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1010 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1011
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1012 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1013 /* When using 'diffexpr' break here. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1014 if (*p_dex != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1015 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1016 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1017
8212
05b88224cea1 commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents: 7817
diff changeset
1018 #if defined(MSWIN)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1019 /* If the "-a" argument works, also check if "--binary" works. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1020 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1021 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1022 diff_a_works = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1023 diff_bin_works = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1024 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1025 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1026 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1027 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1028 /* Tried --binary, but it failed. "-a" works though. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1029 diff_bin_works = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1030 ok = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1031 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1032 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1033
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1034 /* If we checked if "-a" works already, break here. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1035 if (diff_a_works != MAYBE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1036 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1037 diff_a_works = ok;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1038
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1039 /* If "-a" works break here, otherwise retry without "-a". */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1040 if (ok)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1041 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1042 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1043 if (!ok)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1044 {
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
1045 if (io_error)
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
1046 emsg(_("E810: Cannot read or write temp files"));
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
1047 emsg(_("E97: Cannot create diffs"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1048 diff_a_works = MAYBE;
8212
05b88224cea1 commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents: 7817
diff changeset
1049 #if defined(MSWIN)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1050 diff_bin_works = MAYBE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1051 #endif
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1052 return FAIL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1053 }
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1054 return OK;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1055 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1056
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1057 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1058 * Invoke the xdiff function.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1059 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1060 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1061 diff_file_internal(diffio_T *diffio)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1062 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1063 xpparam_t param;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1064 xdemitconf_t emit_cfg;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1065 xdemitcb_t emit_cb;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1066
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1067 vim_memset(&param, 0, sizeof(param));
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1068 vim_memset(&emit_cfg, 0, sizeof(emit_cfg));
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1069 vim_memset(&emit_cb, 0, sizeof(emit_cb));
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1070
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1071 param.flags = diff_algorithm;
3524
d8ce4a2eb44e updated for version 7.3.523
Bram Moolenaar <bram@vim.org>
parents: 2583
diff changeset
1072
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1073 if (diff_flags & DIFF_IWHITE)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1074 param.flags |= XDF_IGNORE_WHITESPACE_CHANGE;
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1075 if (diff_flags & DIFF_IWHITEALL)
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1076 param.flags |= XDF_IGNORE_WHITESPACE;
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1077 if (diff_flags & DIFF_IWHITEEOL)
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1078 param.flags |= XDF_IGNORE_WHITESPACE_AT_EOL;
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1079 if (diff_flags & DIFF_IBLANK)
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1080 param.flags |= XDF_IGNORE_BLANK_LINES;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1081
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1082 emit_cfg.ctxlen = 0; // don't need any diff_context here
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1083 emit_cb.priv = &diffio->dio_diff;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1084 emit_cb.outf = xdiff_out;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1085 if (xdl_diff(&diffio->dio_orig.din_mmfile,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1086 &diffio->dio_new.din_mmfile,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1087 &param, &emit_cfg, &emit_cb) < 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1088 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
1089 emsg(_("E960: Problem creating the internal diff"));
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1090 return FAIL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1091 }
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1092 return OK;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1093 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1094
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1095 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1096 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1097 * return OK or FAIL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1098 */
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1099 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1100 diff_file(diffio_T *dio)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1101 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1102 char_u *cmd;
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
1103 size_t len;
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1104 char_u *tmp_orig = dio->dio_orig.din_fname;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1105 char_u *tmp_new = dio->dio_new.din_fname;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1106 char_u *tmp_diff = dio->dio_diff.dout_fname;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1107
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1108 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1109 if (*p_dex != NUL)
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1110 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1111 // Use 'diffexpr' to generate the diff file.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1112 eval_diff(tmp_orig, tmp_new, tmp_diff);
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1113 return OK;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1114 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1115 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1116 #endif
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1117 // Use xdiff for generating the diff.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1118 if (dio->dio_internal)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1119 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1120 return diff_file_internal(dio);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1121 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1122 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1123 {
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
1124 len = STRLEN(tmp_orig) + STRLEN(tmp_new)
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
1125 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27;
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
1126 cmd = alloc((unsigned)len);
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1127 if (cmd == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1128 return FAIL;
193
eee3fa1b0197 updated for version 7.0058
vimboss
parents: 28
diff changeset
1129
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1130 // We don't want $DIFF_OPTIONS to get in the way.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1131 if (getenv("DIFF_OPTIONS"))
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1132 vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)"");
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1133
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1134 // Build the diff command and execute it. Always use -a, binary
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1135 // differences are of no use. Ignore errors, diff returns
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1136 // non-zero when differences have been found.
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1137 vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s%s%s%s %s",
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1138 diff_a_works == FALSE ? "" : "-a ",
8212
05b88224cea1 commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents: 7817
diff changeset
1139 #if defined(MSWIN)
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1140 diff_bin_works == TRUE ? "--binary " : "",
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1141 #else
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1142 "",
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1143 #endif
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1144 (diff_flags & DIFF_IWHITE) ? "-b " : "",
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1145 (diff_flags & DIFF_IWHITEALL) ? "-w " : "",
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1146 (diff_flags & DIFF_IWHITEEOL) ? "-Z " : "",
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1147 (diff_flags & DIFF_IBLANK) ? "-B " : "",
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1148 (diff_flags & DIFF_ICASE) ? "-i " : "",
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1149 tmp_orig, tmp_new);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1150 append_redir(cmd, (int)len, p_srr, tmp_diff);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1151 block_autocmds(); // avoid ShellCmdPost stuff
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1152 (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1153 unblock_autocmds();
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1154 vim_free(cmd);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1155 return OK;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1156 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1157 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1158
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1159 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1160 * Create a new version of a file from the current buffer and a diff file.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1161 * The buffer is written to a file, also for unmodified buffers (the file
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1162 * could have been produced by autocommands, e.g. the netrw plugin).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1163 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1164 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1165 ex_diffpatch(exarg_T *eap)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1166 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1167 char_u *tmp_orig; /* name of original temp file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1168 char_u *tmp_new; /* name of patched temp file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1169 char_u *buf = NULL;
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
1170 size_t buflen;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1171 win_T *old_curwin = curwin;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1172 char_u *newname = NULL; /* name of patched file buffer */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1173 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1174 char_u dirbuf[MAXPATHL];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1175 char_u *fullname = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1176 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1177 #ifdef FEAT_BROWSE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1178 char_u *browseFile = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1179 int browse_flag = cmdmod.browse;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1180 #endif
9387
f094d4085014 commit https://github.com/vim/vim/commit/8767f52fbfd4f053ce00a978227c95f1d7d323fe
Christian Brabandt <cb@256bit.org>
parents: 8368
diff changeset
1181 stat_T st;
11113
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents: 11109
diff changeset
1182 char_u *esc_name = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1183
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1184 #ifdef FEAT_BROWSE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1185 if (cmdmod.browse)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1186 {
28
726bdc53fa49 updated for version 7.0018
vimboss
parents: 16
diff changeset
1187 browseFile = do_browse(0, (char_u *)_("Patch file"),
13802
378f9f8e6d8f patch 8.0.1773: dialog messages are not translated
Christian Brabandt <cb@256bit.org>
parents: 13384
diff changeset
1188 eap->arg, NULL, NULL,
378f9f8e6d8f patch 8.0.1773: dialog messages are not translated
Christian Brabandt <cb@256bit.org>
parents: 13384
diff changeset
1189 (char_u *)_(BROWSE_FILTER_ALL_FILES), NULL);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1190 if (browseFile == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1191 return; /* operation cancelled */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1192 eap->arg = browseFile;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1193 cmdmod.browse = FALSE; /* don't let do_ecmd() browse again */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1194 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1195 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1196
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1197 /* We need two temp file names. */
6721
7347229a646a updated for version 7.4.684
Bram Moolenaar <bram@vim.org>
parents: 6314
diff changeset
1198 tmp_orig = vim_tempname('o', FALSE);
7347229a646a updated for version 7.4.684
Bram Moolenaar <bram@vim.org>
parents: 6314
diff changeset
1199 tmp_new = vim_tempname('n', FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1200 if (tmp_orig == NULL || tmp_new == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1201 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1202
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1203 /* Write the current buffer to "tmp_orig". */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1204 if (buf_write(curbuf, tmp_orig, NULL,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1205 (linenr_T)1, curbuf->b_ml.ml_line_count,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1206 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1207 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1208
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1209 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1210 /* Get the absolute path of the patchfile, changing directory below. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1211 fullname = FullName_save(eap->arg, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1212 #endif
11113
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents: 11109
diff changeset
1213 esc_name = vim_strsave_shellescape(
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1214 # ifdef UNIX
11113
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents: 11109
diff changeset
1215 fullname != NULL ? fullname :
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1216 # endif
11113
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents: 11109
diff changeset
1217 eap->arg, TRUE, TRUE);
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents: 11109
diff changeset
1218 if (esc_name == NULL)
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents: 11109
diff changeset
1219 goto theend;
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents: 11109
diff changeset
1220 buflen = STRLEN(tmp_orig) + STRLEN(esc_name) + STRLEN(tmp_new) + 16;
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
1221 buf = alloc((unsigned)buflen);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1222 if (buf == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1223 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1224
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1225 #ifdef UNIX
1788
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
1226 /* Temporarily chdir to /tmp, to avoid patching files in the current
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1227 * directory when the patch file contains more than one patch. When we
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1228 * have our own temp dir use that instead, it will be cleaned up when we
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1229 * exit (any .rej files created). Don't change directory if we can't
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1230 * return to the current. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1231 if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1232 dirbuf[0] = NUL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1233 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1234 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1235 # ifdef TEMPDIRNAMES
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1236 if (vim_tempdir != NULL)
14730
193471015e1a patch 8.1.0377: xdiff doesn't use the Vim memory allocation functions
Christian Brabandt <cb@256bit.org>
parents: 14726
diff changeset
1237 vim_ignored = mch_chdir((char *)vim_tempdir);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1238 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1239 # endif
14730
193471015e1a patch 8.1.0377: xdiff doesn't use the Vim memory allocation functions
Christian Brabandt <cb@256bit.org>
parents: 14726
diff changeset
1240 vim_ignored = mch_chdir("/tmp");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1241 shorten_fnames(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1242 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1243 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1244
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1245 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1246 if (*p_pex != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1247 /* Use 'patchexpr' to generate the new file. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1248 eval_patch(tmp_orig,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1249 # ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1250 fullname != NULL ? fullname :
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1251 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1252 eap->arg, tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1253 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1254 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1255 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1256 /* Build the patch command and execute it. Ignore errors. Switch to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1257 * cooked mode to allow the user to respond to prompts. */
11113
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents: 11109
diff changeset
1258 vim_snprintf((char *)buf, buflen, "patch -o %s %s < %s",
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents: 11109
diff changeset
1259 tmp_new, tmp_orig, esc_name);
1410
cdd82acd75b4 updated for version 7.1-125
vimboss
parents: 1075
diff changeset
1260 block_autocmds(); /* Avoid ShellCmdPost stuff */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1261 (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED);
1410
cdd82acd75b4 updated for version 7.1-125
vimboss
parents: 1075
diff changeset
1262 unblock_autocmds();
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1263 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1264
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1265 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1266 if (dirbuf[0] != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1267 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1268 if (mch_chdir((char *)dirbuf) != 0)
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
1269 emsg(_(e_prev_dir));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1270 shorten_fnames(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1271 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1272 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1273
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1274 /* patch probably has written over the screen */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1275 redraw_later(CLEAR);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1276
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1277 /* Delete any .orig or .rej file created. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1278 STRCPY(buf, tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1279 STRCAT(buf, ".orig");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1280 mch_remove(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1281 STRCPY(buf, tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1282 STRCAT(buf, ".rej");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1283 mch_remove(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1284
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1285 /* Only continue if the output file was created. */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1286 if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
1287 emsg(_("E816: Cannot read patch output"));
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1288 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1289 {
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1290 if (curbuf->b_fname != NULL)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1291 {
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1292 newname = vim_strnsave(curbuf->b_fname,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1293 (int)(STRLEN(curbuf->b_fname) + 4));
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1294 if (newname != NULL)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1295 STRCAT(newname, ".new");
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1296 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1297
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1298 #ifdef FEAT_GUI
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1299 need_mouse_correct = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1300 #endif
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1301 /* don't use a new tab page, each tab page has its own diffs */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1302 cmdmod.tab = 0;
682
f1b013312711 updated for version 7.0205
vimboss
parents: 681
diff changeset
1303
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1304 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1305 {
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1306 /* Pretend it was a ":split fname" command */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1307 eap->cmdidx = CMD_split;
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1308 eap->arg = tmp_new;
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1309 do_exedit(eap, old_curwin);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1310
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1311 /* check that split worked and editing tmp_new */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1312 if (curwin != old_curwin && win_valid(old_curwin))
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1313 {
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1314 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1315 diff_win_options(curwin, TRUE);
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1316 diff_win_options(old_curwin, TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1317
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1318 if (newname != NULL)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1319 {
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1320 /* do a ":file filename.new" on the patched buffer */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1321 eap->arg = newname;
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1322 ex_file(eap);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1323
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1324 /* Do filetype detection with the new name. */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1325 if (au_has_group((char_u *)"filetypedetect"))
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1326 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1327 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1328 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1329 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1330 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1331
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1332 theend:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1333 if (tmp_orig != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1334 mch_remove(tmp_orig);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1335 vim_free(tmp_orig);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1336 if (tmp_new != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1337 mch_remove(tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1338 vim_free(tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1339 vim_free(newname);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1340 vim_free(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1341 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1342 vim_free(fullname);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1343 #endif
11113
081ed9efb5c0 patch 8.0.0444: diffpatch fails when the file name has a quote
Christian Brabandt <cb@256bit.org>
parents: 11109
diff changeset
1344 vim_free(esc_name);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1345 #ifdef FEAT_BROWSE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1346 vim_free(browseFile);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1347 cmdmod.browse = browse_flag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1348 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1349 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1350
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1351 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1352 * Split the window and edit another file, setting options to show the diffs.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1353 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1354 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1355 ex_diffsplit(exarg_T *eap)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1356 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1357 win_T *old_curwin = curwin;
9487
69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents: 9387
diff changeset
1358 bufref_T old_curbuf;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1359
9487
69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents: 9387
diff changeset
1360 set_bufref(&old_curbuf, curbuf);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1361 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1362 need_mouse_correct = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1363 #endif
10013
942d40a92be6 commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents: 10005
diff changeset
1364 /* Need to compute w_fraction when no redraw happened yet. */
942d40a92be6 commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents: 10005
diff changeset
1365 validate_cursor();
942d40a92be6 commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents: 10005
diff changeset
1366 set_fraction(curwin);
942d40a92be6 commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents: 10005
diff changeset
1367
682
f1b013312711 updated for version 7.0205
vimboss
parents: 681
diff changeset
1368 /* don't use a new tab page, each tab page has its own diffs */
f1b013312711 updated for version 7.0205
vimboss
parents: 681
diff changeset
1369 cmdmod.tab = 0;
f1b013312711 updated for version 7.0205
vimboss
parents: 681
diff changeset
1370
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1371 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1372 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1373 /* Pretend it was a ":split fname" command */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1374 eap->cmdidx = CMD_split;
449
3709cf52b9b5 updated for version 7.0119
vimboss
parents: 358
diff changeset
1375 curwin->w_p_diff = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1376 do_exedit(eap, old_curwin);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1377
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1378 if (curwin != old_curwin) /* split must have worked */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1379 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1380 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1381 diff_win_options(curwin, TRUE);
7338
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1382 if (win_valid(old_curwin))
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1383 {
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1384 diff_win_options(old_curwin, TRUE);
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1385
9487
69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents: 9387
diff changeset
1386 if (bufref_valid(&old_curbuf))
7338
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1387 /* Move the cursor position to that of the old window. */
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1388 curwin->w_cursor.lnum = diff_get_corresponding_line(
10295
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
1389 old_curbuf.br_buf, old_curwin->w_cursor.lnum);
7338
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1390 }
10013
942d40a92be6 commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents: 10005
diff changeset
1391 /* Now that lines are folded scroll to show the cursor at the same
942d40a92be6 commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents: 10005
diff changeset
1392 * relative position. */
942d40a92be6 commit https://github.com/vim/vim/commit/46328f9a1cc8047d1e05095bc9f531038c5a4028
Christian Brabandt <cb@256bit.org>
parents: 10005
diff changeset
1393 scroll_to_fraction(curwin, curwin->w_height);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1394 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1395 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1396 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1397
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1398 /*
4352
04736b4030ec updated for version 7.3.925
Bram Moolenaar <bram@vim.org>
parents: 4236
diff changeset
1399 * Set options to show diffs for the current window.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1400 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1401 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1402 ex_diffthis(exarg_T *eap UNUSED)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1403 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1404 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1405 diff_win_options(curwin, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1406 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1407
11707
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1408 static void
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1409 set_diff_option(win_T *wp, int value)
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1410 {
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1411 win_T *old_curwin = curwin;
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1412
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1413 curwin = wp;
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1414 curbuf = curwin->w_buffer;
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1415 ++curbuf_lock;
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1416 set_option_value((char_u *)"diff", (long)value, NULL, OPT_LOCAL);
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1417 --curbuf_lock;
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1418 curwin = old_curwin;
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1419 curbuf = curwin->w_buffer;
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1420 }
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1421
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1422 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1423 * Set options in window "wp" for diff mode.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1424 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1425 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1426 diff_win_options(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1427 win_T *wp,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1428 int addbuf) /* Add buffer to diff. */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1429 {
2086
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1430 # ifdef FEAT_FOLDING
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1431 win_T *old_curwin = curwin;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1432
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1433 /* close the manually opened folds */
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1434 curwin = wp;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1435 newFoldLevel();
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1436 curwin = old_curwin;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1437 # endif
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1438
2583
7c2e6ba1d702 updated for version 7.3.008
Bram Moolenaar <bram@vim.org>
parents: 2445
diff changeset
1439 /* Use 'scrollbind' and 'cursorbind' when available */
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1440 if (!wp->w_p_diff)
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1441 wp->w_p_scb_save = wp->w_p_scb;
2583
7c2e6ba1d702 updated for version 7.3.008
Bram Moolenaar <bram@vim.org>
parents: 2445
diff changeset
1442 wp->w_p_scb = TRUE;
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1443 if (!wp->w_p_diff)
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1444 wp->w_p_crb_save = wp->w_p_crb;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
1445 wp->w_p_crb = TRUE;
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1446 if (!wp->w_p_diff)
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1447 wp->w_p_wrap_save = wp->w_p_wrap;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1448 wp->w_p_wrap = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1449 # ifdef FEAT_FOLDING
2086
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1450 curwin = wp;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1451 curbuf = curwin->w_buffer;
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1452 if (!wp->w_p_diff)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1453 {
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1454 if (wp->w_p_diff_saved)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1455 free_string_option(wp->w_p_fdm_save);
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1456 wp->w_p_fdm_save = vim_strsave(wp->w_p_fdm);
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1457 }
2086
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1458 set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff",
694
07d199fe02ed updated for version 7.0209
vimboss
parents: 682
diff changeset
1459 OPT_LOCAL|OPT_FREE, 0);
2086
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1460 curwin = old_curwin;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1461 curbuf = curwin->w_buffer;
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1462 if (!wp->w_p_diff)
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1463 {
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1464 wp->w_p_fdc_save = wp->w_p_fdc;
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1465 wp->w_p_fen_save = wp->w_p_fen;
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1466 wp->w_p_fdl_save = wp->w_p_fdl;
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1467 }
2086
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1468 wp->w_p_fdc = diff_foldcolumn;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1469 wp->w_p_fen = TRUE;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1470 wp->w_p_fdl = 0;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1471 foldUpdateAll(wp);
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1472 /* make sure topline is not halfway a fold */
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1473 changed_window_setting_win(wp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1474 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1475 if (vim_strchr(p_sbo, 'h') == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1476 do_cmdline_cmd((char_u *)"set sbo+=hor");
11707
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1477 /* Save the current values, to be restored in ex_diffoff(). */
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1478 wp->w_p_diff_saved = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1479
11707
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1480 set_diff_option(wp, TRUE);
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1481
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1482 if (addbuf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1483 diff_buf_add(wp->w_buffer);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1484 redraw_win_later(wp, NOT_VALID);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1485 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1486
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1487 /*
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1488 * Set options not to show diffs. For the current window or all windows.
671
83a006f81bac updated for version 7.0199
vimboss
parents: 648
diff changeset
1489 * Only in the current tab page.
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1490 */
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1491 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1492 ex_diffoff(exarg_T *eap)
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1493 {
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1494 win_T *wp;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1495 int diffwin = FALSE;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1496
9649
fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents: 9487
diff changeset
1497 FOR_ALL_WINDOWS(wp)
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1498 {
5358
b21b5dcdca21 updated for version 7.4.031
Bram Moolenaar <bram@vim.org>
parents: 5200
diff changeset
1499 if (eap->forceit ? wp->w_p_diff : wp == curwin)
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1500 {
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1501 /* Set 'diff' off. If option values were saved in
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1502 * diff_win_options(), restore the ones whose settings seem to have
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1503 * been left over from diff mode. */
11707
1395a3b6978d patch 8.0.0736: OptionSet not triggered when entering diff mode
Christian Brabandt <cb@256bit.org>
parents: 11430
diff changeset
1504 set_diff_option(wp, FALSE);
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1505
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1506 if (wp->w_p_diff_saved)
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1507 {
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1508
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1509 if (wp->w_p_scb)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1510 wp->w_p_scb = wp->w_p_scb_save;
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1511 if (wp->w_p_crb)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1512 wp->w_p_crb = wp->w_p_crb_save;
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1513 if (!wp->w_p_wrap)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1514 wp->w_p_wrap = wp->w_p_wrap_save;
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1515 #ifdef FEAT_FOLDING
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1516 free_string_option(wp->w_p_fdm);
11430
eba1a8c6e21d patch 8.0.0599: diff mode is insufficiently tested
Christian Brabandt <cb@256bit.org>
parents: 11129
diff changeset
1517 wp->w_p_fdm = vim_strsave(
eba1a8c6e21d patch 8.0.0599: diff mode is insufficiently tested
Christian Brabandt <cb@256bit.org>
parents: 11129
diff changeset
1518 *wp->w_p_fdm_save ? wp->w_p_fdm_save : (char_u*)"manual");
5200
b3ff17862b4c updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents: 5102
diff changeset
1519
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1520 if (wp->w_p_fdc == diff_foldcolumn)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1521 wp->w_p_fdc = wp->w_p_fdc_save;
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1522 if (wp->w_p_fdl == 0)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1523 wp->w_p_fdl = wp->w_p_fdl_save;
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1524
5200
b3ff17862b4c updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents: 5102
diff changeset
1525 /* Only restore 'foldenable' when 'foldmethod' is not
b3ff17862b4c updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents: 5102
diff changeset
1526 * "manual", otherwise we continue to show the diff folds. */
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1527 if (wp->w_p_fen)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1528 wp->w_p_fen = foldmethodIsManual(wp) ? FALSE
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1529 : wp->w_p_fen_save;
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1530
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1531 foldUpdateAll(wp);
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1532 #endif
5200
b3ff17862b4c updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents: 5102
diff changeset
1533 }
10005
4b4ba6589a98 commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents: 9719
diff changeset
1534 /* remove filler lines */
4b4ba6589a98 commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents: 9719
diff changeset
1535 wp->w_topfill = 0;
4b4ba6589a98 commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents: 9719
diff changeset
1536
4b4ba6589a98 commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents: 9719
diff changeset
1537 /* make sure topline is not halfway a fold and cursor is
4b4ba6589a98 commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents: 9719
diff changeset
1538 * invalidated */
4b4ba6589a98 commit https://github.com/vim/vim/commit/e67d546f3c691139e6d3d33f36724d98aec04c14
Christian Brabandt <cb@256bit.org>
parents: 9719
diff changeset
1539 changed_window_setting_win(wp);
5200
b3ff17862b4c updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents: 5102
diff changeset
1540
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1541 /* Note: 'sbo' is not restored, it's a global option. */
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1542 diff_buf_adjust(wp);
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1543 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1544 diffwin |= wp->w_p_diff;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1545 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1546
10821
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
1547 /* Also remove hidden buffers from the list. */
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
1548 if (eap->forceit)
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
1549 diff_buf_clear();
d9e48fb5142f patch 8.0.0300: cannot stop diffing hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 10295
diff changeset
1550
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1551 /* Remove "hor" from from 'scrollopt' if there are no diff windows left. */
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1552 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1553 do_cmdline_cmd((char_u *)"set sbo-=hor");
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1554 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1555
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1556 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1557 * Read the diff output and add each entry to the diff list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1558 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1559 static void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1560 diff_read(
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1561 int idx_orig, // idx of original file
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1562 int idx_new, // idx of new file
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1563 diffout_T *dout) // diff output
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1564 {
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1565 FILE *fd = NULL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1566 int line_idx = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1567 diff_T *dprev = NULL;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1568 diff_T *dp = curtab->tp_first_diff;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1569 diff_T *dn, *dpl;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1570 char_u linebuf[LBUFLEN]; /* only need to hold the diff line */
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1571 char_u *line;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1572 long off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1573 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1574 linenr_T lnum_orig, lnum_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1575 long count_orig, count_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1576 int notset = TRUE; /* block "*dp" not set yet */
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1577 enum {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1578 DIFF_ED,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1579 DIFF_UNIFIED,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1580 DIFF_NONE
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1581 } diffstyle = DIFF_NONE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1582
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1583 if (dout->dout_fname == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1584 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1585 diffstyle = DIFF_UNIFIED;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1586 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1587 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1588 {
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1589 fd = mch_fopen((char *)dout->dout_fname, "r");
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1590 if (fd == NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1591 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
1592 emsg(_("E98: Cannot read diff output"));
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1593 return;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1594 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1595 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1596
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1597 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1598 {
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1599 if (fd == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1600 {
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1601 if (line_idx >= dout->dout_ga.ga_len)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1602 break; // did last line
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1603 line = ((char_u **)dout->dout_ga.ga_data)[line_idx++];
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1604 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1605 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1606 {
15840
734b1928a5aa patch 8.1.0927: USE_CR is never defined
Bram Moolenaar <Bram@vim.org>
parents: 15595
diff changeset
1607 if (vim_fgets(linebuf, LBUFLEN, fd))
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1608 break; // end of file
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1609 line = linebuf;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1610 }
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1611
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1612 if (diffstyle == DIFF_NONE)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1613 {
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1614 // Determine diff style.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1615 // ed like diff looks like this:
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1616 // {first}[,{last}]c{first}[,{last}]
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1617 // {first}a{first}[,{last}]
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1618 // {first}[,{last}]d{first}
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1619 //
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1620 // unified diff looks like this:
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1621 // --- file1 2018-03-20 13:23:35.783153140 +0100
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1622 // +++ file2 2018-03-20 13:23:41.183156066 +0100
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1623 // @@ -1,3 +1,5 @@
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1624 if (isdigit(*line))
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1625 diffstyle = DIFF_ED;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1626 else if ((STRNCMP(line, "@@ ", 3) == 0))
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1627 diffstyle = DIFF_UNIFIED;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1628 else if ((STRNCMP(line, "--- ", 4) == 0)
15840
734b1928a5aa patch 8.1.0927: USE_CR is never defined
Bram Moolenaar <Bram@vim.org>
parents: 15595
diff changeset
1629 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1630 && (STRNCMP(line, "+++ ", 4) == 0)
15840
734b1928a5aa patch 8.1.0927: USE_CR is never defined
Bram Moolenaar <Bram@vim.org>
parents: 15595
diff changeset
1631 && (vim_fgets(linebuf, LBUFLEN, fd) == 0)
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1632 && (STRNCMP(line, "@@ ", 3) == 0))
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1633 diffstyle = DIFF_UNIFIED;
14726
655f00c29c58 patch 8.1.0375: cannot use diff mode with Cygwin diff.exe
Christian Brabandt <cb@256bit.org>
parents: 14716
diff changeset
1634 else
655f00c29c58 patch 8.1.0375: cannot use diff mode with Cygwin diff.exe
Christian Brabandt <cb@256bit.org>
parents: 14716
diff changeset
1635 // Format not recognized yet, skip over this line. Cygwin diff
655f00c29c58 patch 8.1.0375: cannot use diff mode with Cygwin diff.exe
Christian Brabandt <cb@256bit.org>
parents: 14716
diff changeset
1636 // may put a warning at the start of the file.
655f00c29c58 patch 8.1.0375: cannot use diff mode with Cygwin diff.exe
Christian Brabandt <cb@256bit.org>
parents: 14716
diff changeset
1637 continue;
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1638 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1639
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1640 if (diffstyle == DIFF_ED)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1641 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1642 if (!isdigit(*line))
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1643 continue; // not the start of a diff block
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1644 if (parse_diff_ed(line, &lnum_orig, &count_orig,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1645 &lnum_new, &count_new) == FAIL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1646 continue;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1647 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1648 else if (diffstyle == DIFF_UNIFIED)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1649 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1650 if (STRNCMP(line, "@@ ", 3) != 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1651 continue; // not the start of a diff block
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1652 if (parse_diff_unified(line, &lnum_orig, &count_orig,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1653 &lnum_new, &count_new) == FAIL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1654 continue;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1655 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1656 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1657 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
1658 emsg(_("E959: Invalid diff format."));
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1659 break;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1660 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1661
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1662 // Go over blocks before the change, for which orig and new are equal.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1663 // Copy blocks from orig to new.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1664 while (dp != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1665 && lnum_orig > dp->df_lnum[idx_orig] + dp->df_count[idx_orig])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1666 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1667 if (notset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1668 diff_copy_entry(dprev, dp, idx_orig, idx_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1669 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1670 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1671 notset = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1672 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1673
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1674 if (dp != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1675 && lnum_orig <= dp->df_lnum[idx_orig] + dp->df_count[idx_orig]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1676 && lnum_orig + count_orig >= dp->df_lnum[idx_orig])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1677 {
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1678 // New block overlaps with existing block(s).
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1679 // First find last block that overlaps.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1680 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1681 if (lnum_orig + count_orig < dpl->df_next->df_lnum[idx_orig])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1682 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1683
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1684 // If the newly found block starts before the old one, set the
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1685 // start back a number of lines.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1686 off = dp->df_lnum[idx_orig] - lnum_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1687 if (off > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1688 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1689 for (i = idx_orig; i < idx_new; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1690 if (curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1691 dp->df_lnum[i] -= off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1692 dp->df_lnum[idx_new] = lnum_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1693 dp->df_count[idx_new] = count_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1694 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1695 else if (notset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1696 {
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1697 // new block inside existing one, adjust new block
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1698 dp->df_lnum[idx_new] = lnum_new + off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1699 dp->df_count[idx_new] = count_new - off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1700 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1701 else
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1702 // second overlap of new block with existing block
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1703 dp->df_count[idx_new] += count_new - count_orig
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1704 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1705 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1706
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1707 // Adjust the size of the block to include all the lines to the
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1708 // end of the existing block or the new diff, whatever ends last.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1709 off = (lnum_orig + count_orig)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1710 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1711 if (off < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1712 {
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1713 // new change ends in existing block, adjust the end if not
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1714 // done already
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1715 if (notset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1716 dp->df_count[idx_new] += -off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1717 off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1718 }
1428
912b18745def updated for version 7.1-143
vimboss
parents: 1410
diff changeset
1719 for (i = idx_orig; i < idx_new; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1720 if (curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1721 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1722 - dp->df_lnum[i] + off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1723
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1724 // Delete the diff blocks that have been merged into one.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1725 dn = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1726 dp->df_next = dpl->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1727 while (dn != dp->df_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1728 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1729 dpl = dn->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1730 vim_free(dn);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1731 dn = dpl;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1732 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1733 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1734 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1735 {
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1736 // Allocate a new diffblock.
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1737 dp = diff_alloc_new(curtab, dprev, dp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1738 if (dp == NULL)
840
2c885fab04e3 updated for version 7.0e06
vimboss
parents: 835
diff changeset
1739 goto done;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1740
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1741 dp->df_lnum[idx_orig] = lnum_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1742 dp->df_count[idx_orig] = count_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1743 dp->df_lnum[idx_new] = lnum_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1744 dp->df_count[idx_new] = count_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1745
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1746 // Set values for other buffers, these must be equal to the
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1747 // original buffer, otherwise there would have been a change
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1748 // already.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1749 for (i = idx_orig + 1; i < idx_new; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1750 if (curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1751 diff_copy_entry(dprev, dp, idx_orig, i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1752 }
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1753 notset = FALSE; // "*dp" has been set
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1754 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1755
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1756 // for remaining diff blocks orig and new are equal
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1757 while (dp != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1758 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1759 if (notset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1760 diff_copy_entry(dprev, dp, idx_orig, idx_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1761 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1762 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1763 notset = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1764 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1765
840
2c885fab04e3 updated for version 7.0e06
vimboss
parents: 835
diff changeset
1766 done:
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1767 if (fd != NULL)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
1768 fclose(fd);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1769 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1770
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1771 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1772 * Copy an entry at "dp" from "idx_orig" to "idx_new".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1773 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1774 static void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1775 diff_copy_entry(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1776 diff_T *dprev,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1777 diff_T *dp,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1778 int idx_orig,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1779 int idx_new)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1780 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1781 long off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1782
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1783 if (dprev == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1784 off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1785 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1786 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1787 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1788 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1789 dp->df_count[idx_new] = dp->df_count[idx_orig];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1790 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1791
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1792 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1793 * Clear the list of diffblocks for tab page "tp".
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1794 */
358
e111db373ca4 updated for version 7.0093
vimboss
parents: 193
diff changeset
1795 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1796 diff_clear(tabpage_T *tp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1797 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1798 diff_T *p, *next_p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1799
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1800 for (p = tp->tp_first_diff; p != NULL; p = next_p)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1801 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1802 next_p = p->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1803 vim_free(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1804 }
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1805 tp->tp_first_diff = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1806 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1807
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1808 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1809 * Check diff status for line "lnum" in buffer "buf":
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1810 * Returns 0 for nothing special
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1811 * Returns -1 for a line that should be highlighted as changed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1812 * Returns -2 for a line that should be highlighted as added/deleted.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1813 * Returns > 0 for inserting that many filler lines above it (never happens
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1814 * when 'diffopt' doesn't contain "filler").
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1815 * This should only be used for windows where 'diff' is set.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1816 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1817 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1818 diff_check(win_T *wp, linenr_T lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1819 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1820 int idx; /* index in tp_diffbuf[] for this buffer */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1821 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1822 int maxcount;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1823 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1824 buf_T *buf = wp->w_buffer;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1825 int cmp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1826
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1827 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1828 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1829
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1830 if (curtab->tp_first_diff == NULL || !wp->w_p_diff) /* no diffs at all */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1831 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1832
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1833 /* safety check: "lnum" must be a buffer line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1834 if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1835 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1836
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1837 idx = diff_buf_idx(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1838 if (idx == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1839 return 0; /* no diffs for buffer "buf" */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1840
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1841 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1842 /* A closed fold never has filler lines. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1843 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1844 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1845 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1846
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1847 /* search for a change that includes "lnum" in the list of diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1848 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1849 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1850 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1851 if (dp == NULL || lnum < dp->df_lnum[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1852 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1853
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1854 if (lnum < dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1855 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1856 int zero = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1857
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1858 /* Changed or inserted line. If the other buffers have a count of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1859 * zero, the lines were inserted. If the other buffers have the same
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1860 * count, check if the lines are identical. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1861 cmp = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1862 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1863 if (i != idx && curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1864 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1865 if (dp->df_count[i] == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1866 zero = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1867 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1868 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1869 if (dp->df_count[i] != dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1870 return -1; /* nr of lines changed. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1871 cmp = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1872 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1873 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1874 if (cmp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1875 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1876 /* Compare all lines. If they are equal the lines were inserted
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1877 * in some buffers, deleted in others, but not changed. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1878 for (i = 0; i < DB_COUNT; ++i)
9487
69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents: 9387
diff changeset
1879 if (i != idx && curtab->tp_diffbuf[i] != NULL
69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents: 9387
diff changeset
1880 && dp->df_count[i] != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1881 if (!diff_equal_entry(dp, idx, i))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1882 return -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1883 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1884 /* If there is no buffer with zero lines then there is no difference
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1885 * any longer. Happens when making a change (or undo) that removes
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1886 * the difference. Can't remove the entry here, we might be halfway
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1887 * updating the window. Just report the text as unchanged. Other
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1888 * windows might still show the change though. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1889 if (zero == FALSE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1890 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1891 return -2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1892 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1893
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1894 /* If 'diffopt' doesn't contain "filler", return 0. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1895 if (!(diff_flags & DIFF_FILLER))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1896 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1897
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1898 /* Insert filler lines above the line just below the change. Will return
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1899 * 0 when this buf had the max count. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1900 maxcount = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1901 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1902 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1903 maxcount = dp->df_count[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1904 return maxcount - dp->df_count[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1905 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1906
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1907 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1908 * Compare two entries in diff "*dp" and return TRUE if they are equal.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1909 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1910 static int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1911 diff_equal_entry(diff_T *dp, int idx1, int idx2)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1912 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1913 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1914 char_u *line;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1915 int cmp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1916
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1917 if (dp->df_count[idx1] != dp->df_count[idx2])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1918 return FALSE;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1919 if (diff_check_sanity(curtab, dp) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1920 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1921 for (i = 0; i < dp->df_count[idx1]; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1922 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1923 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1],
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1924 dp->df_lnum[idx1] + i, FALSE));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1925 if (line == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1926 return FALSE;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1927 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2],
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1928 dp->df_lnum[idx2] + i, FALSE));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1929 vim_free(line);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1930 if (cmp != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1931 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1932 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1933 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1934 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1935
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1936 /*
12333
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1937 * Compare the characters at "p1" and "p2". If they are equal (possibly
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1938 * ignoring case) return TRUE and set "len" to the number of bytes.
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1939 */
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1940 static int
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1941 diff_equal_char(char_u *p1, char_u *p2, int *len)
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1942 {
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1943 int l = (*mb_ptr2len)(p1);
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1944
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1945 if (l != (*mb_ptr2len)(p2))
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1946 return FALSE;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1947 if (l > 1)
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1948 {
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1949 if (STRNCMP(p1, p2, l) != 0
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1950 && (!enc_utf8
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1951 || !(diff_flags & DIFF_ICASE)
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1952 || utf_fold(utf_ptr2char(p1))
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1953 != utf_fold(utf_ptr2char(p2))))
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1954 return FALSE;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1955 *len = l;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1956 }
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1957 else
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1958 {
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1959 if ((*p1 != *p2)
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1960 && (!(diff_flags & DIFF_ICASE)
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1961 || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2)))
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1962 return FALSE;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1963 *len = 1;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1964 }
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1965 return TRUE;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1966 }
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1967
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
1968 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1969 * Compare strings "s1" and "s2" according to 'diffopt'.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1970 * Return non-zero when they are different.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1971 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1972 static int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1973 diff_cmp(char_u *s1, char_u *s2)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1974 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1975 char_u *p1, *p2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1976 int l;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1977
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1978 if ((diff_flags & DIFF_IBLANK)
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1979 && (*skipwhite(s1) == NUL || *skipwhite(s2) == NUL))
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1980 return 0;
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1981
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1982 if ((diff_flags & (DIFF_ICASE | ALL_WHITE_DIFF)) == 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1983 return STRCMP(s1, s2);
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1984 if ((diff_flags & DIFF_ICASE) && !(diff_flags & ALL_WHITE_DIFF))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1985 return MB_STRICMP(s1, s2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1986
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1987 p1 = s1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1988 p2 = s2;
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1989
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1990 // Ignore white space changes and possibly ignore case.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1991 while (*p1 != NUL && *p2 != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1992 {
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1993 if (((diff_flags & DIFF_IWHITE)
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1994 && VIM_ISWHITE(*p1) && VIM_ISWHITE(*p2))
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1995 || ((diff_flags & DIFF_IWHITEALL)
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
1996 && (VIM_ISWHITE(*p1) || VIM_ISWHITE(*p2))))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1997 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1998 p1 = skipwhite(p1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1999 p2 = skipwhite(p2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2000 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2001 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2002 {
12333
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
2003 if (!diff_equal_char(p1, p2, &l))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2004 break;
12333
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
2005 p1 += l;
dea5dda9ef30 patch 8.0.1046: code duplication in diff mode
Christian Brabandt <cb@256bit.org>
parents: 12315
diff changeset
2006 p2 += l;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2007 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2008 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2009
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2010 // Ignore trailing white space.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2011 p1 = skipwhite(p1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2012 p2 = skipwhite(p2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2013 if (*p1 != NUL || *p2 != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2014 return 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2015 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2016 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2017
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2018 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2019 * Return the number of filler lines above "lnum".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2020 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2021 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2022 diff_check_fill(win_T *wp, linenr_T lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2023 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2024 int n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2025
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2026 /* be quick when there are no filler lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2027 if (!(diff_flags & DIFF_FILLER))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2028 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2029 n = diff_check(wp, lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2030 if (n <= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2031 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2032 return n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2033 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2034
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2035 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2036 * Set the topline of "towin" to match the position in "fromwin", so that they
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2037 * show the same diff'ed lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2038 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2039 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2040 diff_set_topline(win_T *fromwin, win_T *towin)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2041 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2042 buf_T *frombuf = fromwin->w_buffer;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2043 linenr_T lnum = fromwin->w_topline;
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2044 int fromidx;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2045 int toidx;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2046 diff_T *dp;
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2047 int max_count;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2048 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2049
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2050 fromidx = diff_buf_idx(frombuf);
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2051 if (fromidx == DB_COUNT)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2052 return; /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2053
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2054 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2055 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2056
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2057 towin->w_topfill = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2058
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2059 /* search for a change that includes "lnum" in the list of diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2060 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2061 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2062 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2063 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2064 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2065 /* After last change, compute topline relative to end of file; no
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2066 * filler lines. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2067 towin->w_topline = towin->w_buffer->b_ml.ml_line_count
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2068 - (frombuf->b_ml.ml_line_count - lnum);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2069 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2070 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2071 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2072 /* Find index for "towin". */
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2073 toidx = diff_buf_idx(towin->w_buffer);
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2074 if (toidx == DB_COUNT)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2075 return; /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2076
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2077 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]);
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2078 if (lnum >= dp->df_lnum[fromidx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2079 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2080 /* Inside a change: compute filler lines. With three or more
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2081 * buffers we need to know the largest count. */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2082 max_count = 0;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2083 for (i = 0; i < DB_COUNT; ++i)
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2084 if (curtab->tp_diffbuf[i] != NULL
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2085 && max_count < dp->df_count[i])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2086 max_count = dp->df_count[i];
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2087
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2088 if (dp->df_count[toidx] == dp->df_count[fromidx])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2089 {
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2090 /* same number of lines: use same filler count */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2091 towin->w_topfill = fromwin->w_topfill;
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2092 }
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2093 else if (dp->df_count[toidx] > dp->df_count[fromidx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2094 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2095 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2096 {
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2097 /* more lines in towin and fromwin doesn't show diff
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2098 * lines, only filler lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2099 if (max_count - fromwin->w_topfill >= dp->df_count[toidx])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2100 {
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2101 /* towin also only shows filler lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2102 towin->w_topline = dp->df_lnum[toidx]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2103 + dp->df_count[toidx];
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2104 towin->w_topfill = fromwin->w_topfill;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2105 }
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2106 else
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2107 /* towin still has some diff lines to show */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2108 towin->w_topline = dp->df_lnum[toidx]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2109 + max_count - fromwin->w_topfill;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2110 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2111 }
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2112 else if (towin->w_topline >= dp->df_lnum[toidx]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2113 + dp->df_count[toidx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2114 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2115 /* less lines in towin and no diff lines to show: compute
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2116 * filler lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2117 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx];
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2118 if (diff_flags & DIFF_FILLER)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2119 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2120 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2121 /* fromwin is also out of diff lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2122 towin->w_topfill = fromwin->w_topfill;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2123 else
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2124 /* fromwin has some diff lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2125 towin->w_topfill = dp->df_lnum[fromidx]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
2126 + max_count - lnum;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2127 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2128 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2129 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2130 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2131
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2132 /* safety check (if diff info gets outdated strange things may happen) */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2133 towin->w_botfill = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2134 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2135 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2136 towin->w_topline = towin->w_buffer->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2137 towin->w_botfill = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2138 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2139 if (towin->w_topline < 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2140 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2141 towin->w_topline = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2142 towin->w_topfill = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2143 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2144
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2145 /* When w_topline changes need to recompute w_botline and cursor position */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2146 invalidate_botline_win(towin);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2147 changed_line_abv_curs_win(towin);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2148
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2149 check_topfill(towin, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2150 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2151 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2152 NULL, TRUE, NULL);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2153 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2154 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2155
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2156 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2157 * This is called when 'diffopt' is changed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2158 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2159 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2160 diffopt_changed(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2161 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2162 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2163 int diff_context_new = 6;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2164 int diff_flags_new = 0;
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2165 int diff_foldcolumn_new = 2;
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2166 long diff_algorithm_new = 0;
15103
9339601e7a31 patch 8.1.0562: parsing of 'diffopt' is slightly wrong
Bram Moolenaar <Bram@vim.org>
parents: 15004
diff changeset
2167 long diff_indent_heuristic = 0;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2168 tabpage_T *tp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2169
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2170 p = p_dip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2171 while (*p != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2172 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2173 if (STRNCMP(p, "filler", 6) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2174 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2175 p += 6;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2176 diff_flags_new |= DIFF_FILLER;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2177 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2178 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8]))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2179 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2180 p += 8;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2181 diff_context_new = getdigits(&p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2182 }
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2183 else if (STRNCMP(p, "iblank", 6) == 0)
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2184 {
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2185 p += 6;
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2186 diff_flags_new |= DIFF_IBLANK;
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2187 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2188 else if (STRNCMP(p, "icase", 5) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2189 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2190 p += 5;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2191 diff_flags_new |= DIFF_ICASE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2192 }
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2193 else if (STRNCMP(p, "iwhiteall", 9) == 0)
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2194 {
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2195 p += 9;
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2196 diff_flags_new |= DIFF_IWHITEALL;
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2197 }
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2198 else if (STRNCMP(p, "iwhiteeol", 9) == 0)
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2199 {
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2200 p += 9;
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2201 diff_flags_new |= DIFF_IWHITEEOL;
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2202 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2203 else if (STRNCMP(p, "iwhite", 6) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2204 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2205 p += 6;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2206 diff_flags_new |= DIFF_IWHITE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2207 }
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2208 else if (STRNCMP(p, "horizontal", 10) == 0)
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2209 {
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2210 p += 10;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2211 diff_flags_new |= DIFF_HORIZONTAL;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2212 }
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2213 else if (STRNCMP(p, "vertical", 8) == 0)
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2214 {
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2215 p += 8;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2216 diff_flags_new |= DIFF_VERTICAL;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2217 }
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2218 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11]))
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2219 {
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2220 p += 11;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2221 diff_foldcolumn_new = getdigits(&p);
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2222 }
12971
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2223 else if (STRNCMP(p, "hiddenoff", 9) == 0)
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2224 {
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2225 p += 9;
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2226 diff_flags_new |= DIFF_HIDDEN_OFF;
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2227 }
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2228 else if (STRNCMP(p, "indent-heuristic", 16) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2229 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2230 p += 16;
15103
9339601e7a31 patch 8.1.0562: parsing of 'diffopt' is slightly wrong
Bram Moolenaar <Bram@vim.org>
parents: 15004
diff changeset
2231 diff_indent_heuristic = XDF_INDENT_HEURISTIC;
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2232 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2233 else if (STRNCMP(p, "internal", 8) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2234 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2235 p += 8;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2236 diff_flags_new |= DIFF_INTERNAL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2237 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2238 else if (STRNCMP(p, "algorithm:", 10) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2239 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2240 p += 10;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2241 if (STRNCMP(p, "myers", 5) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2242 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2243 p += 5;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2244 diff_algorithm_new = 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2245 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2246 else if (STRNCMP(p, "minimal", 7) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2247 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2248 p += 7;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2249 diff_algorithm_new = XDF_NEED_MINIMAL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2250 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2251 else if (STRNCMP(p, "patience", 8) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2252 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2253 p += 8;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2254 diff_algorithm_new = XDF_PATIENCE_DIFF;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2255 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2256 else if (STRNCMP(p, "histogram", 9) == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2257 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2258 p += 9;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2259 diff_algorithm_new = XDF_HISTOGRAM_DIFF;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2260 }
15004
9c2352253376 patch 8.1.0513: no error for set diffopt+=algorithm:
Bram Moolenaar <Bram@vim.org>
parents: 14982
diff changeset
2261 else
9c2352253376 patch 8.1.0513: no error for set diffopt+=algorithm:
Bram Moolenaar <Bram@vim.org>
parents: 14982
diff changeset
2262 return FAIL;
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2263 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2264
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2265 if (*p != ',' && *p != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2266 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2267 if (*p == ',')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2268 ++p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2269 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2270
15103
9339601e7a31 patch 8.1.0562: parsing of 'diffopt' is slightly wrong
Bram Moolenaar <Bram@vim.org>
parents: 15004
diff changeset
2271 diff_algorithm_new |= diff_indent_heuristic;
9339601e7a31 patch 8.1.0562: parsing of 'diffopt' is slightly wrong
Bram Moolenaar <Bram@vim.org>
parents: 15004
diff changeset
2272
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2273 /* Can't have both "horizontal" and "vertical". */
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2274 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL))
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2275 return FAIL;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2276
14780
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
2277 // If flags were added or removed, or the algorithm was changed, need to
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
2278 // update the diff.
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2279 if (diff_flags != diff_flags_new || diff_algorithm != diff_algorithm_new)
9649
fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents: 9487
diff changeset
2280 FOR_ALL_TABPAGES(tp)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2281 tp->tp_diff_invalid = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2282
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2283 diff_flags = diff_flags_new;
15900
360c93a884d0 patch 8.1.0956: using context:0 in 'diffopt' does not work well
Bram Moolenaar <Bram@vim.org>
parents: 15840
diff changeset
2284 diff_context = diff_context_new == 0 ? 1 : diff_context_new;
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2285 diff_foldcolumn = diff_foldcolumn_new;
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
2286 diff_algorithm = diff_algorithm_new;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2287
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2288 diff_redraw(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2289
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2290 /* recompute the scroll binding with the new option value, may
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2291 * remove or add filler lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2292 check_scrollbind((linenr_T)0, 0L);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2293
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2294 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2295 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2296
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2297 /*
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2298 * Return TRUE if 'diffopt' contains "horizontal".
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2299 */
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2300 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2301 diffopt_horizontal(void)
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2302 {
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2303 return (diff_flags & DIFF_HORIZONTAL) != 0;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2304 }
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2305
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
2306 /*
12971
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2307 * Return TRUE if 'diffopt' contains "hiddenoff".
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2308 */
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2309 int
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2310 diffopt_hiddenoff(void)
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2311 {
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2312 return (diff_flags & DIFF_HIDDEN_OFF) != 0;
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2313 }
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2314
ca3cb1997f08 patch 8.0.1361: some users don't want to diff with hidden buffers
Christian Brabandt <cb@256bit.org>
parents: 12353
diff changeset
2315 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2316 * Find the difference within a changed line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2317 * Returns TRUE if the line was added, no other buffer has it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2318 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2319 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2320 diff_find_change(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2321 win_T *wp,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2322 linenr_T lnum,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2323 int *startp, /* first char of the change */
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2324 int *endp) /* last char of the change */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2325 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2326 char_u *line_org;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2327 char_u *line_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2328 int i;
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2329 int si_org, si_new;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2330 int ei_org, ei_new;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2331 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2332 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2333 int off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2334 int added = TRUE;
12315
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents: 11707
diff changeset
2335 char_u *p1, *p2;
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents: 11707
diff changeset
2336 int l;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2337
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2338 /* Make a copy of the line, the next ml_get() will invalidate it. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2339 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2340 if (line_org == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2341 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2342
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2343 idx = diff_buf_idx(wp->w_buffer);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2344 if (idx == DB_COUNT) /* cannot happen */
1074
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
2345 {
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
2346 vim_free(line_org);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2347 return FALSE;
1074
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
2348 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2349
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2350 /* search for a change that includes "lnum" in the list of diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2351 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2352 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2353 break;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2354 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
1074
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
2355 {
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
2356 vim_free(line_org);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2357 return FALSE;
1074
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
2358 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2359
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2360 off = lnum - dp->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2361
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2362 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2363 if (curtab->tp_diffbuf[i] != NULL && i != idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2364 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2365 /* Skip lines that are not in the other change (filler lines). */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2366 if (off >= dp->df_count[i])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2367 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2368 added = FALSE;
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2369 line_new = ml_get_buf(curtab->tp_diffbuf[i],
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2370 dp->df_lnum[i] + off, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2371
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2372 /* Search for start of difference */
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2373 si_org = si_new = 0;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2374 while (line_org[si_org] != NUL)
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2375 {
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2376 if (((diff_flags & DIFF_IWHITE)
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2377 && VIM_ISWHITE(line_org[si_org])
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2378 && VIM_ISWHITE(line_new[si_new]))
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2379 || ((diff_flags & DIFF_IWHITEALL)
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2380 && (VIM_ISWHITE(line_org[si_org])
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2381 || VIM_ISWHITE(line_new[si_new]))))
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2382 {
835
8bebcabccc2c updated for version 7.0e01
vimboss
parents: 829
diff changeset
2383 si_org = (int)(skipwhite(line_org + si_org) - line_org);
8bebcabccc2c updated for version 7.0e01
vimboss
parents: 829
diff changeset
2384 si_new = (int)(skipwhite(line_new + si_new) - line_new);
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2385 }
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2386 else
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2387 {
12315
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents: 11707
diff changeset
2388 if (!diff_equal_char(line_org + si_org, line_new + si_new,
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents: 11707
diff changeset
2389 &l))
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2390 break;
12315
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents: 11707
diff changeset
2391 si_org += l;
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents: 11707
diff changeset
2392 si_new += l;
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2393 }
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2394 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2395 if (has_mbyte)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2396 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2397 /* Move back to first byte of character in both lines (may
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2398 * have "nn^" in line_org and "n^ in line_new). */
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2399 si_org -= (*mb_head_off)(line_org, line_org + si_org);
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2400 si_new -= (*mb_head_off)(line_new, line_new + si_new);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2401 }
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2402 if (*startp > si_org)
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2403 *startp = si_org;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2404
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2405 /* Search for end of difference, if any. */
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2406 if (line_org[si_org] != NUL || line_new[si_new] != NUL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2407 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2408 ei_org = (int)STRLEN(line_org);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2409 ei_new = (int)STRLEN(line_new);
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2410 while (ei_org >= *startp && ei_new >= si_new
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2411 && ei_org >= 0 && ei_new >= 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2412 {
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2413 if (((diff_flags & DIFF_IWHITE)
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2414 && VIM_ISWHITE(line_org[ei_org])
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2415 && VIM_ISWHITE(line_new[ei_new]))
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2416 || ((diff_flags & DIFF_IWHITEALL)
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2417 && (VIM_ISWHITE(line_org[ei_org])
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents: 14730
diff changeset
2418 || VIM_ISWHITE(line_new[ei_new]))))
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2419 {
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2420 while (ei_org >= *startp
11129
f4ea50924c6d patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11121
diff changeset
2421 && VIM_ISWHITE(line_org[ei_org]))
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2422 --ei_org;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2423 while (ei_new >= si_new
11129
f4ea50924c6d patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11121
diff changeset
2424 && VIM_ISWHITE(line_new[ei_new]))
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2425 --ei_new;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2426 }
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2427 else
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2428 {
12315
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents: 11707
diff changeset
2429 p1 = line_org + ei_org;
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents: 11707
diff changeset
2430 p2 = line_new + ei_new;
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents: 11707
diff changeset
2431 p1 -= (*mb_head_off)(line_org, p1);
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents: 11707
diff changeset
2432 p2 -= (*mb_head_off)(line_new, p2);
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents: 11707
diff changeset
2433 if (!diff_equal_char(p1, p2, &l))
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2434 break;
12315
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents: 11707
diff changeset
2435 ei_org -= l;
40ee9f3d265f patch 8.0.1037: "icase" of 'diffopt' is not used for highlighting
Christian Brabandt <cb@256bit.org>
parents: 11707
diff changeset
2436 ei_new -= l;
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2437 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2438 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2439 if (*endp < ei_org)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2440 *endp = ei_org;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2441 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2442 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2443
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2444 vim_free(line_org);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2445 return added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2446 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2447
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2448 #if defined(FEAT_FOLDING) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2449 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2450 * Return TRUE if line "lnum" is not close to a diff block, this line should
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2451 * be in a fold.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2452 * Return FALSE if there are no diff blocks at all in this window.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2453 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2454 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2455 diff_infold(win_T *wp, linenr_T lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2456 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2457 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2458 int idx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2459 int other = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2460 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2461
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2462 /* Return if 'diff' isn't set. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2463 if (!wp->w_p_diff)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2464 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2465
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2466 for (i = 0; i < DB_COUNT; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2467 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2468 if (curtab->tp_diffbuf[i] == wp->w_buffer)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2469 idx = i;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2470 else if (curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2471 other = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2472 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2473
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2474 /* return here if there are no diffs in the window */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2475 if (idx == -1 || !other)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2476 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2477
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2478 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2479 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2480
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2481 /* Return if there are no diff blocks. All lines will be folded. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2482 if (curtab->tp_first_diff == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2483 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2484
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2485 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2486 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2487 /* If this change is below the line there can't be any further match. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2488 if (dp->df_lnum[idx] - diff_context > lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2489 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2490 /* If this change ends before the line we have a match. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2491 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2492 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2493 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2494 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2495 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2496 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2497
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2498 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2499 * "dp" and "do" commands.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2500 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2501 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2502 nv_diffgetput(int put, long count)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2503 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2504 exarg_T ea;
6314
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2505 char_u buf[30];
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2506
14019
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents: 13802
diff changeset
2507 #ifdef FEAT_JOB_CHANNEL
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents: 13802
diff changeset
2508 if (bt_prompt(curbuf))
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents: 13802
diff changeset
2509 {
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents: 13802
diff changeset
2510 vim_beep(BO_OPER);
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents: 13802
diff changeset
2511 return;
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents: 13802
diff changeset
2512 }
dc67449d648c patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents: 13802
diff changeset
2513 #endif
6314
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2514 if (count == 0)
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2515 ea.arg = (char_u *)"";
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2516 else
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2517 {
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2518 vim_snprintf((char *)buf, 30, "%ld", count);
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2519 ea.arg = buf;
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2520 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2521 if (put)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2522 ea.cmdidx = CMD_diffput;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2523 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2524 ea.cmdidx = CMD_diffget;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2525 ea.addr_count = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2526 ea.line1 = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2527 ea.line2 = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2528 ex_diffgetput(&ea);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2529 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2530
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2531 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2532 * ":diffget"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2533 * ":diffput"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2534 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2535 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2536 ex_diffgetput(exarg_T *eap)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2537 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2538 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2539 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2540 linenr_T off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2541 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2542 diff_T *dprev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2543 diff_T *dfree;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2544 int idx_cur;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2545 int idx_other;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2546 int idx_from;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2547 int idx_to;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2548 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2549 int added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2550 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2551 aco_save_T aco;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2552 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2553 int start_skip, end_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2554 int new_count;
648
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2555 int buf_empty;
1075
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2556 int found_not_ma = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2557
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2558 /* Find the current buffer in the list of diff buffers. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2559 idx_cur = diff_buf_idx(curbuf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2560 if (idx_cur == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2561 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
2562 emsg(_("E99: Current buffer is not in diff mode"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2563 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2564 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2565
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2566 if (*eap->arg == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2567 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2568 /* No argument: Find the other buffer in the list of diff buffers. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2569 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2570 if (curtab->tp_diffbuf[idx_other] != curbuf
1075
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2571 && curtab->tp_diffbuf[idx_other] != NULL)
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2572 {
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2573 if (eap->cmdidx != CMD_diffput
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2574 || curtab->tp_diffbuf[idx_other]->b_p_ma)
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2575 break;
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2576 found_not_ma = TRUE;
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2577 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2578 if (idx_other == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2579 {
1075
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2580 if (found_not_ma)
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
2581 emsg(_("E793: No other buffer in diff mode is modifiable"));
1075
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2582 else
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
2583 emsg(_("E100: No other buffer in diff mode"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2584 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2585 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2586
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2587 /* Check that there isn't a third buffer in the list */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2588 for (i = idx_other + 1; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2589 if (curtab->tp_diffbuf[i] != curbuf
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2590 && curtab->tp_diffbuf[i] != NULL
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2591 && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2592 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
2593 emsg(_("E101: More than two buffers in diff mode, don't know which one to use"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2594 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2595 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2596 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2597 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2598 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2599 /* Buffer number or pattern given. Ignore trailing white space. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2600 p = eap->arg + STRLEN(eap->arg);
11129
f4ea50924c6d patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11121
diff changeset
2601 while (p > eap->arg && VIM_ISWHITE(p[-1]))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2602 --p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2603 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2604 ;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2605 if (eap->arg + i == p) /* digits only */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2606 i = atol((char *)eap->arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2607 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2608 {
4236
23ce9a61bdc2 updated for version 7.3.869
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
2609 i = buflist_findpat(eap->arg, p, FALSE, TRUE, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2610 if (i < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2611 return; /* error message already given */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2612 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2613 buf = buflist_findnr(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2614 if (buf == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2615 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
2616 semsg(_("E102: Can't find buffer \"%s\""), eap->arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2617 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2618 }
1788
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
2619 if (buf == curbuf)
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
2620 return; /* nothing to do */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2621 idx_other = diff_buf_idx(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2622 if (idx_other == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2623 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
2624 semsg(_("E103: Buffer \"%s\" is not in diff mode"), eap->arg);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2625 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2626 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2627 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2628
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2629 diff_busy = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2630
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2631 /* When no range given include the line above or below the cursor. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2632 if (eap->addr_count == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2633 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2634 /* Make it possible that ":diffget" on the last line gets line below
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2635 * the cursor line when there is no difference above the cursor. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2636 if (eap->cmdidx == CMD_diffget
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2637 && eap->line1 == curbuf->b_ml.ml_line_count
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2638 && diff_check(curwin, eap->line1) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2639 && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2640 ++eap->line2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2641 else if (eap->line1 > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2642 --eap->line1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2643 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2644
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2645 if (eap->cmdidx == CMD_diffget)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2646 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2647 idx_from = idx_other;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2648 idx_to = idx_cur;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2649 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2650 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2651 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2652 idx_from = idx_cur;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2653 idx_to = idx_other;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2654 /* Need to make the other buffer the current buffer to be able to make
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2655 * changes in it. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2656 /* set curwin/curbuf to buf and save a few things */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2657 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2658 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2659
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2660 /* May give the warning for a changed buffer here, which can trigger the
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2661 * FileChangedRO autocommand, which may do nasty things and mess
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2662 * everything up. */
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2663 if (!curbuf->b_changed)
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2664 {
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2665 change_warning(0);
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2666 if (diff_buf_idx(curbuf) != idx_to)
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2667 {
15470
55ccc2d353bd patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents: 15103
diff changeset
2668 emsg(_("E787: Buffer changed unexpectedly"));
14776
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget
Christian Brabandt <cb@256bit.org>
parents: 14770
diff changeset
2669 goto theend;
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2670 }
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2671 }
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2672
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2673 dprev = NULL;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2674 for (dp = curtab->tp_first_diff; dp != NULL; )
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2675 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2676 if (dp->df_lnum[idx_cur] > eap->line2 + off)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2677 break; /* past the range that was specified */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2678
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2679 dfree = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2680 lnum = dp->df_lnum[idx_to];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2681 count = dp->df_count[idx_to];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2682 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2683 && u_save(lnum - 1, lnum + count) != FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2684 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2685 /* Inside the specified range and saving for undo worked. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2686 start_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2687 end_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2688 if (eap->addr_count > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2689 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2690 /* A range was specified: check if lines need to be skipped. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2691 start_skip = eap->line1 + off - dp->df_lnum[idx_cur];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2692 if (start_skip > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2693 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2694 /* range starts below start of current diff block */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2695 if (start_skip > count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2696 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2697 lnum += count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2698 count = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2699 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2700 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2701 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2702 count -= start_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2703 lnum += start_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2704 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2705 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2706 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2707 start_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2708
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2709 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2710 - (eap->line2 + off);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2711 if (end_skip > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2712 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2713 /* range ends above end of current/from diff block */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2714 if (idx_cur == idx_from) /* :diffput */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2715 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2716 i = dp->df_count[idx_cur] - start_skip - end_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2717 if (count > i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2718 count = i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2719 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2720 else /* :diffget */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2721 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2722 count -= end_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2723 end_skip = dp->df_count[idx_from] - start_skip - count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2724 if (end_skip < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2725 end_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2726 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2727 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2728 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2729 end_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2730 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2731
11121
778c10516955 patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents: 11113
diff changeset
2732 buf_empty = BUFEMPTY();
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2733 added = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2734 for (i = 0; i < count; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2735 {
648
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2736 /* remember deleting the last line of the buffer */
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2737 buf_empty = curbuf->b_ml.ml_line_count == 1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2738 ml_delete(lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2739 --added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2740 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2741 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2742 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2743 linenr_T nr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2744
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2745 nr = dp->df_lnum[idx_from] + start_skip + i;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2746 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2747 break;
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2748 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from],
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2749 nr, FALSE));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2750 if (p != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2751 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2752 ml_append(lnum + i - 1, p, 0, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2753 vim_free(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2754 ++added;
648
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2755 if (buf_empty && curbuf->b_ml.ml_line_count == 2)
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2756 {
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2757 /* Added the first line into an empty buffer, need to
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2758 * delete the dummy empty line. */
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2759 buf_empty = FALSE;
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2760 ml_delete((linenr_T)2, FALSE);
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2761 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2762 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2763 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2764 new_count = dp->df_count[idx_to] + added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2765 dp->df_count[idx_to] = new_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2766
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2767 if (start_skip == 0 && end_skip == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2768 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2769 /* Check if there are any other buffers and if the diff is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2770 * equal in them. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2771 for (i = 0; i < DB_COUNT; ++i)
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2772 if (curtab->tp_diffbuf[i] != NULL && i != idx_from
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2773 && i != idx_to
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2774 && !diff_equal_entry(dp, idx_from, i))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2775 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2776 if (i == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2777 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2778 /* delete the diff entry, the buffers are now equal here */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2779 dfree = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2780 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2781 if (dprev == NULL)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2782 curtab->tp_first_diff = dp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2783 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2784 dprev->df_next = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2785 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2786 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2787
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2788 /* Adjust marks. This will change the following entries! */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2789 if (added != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2790 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2791 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2792 if (curwin->w_cursor.lnum >= lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2793 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2794 /* Adjust the cursor position if it's in/after the changed
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2795 * lines. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2796 if (curwin->w_cursor.lnum >= lnum + count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2797 curwin->w_cursor.lnum += added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2798 else if (added < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2799 curwin->w_cursor.lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2800 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2801 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2802 changed_lines(lnum, 0, lnum + count, (long)added);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2803
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2804 if (dfree != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2805 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2806 /* Diff is deleted, update folds in other windows. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2807 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2808 diff_fold_update(dfree, idx_to);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2809 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2810 vim_free(dfree);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2811 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2812 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2813 /* mark_adjust() may have changed the count in a wrong way */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2814 dp->df_count[idx_to] = new_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2815
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2816 /* When changing the current buffer, keep track of line numbers */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2817 if (idx_cur == idx_to)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2818 off += added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2819 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2820
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2821 /* If before the range or not deleted, go to next diff. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2822 if (dfree == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2823 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2824 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2825 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2826 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2827 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2828
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2829 /* restore curwin/curbuf and a few other things */
2445
04dae202d316 Fixes for coverity warnings.
Bram Moolenaar <bram@vim.org>
parents: 2250
diff changeset
2830 if (eap->cmdidx != CMD_diffget)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2831 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2832 /* Syncing undo only works for the current buffer, but we change
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2833 * another buffer. Sync undo if the command was typed. This isn't
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2834 * 100% right when ":diffput" is used in a function or mapping. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2835 if (KeyTyped)
825
6675076019ae updated for version 7.0d
vimboss
parents: 819
diff changeset
2836 u_sync(FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2837 aucmd_restbuf(&aco);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2838 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2839
14776
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget
Christian Brabandt <cb@256bit.org>
parents: 14770
diff changeset
2840 theend:
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2841 diff_busy = FALSE;
14776
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget
Christian Brabandt <cb@256bit.org>
parents: 14770
diff changeset
2842 if (diff_need_update)
14893
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do"
Bram Moolenaar <Bram@vim.org>
parents: 14780
diff changeset
2843 ex_diffupdate(NULL);
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do"
Bram Moolenaar <Bram@vim.org>
parents: 14780
diff changeset
2844
14972
5d52b21b2e7f patch 8.1.0497: :%diffput changes order of lines
Bram Moolenaar <Bram@vim.org>
parents: 14893
diff changeset
2845 // Check that the cursor is on a valid character and update its
14893
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do"
Bram Moolenaar <Bram@vim.org>
parents: 14780
diff changeset
2846 // position. When there were filler lines the topline has become
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do"
Bram Moolenaar <Bram@vim.org>
parents: 14780
diff changeset
2847 // invalid.
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do"
Bram Moolenaar <Bram@vim.org>
parents: 14780
diff changeset
2848 check_cursor();
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do"
Bram Moolenaar <Bram@vim.org>
parents: 14780
diff changeset
2849 changed_line_abv_curs();
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do"
Bram Moolenaar <Bram@vim.org>
parents: 14780
diff changeset
2850
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do"
Bram Moolenaar <Bram@vim.org>
parents: 14780
diff changeset
2851 if (diff_need_update)
291656f731c9 patch 8.1.0458: ml_get error and crash when using "do"
Bram Moolenaar <Bram@vim.org>
parents: 14780
diff changeset
2852 // redraw already done by ex_diffupdate()
14776
09c1f241e2f7 patch 8.1.0400: using freed memory with :diffget
Christian Brabandt <cb@256bit.org>
parents: 14770
diff changeset
2853 diff_need_update = FALSE;
14780
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
2854 else
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
2855 {
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
2856 // Also need to redraw the other buffers.
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
2857 diff_redraw(FALSE);
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
2858 apply_autocmds(EVENT_DIFFUPDATED, NULL, NULL, FALSE, curbuf);
552523e44923 patch 8.1.0402: the DiffUpdate event isn't triggered for :diffput
Christian Brabandt <cb@256bit.org>
parents: 14776
diff changeset
2859 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2860 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2861
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2862 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2863 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2864 * Update folds for all diff buffers for entry "dp".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2865 * Skip buffer with index "skip_idx".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2866 * When there are no diffs, all folds are removed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2867 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2868 static void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2869 diff_fold_update(diff_T *dp, int skip_idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2870 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2871 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2872 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2873
9649
fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents: 9487
diff changeset
2874 FOR_ALL_WINDOWS(wp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2875 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2876 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2877 foldUpdate(wp, dp->df_lnum[i],
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2878 dp->df_lnum[i] + dp->df_count[i]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2879 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2880 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2881
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2882 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2883 * Return TRUE if buffer "buf" is in diff-mode.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2884 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2885 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2886 diff_mode_buf(buf_T *buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2887 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2888 tabpage_T *tp;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2889
9649
fd9727ae3c49 commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents: 9487
diff changeset
2890 FOR_ALL_TABPAGES(tp)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2891 if (diff_buf_idx_tp(buf, tp) != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2892 return TRUE;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2893 return FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2894 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2895
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2896 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2897 * Move "count" times in direction "dir" to the next diff block.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2898 * Return FAIL if there isn't such a diff block.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2899 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2900 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2901 diff_move_to(int dir, long count)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2902 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2903 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2904 linenr_T lnum = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2905 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2906
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2907 idx = diff_buf_idx(curbuf);
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2908 if (idx == DB_COUNT || curtab->tp_first_diff == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2909 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2910
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2911 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2912 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2913
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2914 if (curtab->tp_first_diff == NULL) /* no diffs today */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2915 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2916
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2917 while (--count >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2918 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2919 /* Check if already before first diff. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2920 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2921 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2922
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2923 for (dp = curtab->tp_first_diff; ; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2924 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2925 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2926 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2927 if ((dir == FORWARD && lnum < dp->df_lnum[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2928 || (dir == BACKWARD
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2929 && (dp->df_next == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2930 || lnum <= dp->df_next->df_lnum[idx])))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2931 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2932 lnum = dp->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2933 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2934 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2935 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2936 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2937
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2938 /* don't end up past the end of the file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2939 if (lnum > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2940 lnum = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2941
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2942 /* When the cursor didn't move at all we fail. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2943 if (lnum == curwin->w_cursor.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2944 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2945
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2946 setpcmark();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2947 curwin->w_cursor.lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2948 curwin->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2949
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2950 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2951 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2952
10295
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2953 /*
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2954 * Return the line number in the current window that is closest to "lnum1" in
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2955 * "buf1" in diff mode.
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2956 */
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2957 static linenr_T
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2958 diff_get_corresponding_line_int(
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2959 buf_T *buf1,
10295
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2960 linenr_T lnum1)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2961 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2962 int idx1;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2963 int idx2;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2964 diff_T *dp;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2965 int baseline = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2966
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2967 idx1 = diff_buf_idx(buf1);
10295
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2968 idx2 = diff_buf_idx(curbuf);
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2969 if (idx1 == DB_COUNT || idx2 == DB_COUNT || curtab->tp_first_diff == NULL)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2970 return lnum1;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2971
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2972 if (curtab->tp_diff_invalid)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2973 ex_diffupdate(NULL); /* update after a big change */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2974
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2975 if (curtab->tp_first_diff == NULL) /* no diffs today */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2976 return lnum1;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2977
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2978 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2979 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2980 if (dp->df_lnum[idx1] > lnum1)
10295
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2981 return lnum1 - baseline;
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2982 if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2983 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2984 /* Inside the diffblock */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2985 baseline = lnum1 - dp->df_lnum[idx1];
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2986 if (baseline > dp->df_count[idx2])
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2987 baseline = dp->df_count[idx2];
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2988
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2989 return dp->df_lnum[idx2] + baseline;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2990 }
10295
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2991 if ( (dp->df_lnum[idx1] == lnum1)
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2992 && (dp->df_count[idx1] == 0)
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2993 && (dp->df_lnum[idx2] <= curwin->w_cursor.lnum)
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2994 && ((dp->df_lnum[idx2] + dp->df_count[idx2])
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
2995 > curwin->w_cursor.lnum))
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2996 /*
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2997 * Special case: if the cursor is just after a zero-count
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2998 * block (i.e. all filler) and the target cursor is already
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2999 * inside the corresponding block, leave the target cursor
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
3000 * unmoved. This makes repeated CTRL-W W operations work
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
3001 * as expected.
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
3002 */
10295
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3003 return curwin->w_cursor.lnum;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
3004 baseline = (dp->df_lnum[idx1] + dp->df_count[idx1])
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
3005 - (dp->df_lnum[idx2] + dp->df_count[idx2]);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
3006 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
3007
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
3008 /* If we get here then the cursor is after the last diff */
10295
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3009 return lnum1 - baseline;
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3010 }
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3011
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3012 /*
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3013 * Return the line number in the current window that is closest to "lnum1" in
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3014 * "buf1" in diff mode. Checks the line number to be valid.
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3015 */
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3016 linenr_T
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3017 diff_get_corresponding_line(buf_T *buf1, linenr_T lnum1)
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3018 {
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3019 linenr_T lnum = diff_get_corresponding_line_int(buf1, lnum1);
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3020
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
3021 /* don't end up past the end of the file */
10295
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3022 if (lnum > curbuf->b_ml.ml_line_count)
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3023 return curbuf->b_ml.ml_line_count;
d0b74b18e4b5 commit https://github.com/vim/vim/commit/025e3e0bafbc85cc4e365145af711edf99d0a90d
Christian Brabandt <cb@256bit.org>
parents: 10042
diff changeset
3024 return lnum;
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
3025 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
3026
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3027 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3028 * For line "lnum" in the current window find the equivalent lnum in window
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3029 * "wp", compensating for inserted/deleted lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3030 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3031 linenr_T
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
3032 diff_lnum_win(linenr_T lnum, win_T *wp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3033 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3034 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3035 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3036 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3037 linenr_T n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3038
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3039 idx = diff_buf_idx(curbuf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3040 if (idx == DB_COUNT) /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3041 return (linenr_T)0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3042
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
3043 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3044 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3045
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3046 /* search for a change that includes "lnum" in the list of diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
3047 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3048 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3049 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3050
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3051 /* When after the last change, compute relative to the last line number. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3052 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3053 return wp->w_buffer->b_ml.ml_line_count
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3054 - (curbuf->b_ml.ml_line_count - lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3055
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3056 /* Find index for "wp". */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3057 i = diff_buf_idx(wp->w_buffer);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3058 if (i == DB_COUNT) /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3059 return (linenr_T)0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3060
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3061 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3062 if (n > dp->df_lnum[i] + dp->df_count[i])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3063 n = dp->df_lnum[i] + dp->df_count[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3064 return n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3065 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3066
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3067 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3068 * Handle an ED style diff line.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3069 * Return FAIL if the line does not contain diff info.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3070 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3071 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3072 parse_diff_ed(
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3073 char_u *line,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3074 linenr_T *lnum_orig,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3075 long *count_orig,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3076 linenr_T *lnum_new,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3077 long *count_new)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3078 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3079 char_u *p;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3080 long f1, l1, f2, l2;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3081 int difftype;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3082
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3083 // The line must be one of three formats:
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3084 // change: {first}[,{last}]c{first}[,{last}]
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3085 // append: {first}a{first}[,{last}]
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3086 // delete: {first}[,{last}]d{first}
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3087 p = line;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3088 f1 = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3089 if (*p == ',')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3090 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3091 ++p;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3092 l1 = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3093 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3094 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3095 l1 = f1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3096 if (*p != 'a' && *p != 'c' && *p != 'd')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3097 return FAIL; // invalid diff format
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3098 difftype = *p++;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3099 f2 = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3100 if (*p == ',')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3101 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3102 ++p;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3103 l2 = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3104 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3105 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3106 l2 = f2;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3107 if (l1 < f1 || l2 < f2)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3108 return FAIL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3109
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3110 if (difftype == 'a')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3111 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3112 *lnum_orig = f1 + 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3113 *count_orig = 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3114 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3115 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3116 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3117 *lnum_orig = f1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3118 *count_orig = l1 - f1 + 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3119 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3120 if (difftype == 'd')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3121 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3122 *lnum_new = f2 + 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3123 *count_new = 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3124 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3125 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3126 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3127 *lnum_new = f2;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3128 *count_new = l2 - f2 + 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3129 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3130 return OK;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3131 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3132
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3133 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3134 * Parses unified diff with zero(!) context lines.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3135 * Return FAIL if there is no diff information in "line".
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3136 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3137 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3138 parse_diff_unified(
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3139 char_u *line,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3140 linenr_T *lnum_orig,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3141 long *count_orig,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3142 linenr_T *lnum_new,
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3143 long *count_new)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3144 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3145 char_u *p;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3146 long oldline, oldcount, newline, newcount;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3147
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3148 // Parse unified diff hunk header:
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3149 // @@ -oldline,oldcount +newline,newcount @@
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3150 p = line;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3151 if (*p++ == '@' && *p++ == '@' && *p++ == ' ' && *p++ == '-')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3152 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3153 oldline = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3154 if (*p == ',')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3155 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3156 ++p;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3157 oldcount = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3158 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3159 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3160 oldcount = 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3161 if (*p++ == ' ' && *p++ == '+')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3162 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3163 newline = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3164 if (*p == ',')
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3165 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3166 ++p;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3167 newcount = getdigits(&p);
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3168 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3169 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3170 newcount = 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3171 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3172 else
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3173 return FAIL; // invalid diff format
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3174
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3175 if (oldcount == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3176 oldline += 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3177 if (newcount == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3178 newline += 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3179 if (newline == 0)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3180 newline = 1;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3181
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3182 *lnum_orig = oldline;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3183 *count_orig = oldcount;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3184 *lnum_new = newline;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3185 *count_new = newcount;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3186
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3187 return OK;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3188 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3189
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3190 return FAIL;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3191 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3192
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3193 /*
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3194 * Callback function for the xdl_diff() function.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3195 * Stores the diff output in a grow array.
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3196 */
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3197 static int
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3198 xdiff_out(void *priv, mmbuffer_t *mb, int nbuf)
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3199 {
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3200 diffout_T *dout = (diffout_T *)priv;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3201 char_u *p;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3202
14982
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3203 // The header line always comes by itself, text lines in at least two
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3204 // parts. We drop the text part.
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3205 if (nbuf > 1)
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3206 return 0;
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3207
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3208 // sanity check
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3209 if (STRNCMP(mb[0].ptr, "@@ ", 3) != 0)
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3210 return 0;
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3211
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3212 if (ga_grow(&dout->dout_ga, 1) == FAIL)
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3213 return -1;
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3214 p = vim_strnsave((char_u *)mb[0].ptr, mb[0].size);
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3215 if (p == NULL)
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3216 return -1;
d56f14540dda patch 8.1.0502: internal diff fails when diffing a context diff
Bram Moolenaar <Bram@vim.org>
parents: 14972
diff changeset
3217 ((char_u **)dout->dout_ga.ga_data)[dout->dout_ga.ga_len++] = p;
14696
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3218 return 0;
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3219 }
195e8b1fcbbf patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents: 14019
diff changeset
3220
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3221 #endif /* FEAT_DIFF */