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