Mercurial > vim

annotate src/diff.c @ 25970:7804974af9b2

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