annotate src/diff.c @ 8749:65a5a18d3acf v7.4.1663

commit https://github.com/vim/vim/commit/ea6553bec340920d8a09c7210cdc2d218e25ace2 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 27 15:13:38 2016 +0200 patch 7.4.1663 Problem: In tests it's often useful to check if a pattern matches. Solution: Add assert_match().
author Christian Brabandt <cb@256bit.org>
date Sun, 27 Mar 2016 15:15:06 +0200
parents db2a07b710ed
children f094d4085014
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1 /* vim:set ts=8 sts=4 sw=4:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3 * VIM - Vi IMproved by Bram Moolenaar
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5 * Do ":help uganda" in Vim to read copying and usage conditions.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 * Do ":help credits" in Vim to see a list of people who contributed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7 * See README.txt for an overview of the Vim source code.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 /*
1788
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
11 * diff.c: code for diff'ing two, three or four buffers.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14 #include "vim.h"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
15
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16 #if defined(FEAT_DIFF) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
17
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
18 static int diff_busy = FALSE; /* ex_diffgetput() is busy */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
20 /* flags obtained from the 'diffopt' option */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
21 #define DIFF_FILLER 1 /* display filler lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
22 #define DIFF_ICASE 2 /* ignore case */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
23 #define DIFF_IWHITE 4 /* ignore change in white space */
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
24 #define DIFF_HORIZONTAL 8 /* horizontal splits */
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
25 #define DIFF_VERTICAL 16 /* vertical splits */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26 static int diff_flags = DIFF_FILLER;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
27
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28 #define LBUFLEN 50 /* length of line in diff file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
29
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
30 static int diff_a_works = MAYBE; /* TRUE when "diff -a" works, FALSE when it
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
31 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
32 #if defined(MSWIN)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
33 static int diff_bin_works = MAYBE; /* TRUE when "diff --binary" works, FALSE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
34 when it doesn't work, MAYBE when not
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
35 checked yet */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
36 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
37
7799
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
38 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
39 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
40 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
41 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
42 static int diff_check_sanity(tabpage_T *tp, diff_T *dp);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
43 static void diff_redraw(int dofold);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
44 static int diff_write(buf_T *buf, char_u *fname);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
45 static void diff_file(char_u *tmp_orig, char_u *tmp_new, char_u *tmp_diff);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
46 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
47 static int diff_cmp(char_u *s1, char_u *s2);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
48 #ifdef FEAT_FOLDING
7799
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
49 static void diff_fold_update(diff_T *dp, int skip_idx);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
50 #endif
7799
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
51 static void diff_read(int idx_orig, int idx_new, char_u *fname);
af3c41a3c53f commit https://github.com/vim/vim/commit/f28dbcea371b3a35727d91afc90fb90e0527d78a
Christian Brabandt <cb@256bit.org>
parents: 7338
diff changeset
52 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
53 static diff_T *diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
54
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
55 #ifndef USE_CR
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
56 # define tag_fgets vim_fgets
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
57 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
58
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
59 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
60 * Called when deleting or unloading a buffer: No longer make a diff with it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
61 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
62 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
63 diff_buf_delete(buf_T *buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
64 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
65 int i;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
66 tabpage_T *tp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
67
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
68 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
69 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
70 i = diff_buf_idx_tp(buf, tp);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
71 if (i != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
72 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
73 tp->tp_diffbuf[i] = NULL;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
74 tp->tp_diff_invalid = TRUE;
1761
0836531167ab updated for version 7.2-059
vimboss
parents: 1757
diff changeset
75 if (tp == curtab)
0836531167ab updated for version 7.2-059
vimboss
parents: 1757
diff changeset
76 diff_redraw(TRUE);
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
77 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
78 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
79 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
80
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
81 /*
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
82 * Check if the current buffer should be added to or removed from the list of
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
83 * diff buffers.
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
84 */
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
85 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
86 diff_buf_adjust(win_T *win)
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
87 {
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
88 win_T *wp;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
89 int i;
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
90
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
91 if (!win->w_p_diff)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
92 {
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
93 /* When there is no window showing a diff for this buffer, remove
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
94 * it from the diffs. */
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
95 for (wp = firstwin; wp != NULL; wp = wp->w_next)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
96 if (wp->w_buffer == win->w_buffer && wp->w_p_diff)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
97 break;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
98 if (wp == NULL)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
99 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
100 i = diff_buf_idx(win->w_buffer);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
101 if (i != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
102 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
103 curtab->tp_diffbuf[i] = NULL;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
104 curtab->tp_diff_invalid = TRUE;
1761
0836531167ab updated for version 7.2-059
vimboss
parents: 1757
diff changeset
105 diff_redraw(TRUE);
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
106 }
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
107 }
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
108 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
109 else
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
110 diff_buf_add(win->w_buffer);
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
111 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
112
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
113 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
114 * Add a buffer to make diffs for.
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
115 * Call this when a new buffer is being edited in the current window where
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
116 * 'diff' is set.
1788
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
117 * Marks the current buffer as being part of the diff and requiring updating.
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
118 * This must be done before any autocmd, because a command may use info
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
119 * about the screen contents.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
120 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
121 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
122 diff_buf_add(buf_T *buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
123 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
124 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
125
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
126 if (diff_buf_idx(buf) != DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
127 return; /* It's already there. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
128
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
129 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
130 if (curtab->tp_diffbuf[i] == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
131 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
132 curtab->tp_diffbuf[i] = buf;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
133 curtab->tp_diff_invalid = TRUE;
1761
0836531167ab updated for version 7.2-059
vimboss
parents: 1757
diff changeset
134 diff_redraw(TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
135 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
136 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
137
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
138 EMSGN(_("E96: Can not diff more than %ld buffers"), DB_COUNT);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
139 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
140
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
141 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
142 * Find buffer "buf" in the list of diff buffers for the current tab page.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
143 * Return its index or DB_COUNT if not found.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
144 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
145 static int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
146 diff_buf_idx(buf_T *buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
147 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
148 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
149
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
150 for (idx = 0; idx < DB_COUNT; ++idx)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
151 if (curtab->tp_diffbuf[idx] == buf)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
152 break;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
153 return idx;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
154 }
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
155
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
156 /*
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
157 * Find buffer "buf" in the list of diff buffers for tab page "tp".
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
158 * Return its index or DB_COUNT if not found.
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
159 */
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
160 static int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
161 diff_buf_idx_tp(buf_T *buf, tabpage_T *tp)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
162 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
163 int idx;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
164
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
165 for (idx = 0; idx < DB_COUNT; ++idx)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
166 if (tp->tp_diffbuf[idx] == buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
167 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
168 return idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
169 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
170
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
171 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
172 * Mark the diff info involving buffer "buf" as invalid, it will be updated
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
173 * when info is requested.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
174 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
175 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
176 diff_invalidate(buf_T *buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
177 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
178 tabpage_T *tp;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
179 int i;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
180
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
181 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
182 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
183 i = diff_buf_idx_tp(buf, tp);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
184 if (i != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
185 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
186 tp->tp_diff_invalid = TRUE;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
187 if (tp == curtab)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
188 diff_redraw(TRUE);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
189 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
190 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
191 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
192
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
193 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
194 * Called by mark_adjust(): update line numbers in "curbuf".
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
195 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
196 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
197 diff_mark_adjust(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
198 linenr_T line1,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
199 linenr_T line2,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
200 long amount,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
201 long amount_after)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
202 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
203 int idx;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
204 tabpage_T *tp;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
205
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
206 /* Handle all tab pages that use the current buffer in a diff. */
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
207 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
208 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
209 idx = diff_buf_idx_tp(curbuf, tp);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
210 if (idx != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
211 diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
212 }
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
213 }
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
214
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
215 /*
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
216 * Update line numbers in tab page "tp" for "curbuf" with index "idx".
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
217 * This attempts to update the changes as much as possible:
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
218 * When inserting/deleting lines outside of existing change blocks, create a
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
219 * new change block and update the line numbers in following blocks.
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
220 * When inserting/deleting lines in existing change blocks, update them.
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
221 */
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
222 static void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
223 diff_mark_adjust_tp(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
224 tabpage_T *tp,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
225 int idx,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
226 linenr_T line1,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
227 linenr_T line2,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
228 long amount,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
229 long amount_after)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
230 {
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
231 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
232 diff_T *dprev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
233 diff_T *dnext;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
234 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
235 int inserted, deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
236 int n, off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
237 linenr_T last;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
238 linenr_T lnum_deleted = line1; /* lnum of remaining deletion */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
239 int check_unchanged;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
240
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
241 if (line2 == MAXLNUM)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
242 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
243 /* mark_adjust(99, MAXLNUM, 9, 0): insert lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
244 inserted = amount;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
245 deleted = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
246 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
247 else if (amount_after > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
248 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
249 /* mark_adjust(99, 98, MAXLNUM, 9): a change that inserts lines*/
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
250 inserted = amount_after;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
251 deleted = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
252 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
253 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
254 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
255 /* mark_adjust(98, 99, MAXLNUM, -2): delete lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
256 inserted = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
257 deleted = -amount_after;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
258 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
259
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
260 dprev = NULL;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
261 dp = tp->tp_first_diff;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
262 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
263 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
264 /* If the change is after the previous diff block and before the next
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
265 * diff block, thus not touching an existing change, create a new diff
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
266 * block. Don't do this when ex_diffgetput() is busy. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
267 if ((dp == NULL || dp->df_lnum[idx] - 1 > line2
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
268 || (line2 == MAXLNUM && dp->df_lnum[idx] > line1))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
269 && (dprev == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
270 || dprev->df_lnum[idx] + dprev->df_count[idx] < line1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
271 && !diff_busy)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
272 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
273 dnext = diff_alloc_new(tp, dprev, dp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
274 if (dnext == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
275 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
276
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
277 dnext->df_lnum[idx] = line1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
278 dnext->df_count[idx] = inserted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
279 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
280 if (tp->tp_diffbuf[i] != NULL && i != idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
281 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
282 if (dprev == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
283 dnext->df_lnum[i] = line1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
284 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
285 dnext->df_lnum[i] = line1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
286 + (dprev->df_lnum[i] + dprev->df_count[i])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
287 - (dprev->df_lnum[idx] + dprev->df_count[idx]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
288 dnext->df_count[i] = deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
289 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
290 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
291
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
292 /* if at end of the list, quit */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
293 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
294 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
295
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
296 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
297 * Check for these situations:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
298 * 1 2 3
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
299 * 1 2 3
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
300 * line1 2 3 4 5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
301 * 2 3 4 5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
302 * 2 3 4 5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
303 * line2 2 3 4 5
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
304 * 3 5 6
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
305 * 3 5 6
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
306 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
307 /* compute last line of this change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
308 last = dp->df_lnum[idx] + dp->df_count[idx] - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
309
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
310 /* 1. change completely above line1: nothing to do */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
311 if (last >= line1 - 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
312 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
313 /* 6. change below line2: only adjust for amount_after; also when
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
314 * "deleted" became zero when deleted all lines between two diffs */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
315 if (dp->df_lnum[idx] - (deleted + inserted != 0) > line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
316 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
317 if (amount_after == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
318 break; /* nothing left to change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
319 dp->df_lnum[idx] += amount_after;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
320 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
321 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
322 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
323 check_unchanged = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
324
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
325 /* 2. 3. 4. 5.: inserted/deleted lines touching this diff. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
326 if (deleted > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
327 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
328 if (dp->df_lnum[idx] >= line1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
329 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
330 off = dp->df_lnum[idx] - lnum_deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
331 if (last <= line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
332 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
333 /* 4. delete all lines of diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
334 if (dp->df_next != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
335 && dp->df_next->df_lnum[idx] - 1 <= line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
336 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
337 /* delete continues in next diff, only do
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
338 * lines until that one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
339 n = dp->df_next->df_lnum[idx] - lnum_deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
340 deleted -= n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
341 n -= dp->df_count[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
342 lnum_deleted = dp->df_next->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
343 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
344 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
345 n = deleted - dp->df_count[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
346 dp->df_count[idx] = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
347 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
348 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
349 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
350 /* 5. delete lines at or just before top of diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
351 n = off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
352 dp->df_count[idx] -= line2 - dp->df_lnum[idx] + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
353 check_unchanged = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
354 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
355 dp->df_lnum[idx] = line1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
356 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
357 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
358 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
359 off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
360 if (last < line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
361 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
362 /* 2. delete at end of of diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
363 dp->df_count[idx] -= last - lnum_deleted + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
364 if (dp->df_next != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
365 && dp->df_next->df_lnum[idx] - 1 <= line2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
366 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
367 /* delete continues in next diff, only do
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
368 * lines until that one */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
369 n = dp->df_next->df_lnum[idx] - 1 - last;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
370 deleted -= dp->df_next->df_lnum[idx]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
371 - lnum_deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
372 lnum_deleted = dp->df_next->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
373 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
374 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
375 n = line2 - last;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
376 check_unchanged = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
377 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
378 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
379 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
380 /* 3. delete lines inside the diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
381 n = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
382 dp->df_count[idx] -= deleted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
383 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
384 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
385
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
386 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
387 if (tp->tp_diffbuf[i] != NULL && i != idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
388 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
389 dp->df_lnum[i] -= off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
390 dp->df_count[i] += n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
391 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
392 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
393 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
394 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
395 if (dp->df_lnum[idx] <= line1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
396 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
397 /* inserted lines somewhere in this diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
398 dp->df_count[idx] += inserted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
399 check_unchanged = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
400 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
401 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
402 /* inserted lines somewhere above this diff */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
403 dp->df_lnum[idx] += inserted;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
404 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
405
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
406 if (check_unchanged)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
407 /* Check if inserted lines are equal, may reduce the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
408 * size of the diff. TODO: also check for equal lines
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
409 * in the middle and perhaps split the block. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
410 diff_check_unchanged(tp, dp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
411 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
412 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
413
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
414 /* check if this block touches the previous one, may merge them. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
415 if (dprev != NULL && dprev->df_lnum[idx] + dprev->df_count[idx]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
416 == dp->df_lnum[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
417 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
418 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
419 if (tp->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
420 dprev->df_count[i] += dp->df_count[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
421 dprev->df_next = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
422 vim_free(dp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
423 dp = dprev->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
424 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
425 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
426 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
427 /* Advance to next entry. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
428 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
429 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
430 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
431 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
432
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
433 dprev = NULL;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
434 dp = tp->tp_first_diff;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
435 while (dp != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
436 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
437 /* All counts are zero, remove this entry. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
438 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
439 if (tp->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
440 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
441 if (i == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
442 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
443 dnext = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
444 vim_free(dp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
445 dp = dnext;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
446 if (dprev == NULL)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
447 tp->tp_first_diff = dnext;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
448 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
449 dprev->df_next = dnext;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
450 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
451 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
452 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
453 /* Advance to next entry. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
454 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
455 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
456 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
457
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
458 }
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
459
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
460 if (tp == curtab)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
461 {
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
462 diff_redraw(TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
463
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
464 /* Need to recompute the scroll binding, may remove or add filler
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
465 * lines (e.g., when adding lines above w_topline). But it's slow when
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
466 * making many changes, postpone until redrawing. */
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
467 diff_need_scrollbind = TRUE;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
468 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
469 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
470
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
471 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
472 * Allocate a new diff block and link it between "dprev" and "dp".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
473 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
474 static diff_T *
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
475 diff_alloc_new(tabpage_T *tp, diff_T *dprev, diff_T *dp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
476 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
477 diff_T *dnew;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
478
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
479 dnew = (diff_T *)alloc((unsigned)sizeof(diff_T));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
480 if (dnew != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
481 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
482 dnew->df_next = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
483 if (dprev == NULL)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
484 tp->tp_first_diff = dnew;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
485 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
486 dprev->df_next = dnew;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
487 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
488 return dnew;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
489 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
490
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
491 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
492 * Check if the diff block "dp" can be made smaller for lines at the start and
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
493 * end that are equal. Called after inserting lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
494 * This may result in a change where all buffers have zero lines, the caller
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
495 * must take care of removing it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
496 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
497 static void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
498 diff_check_unchanged(tabpage_T *tp, diff_T *dp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
499 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
500 int i_org;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
501 int i_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
502 int off_org, off_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
503 char_u *line_org;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
504 int dir = FORWARD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
505
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
506 /* Find the first buffers, use it as the original, compare the other
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
507 * buffer lines against this one. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
508 for (i_org = 0; i_org < DB_COUNT; ++i_org)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
509 if (tp->tp_diffbuf[i_org] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
510 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
511 if (i_org == DB_COUNT) /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
512 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
513
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
514 if (diff_check_sanity(tp, dp) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
515 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
516
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
517 /* First check lines at the top, then at the bottom. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
518 off_org = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
519 off_new = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
520 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
521 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
522 /* Repeat until a line is found which is different or the number of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
523 * lines has become zero. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
524 while (dp->df_count[i_org] > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
525 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
526 /* Copy the line, the next ml_get() will invalidate it. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
527 if (dir == BACKWARD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
528 off_org = dp->df_count[i_org] - 1;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
529 line_org = vim_strsave(ml_get_buf(tp->tp_diffbuf[i_org],
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
530 dp->df_lnum[i_org] + off_org, FALSE));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
531 if (line_org == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
532 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
533 for (i_new = i_org + 1; i_new < DB_COUNT; ++i_new)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
534 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
535 if (tp->tp_diffbuf[i_new] == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
536 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
537 if (dir == BACKWARD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
538 off_new = dp->df_count[i_new] - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
539 /* if other buffer doesn't have this line, it was inserted */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
540 if (off_new < 0 || off_new >= dp->df_count[i_new])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
541 break;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
542 if (diff_cmp(line_org, ml_get_buf(tp->tp_diffbuf[i_new],
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
543 dp->df_lnum[i_new] + off_new, FALSE)) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
544 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
545 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
546 vim_free(line_org);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
547
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
548 /* Stop when a line isn't equal in all diff buffers. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
549 if (i_new != DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
550 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
551
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
552 /* Line matched in all buffers, remove it from the diff. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
553 for (i_new = i_org; i_new < DB_COUNT; ++i_new)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
554 if (tp->tp_diffbuf[i_new] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
555 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
556 if (dir == FORWARD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
557 ++dp->df_lnum[i_new];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
558 --dp->df_count[i_new];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
559 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
560 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
561 if (dir == BACKWARD)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
562 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
563 dir = BACKWARD;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
564 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
565 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
566
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
567 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
568 * Check if a diff block doesn't contain invalid line numbers.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
569 * This can happen when the diff program returns invalid results.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
570 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
571 static int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
572 diff_check_sanity(tabpage_T *tp, diff_T *dp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
573 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
574 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
575
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
576 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
577 if (tp->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
578 if (dp->df_lnum[i] + dp->df_count[i] - 1
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
579 > tp->tp_diffbuf[i]->b_ml.ml_line_count)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
580 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
581 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
582 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
583
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
584 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
585 * Mark all diff buffers in the current tab page for redraw.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
586 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
587 static void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
588 diff_redraw(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
589 int dofold) /* also recompute the folds */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
590 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
591 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
592 int n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
593
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
594 for (wp = firstwin; wp != NULL; wp = wp->w_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
595 if (wp->w_p_diff)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
596 {
738
5c9e7c6e6e2e updated for version 7.0222
vimboss
parents: 694
diff changeset
597 redraw_win_later(wp, SOME_VALID);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
598 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
599 if (dofold && foldmethodIsDiff(wp))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
600 foldUpdateAll(wp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
601 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
602 /* A change may have made filler lines invalid, need to take care
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
603 * of that for other windows. */
3904
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 3524
diff changeset
604 n = diff_check(wp, wp->w_topline);
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 3524
diff changeset
605 if ((wp != curwin && wp->w_topfill > 0) || n > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
606 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
607 if (wp->w_topfill > n)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
608 wp->w_topfill = (n < 0 ? 0 : n);
3904
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 3524
diff changeset
609 else if (n > 0 && n > wp->w_topfill)
64427849c158 updated for version 7.3.708
Bram Moolenaar <bram@vim.org>
parents: 3524
diff changeset
610 wp->w_topfill = n;
5934
e3d2b8d83bb3 updated for version 7.4.308
Bram Moolenaar <bram@vim.org>
parents: 5358
diff changeset
611 check_topfill(wp, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
612 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
613 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
614 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
615
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
616 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
617 * Write buffer "buf" to file "name".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
618 * Always use 'fileformat' set to "unix".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
619 * Return FAIL for failure
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
620 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
621 static int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
622 diff_write(buf_T *buf, char_u *fname)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
623 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
624 int r;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
625 char_u *save_ff;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
626
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
627 save_ff = buf->b_p_ff;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
628 buf->b_p_ff = vim_strsave((char_u *)FF_UNIX);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
629 r = buf_write(buf, fname, NULL, (linenr_T)1, buf->b_ml.ml_line_count,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
630 NULL, FALSE, FALSE, FALSE, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
631 free_string_option(buf->b_p_ff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
632 buf->b_p_ff = save_ff;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
633 return r;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
634 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
635
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
636 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
637 * Completely update the diffs for the buffers involved.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
638 * This uses the ordinary "diff" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
639 * The buffers are written to a file, also for unmodified buffers (the file
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
640 * could have been produced by autocommands, e.g. the netrw plugin).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
641 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
642 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
643 ex_diffupdate(
8368
db2a07b710ed commit https://github.com/vim/vim/commit/f1d2501ebe33e148886c2914acd33140e20ee222
Christian Brabandt <cb@256bit.org>
parents: 8212
diff changeset
644 exarg_T *eap) /* can be NULL */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
645 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
646 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
647 int idx_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
648 int idx_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
649 char_u *tmp_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
650 char_u *tmp_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
651 char_u *tmp_diff;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
652 FILE *fd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
653 int ok;
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
654 int io_error = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
655
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
656 /* Delete all diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
657 diff_clear(curtab);
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
658 curtab->tp_diff_invalid = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
659
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
660 /* Use the first buffer as the original text. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
661 for (idx_orig = 0; idx_orig < DB_COUNT; ++idx_orig)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
662 if (curtab->tp_diffbuf[idx_orig] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
663 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
664 if (idx_orig == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
665 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
666
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
667 /* Only need to do something when there is another buffer. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
668 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
669 if (curtab->tp_diffbuf[idx_new] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
670 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
671 if (idx_new == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
672 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
673
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
674 /* We need three temp file names. */
6721
7347229a646a updated for version 7.4.684
Bram Moolenaar <bram@vim.org>
parents: 6314
diff changeset
675 tmp_orig = vim_tempname('o', TRUE);
7347229a646a updated for version 7.4.684
Bram Moolenaar <bram@vim.org>
parents: 6314
diff changeset
676 tmp_new = vim_tempname('n', TRUE);
7347229a646a updated for version 7.4.684
Bram Moolenaar <bram@vim.org>
parents: 6314
diff changeset
677 tmp_diff = vim_tempname('d', TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
678 if (tmp_orig == NULL || tmp_new == NULL || tmp_diff == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
679 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
680
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
681 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
682 * Do a quick test if "diff" really works. Otherwise it looks like there
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
683 * are no differences. Can't use the return value, it's non-zero when
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
684 * there are differences.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
685 * May try twice, first with "-a" and then without.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
686 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
687 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
688 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
689 ok = FALSE;
531
da9142bd190a updated for version 7.0149
vimboss
parents: 474
diff changeset
690 fd = mch_fopen((char *)tmp_orig, "w");
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
691 if (fd == NULL)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
692 io_error = TRUE;
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
693 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
694 {
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
695 if (fwrite("line1\n", (size_t)6, (size_t)1, fd) != 1)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
696 io_error = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
697 fclose(fd);
531
da9142bd190a updated for version 7.0149
vimboss
parents: 474
diff changeset
698 fd = mch_fopen((char *)tmp_new, "w");
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
699 if (fd == NULL)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
700 io_error = TRUE;
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
701 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
702 {
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
703 if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
704 io_error = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
705 fclose(fd);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
706 diff_file(tmp_orig, tmp_new, tmp_diff);
531
da9142bd190a updated for version 7.0149
vimboss
parents: 474
diff changeset
707 fd = mch_fopen((char *)tmp_diff, "r");
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
708 if (fd == NULL)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
709 io_error = TRUE;
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
710 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
711 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
712 char_u linebuf[LBUFLEN];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
713
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
714 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
715 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
716 /* There must be a line that contains "1c1". */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
717 if (tag_fgets(linebuf, LBUFLEN, fd))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
718 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
719 if (STRNCMP(linebuf, "1c1", 3) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
720 ok = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
721 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
722 fclose(fd);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
723 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
724 mch_remove(tmp_diff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
725 mch_remove(tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
726 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
727 mch_remove(tmp_orig);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
728 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
729
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
730 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
731 /* When using 'diffexpr' break here. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
732 if (*p_dex != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
733 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
734 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
735
8212
05b88224cea1 commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents: 7817
diff changeset
736 #if defined(MSWIN)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
737 /* If the "-a" argument works, also check if "--binary" works. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
738 if (ok && diff_a_works == MAYBE && diff_bin_works == MAYBE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
739 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
740 diff_a_works = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
741 diff_bin_works = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
742 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
743 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
744 if (!ok && diff_a_works == TRUE && diff_bin_works == TRUE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
745 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
746 /* Tried --binary, but it failed. "-a" works though. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
747 diff_bin_works = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
748 ok = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
749 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
750 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
751
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
752 /* If we checked if "-a" works already, break here. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
753 if (diff_a_works != MAYBE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
754 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
755 diff_a_works = ok;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
756
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
757 /* If "-a" works break here, otherwise retry without "-a". */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
758 if (ok)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
759 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
760 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
761 if (!ok)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
762 {
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
763 if (io_error)
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
764 EMSG(_("E810: Cannot read or write temp files"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
765 EMSG(_("E97: Cannot create diffs"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
766 diff_a_works = MAYBE;
8212
05b88224cea1 commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents: 7817
diff changeset
767 #if defined(MSWIN)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
768 diff_bin_works = MAYBE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
769 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
770 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
771 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
772
3524
d8ce4a2eb44e updated for version 7.3.523
Bram Moolenaar <bram@vim.org>
parents: 2583
diff changeset
773 /* :diffupdate! */
d8ce4a2eb44e updated for version 7.3.523
Bram Moolenaar <bram@vim.org>
parents: 2583
diff changeset
774 if (eap != NULL && eap->forceit)
d8ce4a2eb44e updated for version 7.3.523
Bram Moolenaar <bram@vim.org>
parents: 2583
diff changeset
775 for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new)
d8ce4a2eb44e updated for version 7.3.523
Bram Moolenaar <bram@vim.org>
parents: 2583
diff changeset
776 {
d8ce4a2eb44e updated for version 7.3.523
Bram Moolenaar <bram@vim.org>
parents: 2583
diff changeset
777 buf = curtab->tp_diffbuf[idx_new];
d8ce4a2eb44e updated for version 7.3.523
Bram Moolenaar <bram@vim.org>
parents: 2583
diff changeset
778 if (buf_valid(buf))
d8ce4a2eb44e updated for version 7.3.523
Bram Moolenaar <bram@vim.org>
parents: 2583
diff changeset
779 buf_check_timestamp(buf, FALSE);
d8ce4a2eb44e updated for version 7.3.523
Bram Moolenaar <bram@vim.org>
parents: 2583
diff changeset
780 }
d8ce4a2eb44e updated for version 7.3.523
Bram Moolenaar <bram@vim.org>
parents: 2583
diff changeset
781
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
782 /* Write the first buffer to a tempfile. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
783 buf = curtab->tp_diffbuf[idx_orig];
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
784 if (diff_write(buf, tmp_orig) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
785 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
786
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
787 /* Make a difference between the first buffer and every other. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
788 for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
789 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
790 buf = curtab->tp_diffbuf[idx_new];
6985
a07c3f9cd616 patch 7.4.810
Bram Moolenaar <bram@vim.org>
parents: 6897
diff changeset
791 if (buf == NULL || buf->b_ml.ml_mfp == NULL)
a07c3f9cd616 patch 7.4.810
Bram Moolenaar <bram@vim.org>
parents: 6897
diff changeset
792 continue; /* skip buffer that isn't loaded */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
793 if (diff_write(buf, tmp_new) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
794 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
795 diff_file(tmp_orig, tmp_new, tmp_diff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
796
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
797 /* Read the diff output and add each entry to the diff list. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
798 diff_read(idx_orig, idx_new, tmp_diff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
799 mch_remove(tmp_diff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
800 mch_remove(tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
801 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
802 mch_remove(tmp_orig);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
803
1429
3372616fe1f1 updated for version 7.1-144
vimboss
parents: 1428
diff changeset
804 /* force updating cursor position on screen */
3372616fe1f1 updated for version 7.1-144
vimboss
parents: 1428
diff changeset
805 curwin->w_valid_cursor.lnum = 0;
3372616fe1f1 updated for version 7.1-144
vimboss
parents: 1428
diff changeset
806
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
807 diff_redraw(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
808
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
809 theend:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
810 vim_free(tmp_orig);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
811 vim_free(tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
812 vim_free(tmp_diff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
813 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
814
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
815 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
816 * Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
817 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
818 static void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
819 diff_file(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
820 char_u *tmp_orig,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
821 char_u *tmp_new,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
822 char_u *tmp_diff)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
823 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
824 char_u *cmd;
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
825 size_t len;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
826
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
827 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
828 if (*p_dex != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
829 /* Use 'diffexpr' to generate the diff file. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
830 eval_diff(tmp_orig, tmp_new, tmp_diff);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
831 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
832 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
833 {
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
834 len = STRLEN(tmp_orig) + STRLEN(tmp_new)
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
835 + STRLEN(tmp_diff) + STRLEN(p_srr) + 27;
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
836 cmd = alloc((unsigned)len);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
837 if (cmd != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
838 {
193
eee3fa1b0197 updated for version 7.0058
vimboss
parents: 28
diff changeset
839 /* We don't want $DIFF_OPTIONS to get in the way. */
eee3fa1b0197 updated for version 7.0058
vimboss
parents: 28
diff changeset
840 if (getenv("DIFF_OPTIONS"))
eee3fa1b0197 updated for version 7.0058
vimboss
parents: 28
diff changeset
841 vim_setenv((char_u *)"DIFF_OPTIONS", (char_u *)"");
eee3fa1b0197 updated for version 7.0058
vimboss
parents: 28
diff changeset
842
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
843 /* Build the diff command and execute it. Always use -a, binary
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
844 * differences are of no use. Ignore errors, diff returns
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
845 * non-zero when differences have been found. */
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
846 vim_snprintf((char *)cmd, len, "diff %s%s%s%s%s %s",
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
847 diff_a_works == FALSE ? "" : "-a ",
8212
05b88224cea1 commit https://github.com/vim/vim/commit/48e330aff911be1c798c88a973af6437a8141fce
Christian Brabandt <cb@256bit.org>
parents: 7817
diff changeset
848 #if defined(MSWIN)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
849 diff_bin_works == TRUE ? "--binary " : "",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
850 #else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
851 "",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
852 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
853 (diff_flags & DIFF_IWHITE) ? "-b " : "",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
854 (diff_flags & DIFF_ICASE) ? "-i " : "",
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
855 tmp_orig, tmp_new);
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
856 append_redir(cmd, (int)len, p_srr, tmp_diff);
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
857 #ifdef FEAT_AUTOCMD
1410
cdd82acd75b4 updated for version 7.1-125
vimboss
parents: 1075
diff changeset
858 block_autocmds(); /* Avoid ShellCmdPost stuff */
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
859 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
860 (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
861 #ifdef FEAT_AUTOCMD
1410
cdd82acd75b4 updated for version 7.1-125
vimboss
parents: 1075
diff changeset
862 unblock_autocmds();
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
863 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
864 vim_free(cmd);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
865 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
866 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
867 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
868
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
869 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
870 * Create a new version of a file from the current buffer and a diff file.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
871 * The buffer is written to a file, also for unmodified buffers (the file
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
872 * could have been produced by autocommands, e.g. the netrw plugin).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
873 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
874 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
875 ex_diffpatch(exarg_T *eap)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
876 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
877 char_u *tmp_orig; /* name of original temp file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
878 char_u *tmp_new; /* name of patched temp file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
879 char_u *buf = NULL;
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
880 size_t buflen;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
881 win_T *old_curwin = curwin;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
882 char_u *newname = NULL; /* name of patched file buffer */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
883 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
884 char_u dirbuf[MAXPATHL];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
885 char_u *fullname = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
886 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
887 #ifdef FEAT_BROWSE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
888 char_u *browseFile = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
889 int browse_flag = cmdmod.browse;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
890 #endif
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
891 struct stat st;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
892
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
893 #ifdef FEAT_BROWSE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
894 if (cmdmod.browse)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
895 {
28
726bdc53fa49 updated for version 7.0018
vimboss
parents: 16
diff changeset
896 browseFile = do_browse(0, (char_u *)_("Patch file"),
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
897 eap->arg, NULL, NULL, BROWSE_FILTER_ALL_FILES, NULL);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
898 if (browseFile == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
899 return; /* operation cancelled */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
900 eap->arg = browseFile;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
901 cmdmod.browse = FALSE; /* don't let do_ecmd() browse again */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
902 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
903 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
904
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
905 /* We need two temp file names. */
6721
7347229a646a updated for version 7.4.684
Bram Moolenaar <bram@vim.org>
parents: 6314
diff changeset
906 tmp_orig = vim_tempname('o', FALSE);
7347229a646a updated for version 7.4.684
Bram Moolenaar <bram@vim.org>
parents: 6314
diff changeset
907 tmp_new = vim_tempname('n', FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
908 if (tmp_orig == NULL || tmp_new == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
909 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
910
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
911 /* Write the current buffer to "tmp_orig". */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
912 if (buf_write(curbuf, tmp_orig, NULL,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
913 (linenr_T)1, curbuf->b_ml.ml_line_count,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
914 NULL, FALSE, FALSE, FALSE, TRUE) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
915 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
916
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
917 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
918 /* Get the absolute path of the patchfile, changing directory below. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
919 fullname = FullName_save(eap->arg, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
920 #endif
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
921 buflen = STRLEN(tmp_orig) + (
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
922 # ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
923 fullname != NULL ? STRLEN(fullname) :
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
924 # endif
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
925 STRLEN(eap->arg)) + STRLEN(tmp_new) + 16;
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
926 buf = alloc((unsigned)buflen);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
927 if (buf == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
928 goto theend;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
929
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
930 #ifdef UNIX
1788
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
931 /* Temporarily chdir to /tmp, to avoid patching files in the current
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
932 * directory when the patch file contains more than one patch. When we
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
933 * have our own temp dir use that instead, it will be cleaned up when we
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
934 * exit (any .rej files created). Don't change directory if we can't
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
935 * return to the current. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
936 if (mch_dirname(dirbuf, MAXPATHL) != OK || mch_chdir((char *)dirbuf) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
937 dirbuf[0] = NUL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
938 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
939 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
940 # ifdef TEMPDIRNAMES
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
941 if (vim_tempdir != NULL)
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
942 ignored = mch_chdir((char *)vim_tempdir);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
943 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
944 # endif
1757
f10fe14748e2 updated for version 7.2-055
vimboss
parents: 1519
diff changeset
945 ignored = mch_chdir("/tmp");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
946 shorten_fnames(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
947 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
948 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
949
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
950 #ifdef FEAT_EVAL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
951 if (*p_pex != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
952 /* Use 'patchexpr' to generate the new file. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
953 eval_patch(tmp_orig,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
954 # ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
955 fullname != NULL ? fullname :
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
956 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
957 eap->arg, tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
958 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
959 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
960 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
961 /* Build the patch command and execute it. Ignore errors. Switch to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
962 * cooked mode to allow the user to respond to prompts. */
1872
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
963 vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"",
f13849167330 updated for version 7.2-169
vimboss
parents: 1835
diff changeset
964 tmp_new, tmp_orig,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
965 # ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
966 fullname != NULL ? fullname :
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
967 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
968 eap->arg);
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
969 #ifdef FEAT_AUTOCMD
1410
cdd82acd75b4 updated for version 7.1-125
vimboss
parents: 1075
diff changeset
970 block_autocmds(); /* Avoid ShellCmdPost stuff */
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
971 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
972 (void)call_shell(buf, SHELL_FILTER | SHELL_COOKED);
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
973 #ifdef FEAT_AUTOCMD
1410
cdd82acd75b4 updated for version 7.1-125
vimboss
parents: 1075
diff changeset
974 unblock_autocmds();
828
01583c79d5f4 updated for version 7.0d03
vimboss
parents: 825
diff changeset
975 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
976 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
977
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
978 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
979 if (dirbuf[0] != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
980 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
981 if (mch_chdir((char *)dirbuf) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
982 EMSG(_(e_prev_dir));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
983 shorten_fnames(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
984 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
985 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
986
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
987 /* patch probably has written over the screen */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
988 redraw_later(CLEAR);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
989
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
990 /* Delete any .orig or .rej file created. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
991 STRCPY(buf, tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
992 STRCAT(buf, ".orig");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
993 mch_remove(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
994 STRCPY(buf, tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
995 STRCAT(buf, ".rej");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
996 mch_remove(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
997
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
998 /* Only continue if the output file was created. */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
999 if (mch_stat((char *)tmp_new, &st) < 0 || st.st_size == 0)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1000 EMSG(_("E816: Cannot read patch output"));
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1001 else
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1002 {
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1003 if (curbuf->b_fname != NULL)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1004 {
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1005 newname = vim_strnsave(curbuf->b_fname,
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1006 (int)(STRLEN(curbuf->b_fname) + 4));
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1007 if (newname != NULL)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1008 STRCAT(newname, ".new");
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1009 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1010
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1011 #ifdef FEAT_GUI
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1012 need_mouse_correct = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1013 #endif
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1014 /* don't use a new tab page, each tab page has its own diffs */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1015 cmdmod.tab = 0;
682
f1b013312711 updated for version 7.0205
vimboss
parents: 681
diff changeset
1016
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1017 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1018 {
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1019 /* Pretend it was a ":split fname" command */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1020 eap->cmdidx = CMD_split;
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1021 eap->arg = tmp_new;
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1022 do_exedit(eap, old_curwin);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1023
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1024 /* check that split worked and editing tmp_new */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1025 if (curwin != old_curwin && win_valid(old_curwin))
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1026 {
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1027 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1028 diff_win_options(curwin, TRUE);
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1029 diff_win_options(old_curwin, TRUE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1030
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1031 if (newname != NULL)
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1032 {
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1033 /* do a ":file filename.new" on the patched buffer */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1034 eap->arg = newname;
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1035 ex_file(eap);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1036
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1037 #ifdef FEAT_AUTOCMD
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1038 /* Do filetype detection with the new name. */
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1039 if (au_has_group((char_u *)"filetypedetect"))
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1040 do_cmdline_cmd((char_u *)":doau filetypedetect BufRead");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1041 #endif
1942
fe26299d6f70 updated for version 7.2-239
vimboss
parents: 1876
diff changeset
1042 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1043 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1044 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1045 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1046
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1047 theend:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1048 if (tmp_orig != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1049 mch_remove(tmp_orig);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1050 vim_free(tmp_orig);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1051 if (tmp_new != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1052 mch_remove(tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1053 vim_free(tmp_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1054 vim_free(newname);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1055 vim_free(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1056 #ifdef UNIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1057 vim_free(fullname);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1058 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1059 #ifdef FEAT_BROWSE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1060 vim_free(browseFile);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1061 cmdmod.browse = browse_flag;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1062 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1063 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1064
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1065 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1066 * Split the window and edit another file, setting options to show the diffs.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1067 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1068 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1069 ex_diffsplit(exarg_T *eap)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1070 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1071 win_T *old_curwin = curwin;
7338
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1072 buf_T *old_curbuf = curbuf;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1073
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1074 #ifdef FEAT_GUI
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1075 need_mouse_correct = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1076 #endif
682
f1b013312711 updated for version 7.0205
vimboss
parents: 681
diff changeset
1077 /* don't use a new tab page, each tab page has its own diffs */
f1b013312711 updated for version 7.0205
vimboss
parents: 681
diff changeset
1078 cmdmod.tab = 0;
f1b013312711 updated for version 7.0205
vimboss
parents: 681
diff changeset
1079
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1080 if (win_split(0, (diff_flags & DIFF_VERTICAL) ? WSP_VERT : 0) != FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1081 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1082 /* Pretend it was a ":split fname" command */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1083 eap->cmdidx = CMD_split;
449
3709cf52b9b5 updated for version 7.0119
vimboss
parents: 358
diff changeset
1084 curwin->w_p_diff = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1085 do_exedit(eap, old_curwin);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1086
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1087 if (curwin != old_curwin) /* split must have worked */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1088 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1089 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1090 diff_win_options(curwin, TRUE);
7338
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1091 if (win_valid(old_curwin))
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1092 {
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1093 diff_win_options(old_curwin, TRUE);
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1094
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1095 if (buf_valid(old_curbuf))
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1096 /* Move the cursor position to that of the old window. */
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1097 curwin->w_cursor.lnum = diff_get_corresponding_line(
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1098 old_curbuf,
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1099 old_curwin->w_cursor.lnum,
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1100 curbuf,
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1101 curwin->w_cursor.lnum);
96d5dd9e7bc9 commit https://github.com/vim/vim/commit/f29a82dcd0914c76f595d475ddac4517371fab2b
Christian Brabandt <cb@256bit.org>
parents: 6985
diff changeset
1102 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1103 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1104 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1105 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1106
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1107 /*
4352
04736b4030ec updated for version 7.3.925
Bram Moolenaar <bram@vim.org>
parents: 4236
diff changeset
1108 * Set options to show diffs for the current window.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1109 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1110 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1111 ex_diffthis(exarg_T *eap UNUSED)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1112 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1113 /* Set 'diff', 'scrollbind' on and 'wrap' off. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1114 diff_win_options(curwin, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1115 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1116
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1117 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1118 * Set options in window "wp" for diff mode.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1119 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1120 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1121 diff_win_options(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1122 win_T *wp,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1123 int addbuf) /* Add buffer to diff. */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1124 {
2086
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1125 # ifdef FEAT_FOLDING
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1126 win_T *old_curwin = curwin;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1127
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1128 /* close the manually opened folds */
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1129 curwin = wp;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1130 newFoldLevel();
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1131 curwin = old_curwin;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1132 # endif
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1133
2583
7c2e6ba1d702 updated for version 7.3.008
Bram Moolenaar <bram@vim.org>
parents: 2445
diff changeset
1134 /* Use 'scrollbind' and 'cursorbind' when available */
7c2e6ba1d702 updated for version 7.3.008
Bram Moolenaar <bram@vim.org>
parents: 2445
diff changeset
1135 #ifdef FEAT_SCROLLBIND
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1136 if (!wp->w_p_diff)
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1137 wp->w_p_scb_save = wp->w_p_scb;
2583
7c2e6ba1d702 updated for version 7.3.008
Bram Moolenaar <bram@vim.org>
parents: 2445
diff changeset
1138 wp->w_p_scb = TRUE;
7c2e6ba1d702 updated for version 7.3.008
Bram Moolenaar <bram@vim.org>
parents: 2445
diff changeset
1139 #endif
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
1140 #ifdef FEAT_CURSORBIND
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1141 if (!wp->w_p_diff)
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1142 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
1143 wp->w_p_crb = TRUE;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
1144 #endif
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1145 if (!wp->w_p_diff)
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1146 wp->w_p_wrap_save = wp->w_p_wrap;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1147 wp->w_p_wrap = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1148 # ifdef FEAT_FOLDING
2086
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1149 curwin = wp;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1150 curbuf = curwin->w_buffer;
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1151 if (!wp->w_p_diff)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1152 {
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1153 if (wp->w_p_diff_saved)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1154 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
1155 wp->w_p_fdm_save = vim_strsave(wp->w_p_fdm);
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1156 }
2086
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1157 set_string_option_direct((char_u *)"fdm", -1, (char_u *)"diff",
694
07d199fe02ed updated for version 7.0209
vimboss
parents: 682
diff changeset
1158 OPT_LOCAL|OPT_FREE, 0);
2086
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1159 curwin = old_curwin;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1160 curbuf = curwin->w_buffer;
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1161 if (!wp->w_p_diff)
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1162 {
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1163 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
1164 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
1165 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
1166 }
2086
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1167 wp->w_p_fdc = diff_foldcolumn;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1168 wp->w_p_fen = TRUE;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1169 wp->w_p_fdl = 0;
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1170 foldUpdateAll(wp);
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1171 /* make sure topline is not halfway a fold */
c11845a465ae updated for version 7.2.370
Bram Moolenaar <bram@zimbu.org>
parents: 1942
diff changeset
1172 changed_window_setting_win(wp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1173 # endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1174 #ifdef FEAT_SCROLLBIND
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1175 if (vim_strchr(p_sbo, 'h') == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1176 do_cmdline_cmd((char_u *)"set sbo+=hor");
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1177 #endif
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1178 /* Saved the current values, to be restored in ex_diffoff(). */
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1179 wp->w_p_diff_saved = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1180
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1181 wp->w_p_diff = TRUE;
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1182
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1183 if (addbuf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1184 diff_buf_add(wp->w_buffer);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1185 redraw_win_later(wp, NOT_VALID);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1186 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1187
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1188 /*
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1189 * Set options not to show diffs. For the current window or all windows.
671
83a006f81bac updated for version 7.0199
vimboss
parents: 648
diff changeset
1190 * Only in the current tab page.
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1191 */
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1192 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1193 ex_diffoff(exarg_T *eap)
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1194 {
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1195 win_T *wp;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1196 #ifdef FEAT_SCROLLBIND
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1197 int diffwin = FALSE;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1198 #endif
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1199
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1200 for (wp = firstwin; wp != NULL; wp = wp->w_next)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1201 {
5358
b21b5dcdca21 updated for version 7.4.031
Bram Moolenaar <bram@vim.org>
parents: 5200
diff changeset
1202 if (eap->forceit ? wp->w_p_diff : wp == curwin)
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1203 {
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1204 /* Set 'diff' off. If option values were saved in
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1205 * diff_win_options(), restore the ones whose settings seem to have
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1206 * been left over from diff mode. */
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1207 wp->w_p_diff = FALSE;
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1208
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1209 if (wp->w_p_diff_saved)
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1210 {
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1211
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1212 #ifdef FEAT_SCROLLBIND
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1213 if (wp->w_p_scb)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1214 wp->w_p_scb = wp->w_p_scb_save;
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1215 #endif
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1216 #ifdef FEAT_CURSORBIND
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1217 if (wp->w_p_crb)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1218 wp->w_p_crb = wp->w_p_crb_save;
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1219 #endif
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1220 if (!wp->w_p_wrap)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1221 wp->w_p_wrap = wp->w_p_wrap_save;
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1222 #ifdef FEAT_FOLDING
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1223 free_string_option(wp->w_p_fdm);
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1224 wp->w_p_fdm = vim_strsave(wp->w_p_fdm_save);
5200
b3ff17862b4c updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents: 5102
diff changeset
1225
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1226 if (wp->w_p_fdc == diff_foldcolumn)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1227 wp->w_p_fdc = wp->w_p_fdc_save;
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1228 if (wp->w_p_fdl == 0)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1229 wp->w_p_fdl = wp->w_p_fdl_save;
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1230
5200
b3ff17862b4c updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents: 5102
diff changeset
1231 /* Only restore 'foldenable' when 'foldmethod' is not
b3ff17862b4c updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents: 5102
diff changeset
1232 * "manual", otherwise we continue to show the diff folds. */
6897
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1233 if (wp->w_p_fen)
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1234 wp->w_p_fen = foldmethodIsManual(wp) ? FALSE
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1235 : wp->w_p_fen_save;
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1236
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1237 foldUpdateAll(wp);
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1238 /* make sure topline is not halfway a fold */
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1239 changed_window_setting_win(wp);
d3a23af4bba1 patch 7.4.768
Bram Moolenaar <bram@vim.org>
parents: 6721
diff changeset
1240 #endif
5200
b3ff17862b4c updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents: 5102
diff changeset
1241 }
b3ff17862b4c updated for version 7.4a.026
Bram Moolenaar <bram@vim.org>
parents: 5102
diff changeset
1242
5102
11d0c6df1d7b updated for version 7.3.1294
Bram Moolenaar <bram@vim.org>
parents: 4352
diff changeset
1243 /* Note: 'sbo' is not restored, it's a global option. */
16
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1244 diff_buf_adjust(wp);
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1245 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1246 #ifdef FEAT_SCROLLBIND
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1247 diffwin |= wp->w_p_diff;
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1248 #endif
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1249 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1250
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1251 #ifdef FEAT_SCROLLBIND
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1252 /* Remove "hor" from from 'scrollopt' if there are no diff windows left. */
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1253 if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1254 do_cmdline_cmd((char_u *)"set sbo-=hor");
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1255 #endif
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1256 }
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1257
3ba373b54370 updated for version 7.0008
vimboss
parents: 7
diff changeset
1258 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1259 * Read the diff output and add each entry to the diff list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1260 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1261 static void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1262 diff_read(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1263 int idx_orig, /* idx of original file */
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1264 int idx_new, /* idx of new file */
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1265 char_u *fname) /* name of diff output file */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1266 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1267 FILE *fd;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1268 diff_T *dprev = NULL;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1269 diff_T *dp = curtab->tp_first_diff;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1270 diff_T *dn, *dpl;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1271 long f1, l1, f2, l2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1272 char_u linebuf[LBUFLEN]; /* only need to hold the diff line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1273 int difftype;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1274 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1275 long off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1276 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1277 linenr_T lnum_orig, lnum_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1278 long count_orig, count_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1279 int notset = TRUE; /* block "*dp" not set yet */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1280
531
da9142bd190a updated for version 7.0149
vimboss
parents: 474
diff changeset
1281 fd = mch_fopen((char *)fname, "r");
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1282 if (fd == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1283 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1284 EMSG(_("E98: Cannot read diff output"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1285 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1286 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1287
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1288 for (;;)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1289 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1290 if (tag_fgets(linebuf, LBUFLEN, fd))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1291 break; /* end of file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1292 if (!isdigit(*linebuf))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1293 continue; /* not the start of a diff block */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1294
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1295 /* This line must be one of three formats:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1296 * {first}[,{last}]c{first}[,{last}]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1297 * {first}a{first}[,{last}]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1298 * {first}[,{last}]d{first}
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1299 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1300 p = linebuf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1301 f1 = getdigits(&p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1302 if (*p == ',')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1303 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1304 ++p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1305 l1 = getdigits(&p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1306 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1307 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1308 l1 = f1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1309 if (*p != 'a' && *p != 'c' && *p != 'd')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1310 continue; /* invalid diff format */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1311 difftype = *p++;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1312 f2 = getdigits(&p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1313 if (*p == ',')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1314 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1315 ++p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1316 l2 = getdigits(&p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1317 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1318 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1319 l2 = f2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1320 if (l1 < f1 || l2 < f2)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1321 continue; /* invalid line range */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1322
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1323 if (difftype == 'a')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1324 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1325 lnum_orig = f1 + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1326 count_orig = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1327 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1328 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1329 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1330 lnum_orig = f1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1331 count_orig = l1 - f1 + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1332 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1333 if (difftype == 'd')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1334 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1335 lnum_new = f2 + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1336 count_new = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1337 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1338 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1339 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1340 lnum_new = f2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1341 count_new = l2 - f2 + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1342 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1343
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1344 /* Go over blocks before the change, for which orig and new are equal.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1345 * Copy blocks from orig to new. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1346 while (dp != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1347 && lnum_orig > dp->df_lnum[idx_orig] + dp->df_count[idx_orig])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1348 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1349 if (notset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1350 diff_copy_entry(dprev, dp, idx_orig, idx_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1351 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1352 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1353 notset = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1354 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1355
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1356 if (dp != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1357 && lnum_orig <= dp->df_lnum[idx_orig] + dp->df_count[idx_orig]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1358 && lnum_orig + count_orig >= dp->df_lnum[idx_orig])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1359 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1360 /* New block overlaps with existing block(s).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1361 * First find last block that overlaps. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1362 for (dpl = dp; dpl->df_next != NULL; dpl = dpl->df_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1363 if (lnum_orig + count_orig < dpl->df_next->df_lnum[idx_orig])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1364 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1365
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1366 /* If the newly found block starts before the old one, set the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1367 * start back a number of lines. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1368 off = dp->df_lnum[idx_orig] - lnum_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1369 if (off > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1370 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1371 for (i = idx_orig; i < idx_new; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1372 if (curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1373 dp->df_lnum[i] -= off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1374 dp->df_lnum[idx_new] = lnum_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1375 dp->df_count[idx_new] = count_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1376 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1377 else if (notset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1378 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1379 /* new block inside existing one, adjust new block */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1380 dp->df_lnum[idx_new] = lnum_new + off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1381 dp->df_count[idx_new] = count_new - off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1382 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1383 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1384 /* second overlap of new block with existing block */
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1385 dp->df_count[idx_new] += count_new - count_orig
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1386 + dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1387 - (dp->df_lnum[idx_orig] + dp->df_count[idx_orig]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1388
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1389 /* Adjust the size of the block to include all the lines to the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1390 * end of the existing block or the new diff, whatever ends last. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1391 off = (lnum_orig + count_orig)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1392 - (dpl->df_lnum[idx_orig] + dpl->df_count[idx_orig]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1393 if (off < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1394 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1395 /* new change ends in existing block, adjust the end if not
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1396 * done already */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1397 if (notset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1398 dp->df_count[idx_new] += -off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1399 off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1400 }
1428
912b18745def updated for version 7.1-143
vimboss
parents: 1410
diff changeset
1401 for (i = idx_orig; i < idx_new; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1402 if (curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1403 dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1404 - dp->df_lnum[i] + off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1405
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1406 /* Delete the diff blocks that have been merged into one. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1407 dn = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1408 dp->df_next = dpl->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1409 while (dn != dp->df_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1410 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1411 dpl = dn->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1412 vim_free(dn);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1413 dn = dpl;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1414 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1415 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1416 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1417 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1418 /* Allocate a new diffblock. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1419 dp = diff_alloc_new(curtab, dprev, dp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1420 if (dp == NULL)
840
2c885fab04e3 updated for version 7.0e06
vimboss
parents: 835
diff changeset
1421 goto done;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1422
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1423 dp->df_lnum[idx_orig] = lnum_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1424 dp->df_count[idx_orig] = count_orig;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1425 dp->df_lnum[idx_new] = lnum_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1426 dp->df_count[idx_new] = count_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1427
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1428 /* Set values for other buffers, these must be equal to the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1429 * original buffer, otherwise there would have been a change
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1430 * already. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1431 for (i = idx_orig + 1; i < idx_new; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1432 if (curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1433 diff_copy_entry(dprev, dp, idx_orig, i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1434 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1435 notset = FALSE; /* "*dp" has been set */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1436 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1437
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1438 /* for remaining diff blocks orig and new are equal */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1439 while (dp != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1440 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1441 if (notset)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1442 diff_copy_entry(dprev, dp, idx_orig, idx_new);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1443 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1444 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1445 notset = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1446 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1447
840
2c885fab04e3 updated for version 7.0e06
vimboss
parents: 835
diff changeset
1448 done:
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1449 fclose(fd);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1450 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1451
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1452 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1453 * Copy an entry at "dp" from "idx_orig" to "idx_new".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1454 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1455 static void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1456 diff_copy_entry(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1457 diff_T *dprev,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1458 diff_T *dp,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1459 int idx_orig,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1460 int idx_new)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1461 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1462 long off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1463
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1464 if (dprev == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1465 off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1466 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1467 off = (dprev->df_lnum[idx_orig] + dprev->df_count[idx_orig])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1468 - (dprev->df_lnum[idx_new] + dprev->df_count[idx_new]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1469 dp->df_lnum[idx_new] = dp->df_lnum[idx_orig] - off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1470 dp->df_count[idx_new] = dp->df_count[idx_orig];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1471 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1472
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1473 /*
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1474 * Clear the list of diffblocks for tab page "tp".
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1475 */
358
e111db373ca4 updated for version 7.0093
vimboss
parents: 193
diff changeset
1476 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1477 diff_clear(tabpage_T *tp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1478 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1479 diff_T *p, *next_p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1480
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1481 for (p = tp->tp_first_diff; p != NULL; p = next_p)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1482 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1483 next_p = p->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1484 vim_free(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1485 }
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1486 tp->tp_first_diff = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1487 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1488
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1489 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1490 * Check diff status for line "lnum" in buffer "buf":
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1491 * Returns 0 for nothing special
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1492 * Returns -1 for a line that should be highlighted as changed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1493 * Returns -2 for a line that should be highlighted as added/deleted.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1494 * Returns > 0 for inserting that many filler lines above it (never happens
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1495 * when 'diffopt' doesn't contain "filler").
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1496 * This should only be used for windows where 'diff' is set.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1497 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1498 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1499 diff_check(win_T *wp, linenr_T lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1500 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1501 int idx; /* index in tp_diffbuf[] for this buffer */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1502 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1503 int maxcount;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1504 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1505 buf_T *buf = wp->w_buffer;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1506 int cmp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1507
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1508 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1509 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1510
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1511 if (curtab->tp_first_diff == NULL || !wp->w_p_diff) /* no diffs at all */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1512 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1513
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1514 /* safety check: "lnum" must be a buffer line */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1515 if (lnum < 1 || lnum > buf->b_ml.ml_line_count + 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1516 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1517
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1518 idx = diff_buf_idx(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1519 if (idx == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1520 return 0; /* no diffs for buffer "buf" */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1521
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1522 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1523 /* A closed fold never has filler lines. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1524 if (hasFoldingWin(wp, lnum, NULL, NULL, TRUE, NULL))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1525 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1526 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1527
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1528 /* search for a change that includes "lnum" in the list of diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1529 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1530 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1531 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1532 if (dp == NULL || lnum < dp->df_lnum[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1533 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1534
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1535 if (lnum < dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1536 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1537 int zero = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1538
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1539 /* Changed or inserted line. If the other buffers have a count of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1540 * zero, the lines were inserted. If the other buffers have the same
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1541 * count, check if the lines are identical. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1542 cmp = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1543 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1544 if (i != idx && curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1545 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1546 if (dp->df_count[i] == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1547 zero = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1548 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1549 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1550 if (dp->df_count[i] != dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1551 return -1; /* nr of lines changed. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1552 cmp = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1553 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1554 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1555 if (cmp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1556 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1557 /* Compare all lines. If they are equal the lines were inserted
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1558 * in some buffers, deleted in others, but not changed. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1559 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1560 if (i != idx && curtab->tp_diffbuf[i] != NULL && dp->df_count[i] != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1561 if (!diff_equal_entry(dp, idx, i))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1562 return -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1563 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1564 /* If there is no buffer with zero lines then there is no difference
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1565 * any longer. Happens when making a change (or undo) that removes
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1566 * the difference. Can't remove the entry here, we might be halfway
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1567 * updating the window. Just report the text as unchanged. Other
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1568 * windows might still show the change though. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1569 if (zero == FALSE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1570 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1571 return -2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1572 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1573
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1574 /* If 'diffopt' doesn't contain "filler", return 0. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1575 if (!(diff_flags & DIFF_FILLER))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1576 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1577
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1578 /* Insert filler lines above the line just below the change. Will return
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1579 * 0 when this buf had the max count. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1580 maxcount = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1581 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1582 if (curtab->tp_diffbuf[i] != NULL && dp->df_count[i] > maxcount)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1583 maxcount = dp->df_count[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1584 return maxcount - dp->df_count[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1585 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1586
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1587 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1588 * Compare two entries in diff "*dp" and return TRUE if they are equal.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1589 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1590 static int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1591 diff_equal_entry(diff_T *dp, int idx1, int idx2)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1592 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1593 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1594 char_u *line;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1595 int cmp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1596
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1597 if (dp->df_count[idx1] != dp->df_count[idx2])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1598 return FALSE;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1599 if (diff_check_sanity(curtab, dp) == FAIL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1600 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1601 for (i = 0; i < dp->df_count[idx1]; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1602 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1603 line = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx1],
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1604 dp->df_lnum[idx1] + i, FALSE));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1605 if (line == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1606 return FALSE;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1607 cmp = diff_cmp(line, ml_get_buf(curtab->tp_diffbuf[idx2],
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1608 dp->df_lnum[idx2] + i, FALSE));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1609 vim_free(line);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1610 if (cmp != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1611 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1612 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1613 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1614 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1615
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1616 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1617 * Compare strings "s1" and "s2" according to 'diffopt'.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1618 * Return non-zero when they are different.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1619 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1620 static int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1621 diff_cmp(char_u *s1, char_u *s2)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1622 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1623 char_u *p1, *p2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1624 #ifdef FEAT_MBYTE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1625 int l;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1626 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1627
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1628 if ((diff_flags & (DIFF_ICASE | DIFF_IWHITE)) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1629 return STRCMP(s1, s2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1630 if ((diff_flags & DIFF_ICASE) && !(diff_flags & DIFF_IWHITE))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1631 return MB_STRICMP(s1, s2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1632
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1633 /* Ignore white space changes and possibly ignore case. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1634 p1 = s1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1635 p2 = s2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1636 while (*p1 != NUL && *p2 != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1637 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1638 if (vim_iswhite(*p1) && vim_iswhite(*p2))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1639 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1640 p1 = skipwhite(p1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1641 p2 = skipwhite(p2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1642 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1643 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1644 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1645 #ifdef FEAT_MBYTE
474
a5fcf36ef512 updated for version 7.0127
vimboss
parents: 449
diff changeset
1646 l = (*mb_ptr2len)(p1);
a5fcf36ef512 updated for version 7.0127
vimboss
parents: 449
diff changeset
1647 if (l != (*mb_ptr2len)(p2))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1648 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1649 if (l > 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1650 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1651 if (STRNCMP(p1, p2, l) != 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1652 && (!enc_utf8
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1653 || !(diff_flags & DIFF_ICASE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1654 || utf_fold(utf_ptr2char(p1))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1655 != utf_fold(utf_ptr2char(p2))))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1656 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1657 p1 += l;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1658 p2 += l;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1659 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1660 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1661 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1662 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1663 if (*p1 != *p2 && (!(diff_flags & DIFF_ICASE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1664 || TOLOWER_LOC(*p1) != TOLOWER_LOC(*p2)))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1665 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1666 ++p1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1667 ++p2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1668 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1669 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1670 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1671
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1672 /* Ignore trailing white space. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1673 p1 = skipwhite(p1);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1674 p2 = skipwhite(p2);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1675 if (*p1 != NUL || *p2 != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1676 return 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1677 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1678 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1679
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1680 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1681 * Return the number of filler lines above "lnum".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1682 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1683 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1684 diff_check_fill(win_T *wp, linenr_T lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1685 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1686 int n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1687
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1688 /* be quick when there are no filler lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1689 if (!(diff_flags & DIFF_FILLER))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1690 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1691 n = diff_check(wp, lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1692 if (n <= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1693 return 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1694 return n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1695 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1696
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1697 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1698 * Set the topline of "towin" to match the position in "fromwin", so that they
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1699 * show the same diff'ed lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1700 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1701 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1702 diff_set_topline(win_T *fromwin, win_T *towin)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1703 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1704 buf_T *frombuf = fromwin->w_buffer;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1705 linenr_T lnum = fromwin->w_topline;
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1706 int fromidx;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1707 int toidx;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1708 diff_T *dp;
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1709 int max_count;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1710 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1711
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1712 fromidx = diff_buf_idx(frombuf);
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1713 if (fromidx == DB_COUNT)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1714 return; /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1715
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1716 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1717 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1718
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1719 towin->w_topfill = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1720
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1721 /* search for a change that includes "lnum" in the list of diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1722 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1723 if (lnum <= dp->df_lnum[fromidx] + dp->df_count[fromidx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1724 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1725 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1726 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1727 /* After last change, compute topline relative to end of file; no
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1728 * filler lines. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1729 towin->w_topline = towin->w_buffer->b_ml.ml_line_count
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1730 - (frombuf->b_ml.ml_line_count - lnum);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1731 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1732 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1733 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1734 /* Find index for "towin". */
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1735 toidx = diff_buf_idx(towin->w_buffer);
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1736 if (toidx == DB_COUNT)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1737 return; /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1738
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1739 towin->w_topline = lnum + (dp->df_lnum[toidx] - dp->df_lnum[fromidx]);
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1740 if (lnum >= dp->df_lnum[fromidx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1741 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1742 /* Inside a change: compute filler lines. With three or more
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1743 * buffers we need to know the largest count. */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1744 max_count = 0;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1745 for (i = 0; i < DB_COUNT; ++i)
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1746 if (curtab->tp_diffbuf[i] != NULL
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1747 && max_count < dp->df_count[i])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1748 max_count = dp->df_count[i];
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1749
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1750 if (dp->df_count[toidx] == dp->df_count[fromidx])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1751 {
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1752 /* same number of lines: use same filler count */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1753 towin->w_topfill = fromwin->w_topfill;
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1754 }
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1755 else if (dp->df_count[toidx] > dp->df_count[fromidx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1756 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1757 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1758 {
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1759 /* more lines in towin and fromwin doesn't show diff
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1760 * lines, only filler lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1761 if (max_count - fromwin->w_topfill >= dp->df_count[toidx])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1762 {
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1763 /* towin also only shows filler lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1764 towin->w_topline = dp->df_lnum[toidx]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1765 + dp->df_count[toidx];
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1766 towin->w_topfill = fromwin->w_topfill;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1767 }
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1768 else
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1769 /* towin still has some diff lines to show */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1770 towin->w_topline = dp->df_lnum[toidx]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1771 + max_count - fromwin->w_topfill;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1772 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1773 }
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1774 else if (towin->w_topline >= dp->df_lnum[toidx]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1775 + dp->df_count[toidx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1776 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1777 /* less lines in towin and no diff lines to show: compute
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1778 * filler lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1779 towin->w_topline = dp->df_lnum[toidx] + dp->df_count[toidx];
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1780 if (diff_flags & DIFF_FILLER)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1781 {
1519
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1782 if (lnum == dp->df_lnum[fromidx] + dp->df_count[fromidx])
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1783 /* fromwin is also out of diff lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1784 towin->w_topfill = fromwin->w_topfill;
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1785 else
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1786 /* fromwin has some diff lines */
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1787 towin->w_topfill = dp->df_lnum[fromidx]
17c88d44ace9 updated for version 7.1-234
vimboss
parents: 1429
diff changeset
1788 + max_count - lnum;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1789 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1790 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1791 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1792 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1793
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1794 /* safety check (if diff info gets outdated strange things may happen) */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1795 towin->w_botfill = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1796 if (towin->w_topline > towin->w_buffer->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1797 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1798 towin->w_topline = towin->w_buffer->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1799 towin->w_botfill = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1800 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1801 if (towin->w_topline < 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1802 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1803 towin->w_topline = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1804 towin->w_topfill = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1805 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1806
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1807 /* When w_topline changes need to recompute w_botline and cursor position */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1808 invalidate_botline_win(towin);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1809 changed_line_abv_curs_win(towin);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1810
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1811 check_topfill(towin, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1812 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1813 (void)hasFoldingWin(towin, towin->w_topline, &towin->w_topline,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1814 NULL, TRUE, NULL);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1815 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1816 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1817
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1818 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1819 * This is called when 'diffopt' is changed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1820 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1821 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1822 diffopt_changed(void)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1823 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1824 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1825 int diff_context_new = 6;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1826 int diff_flags_new = 0;
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1827 int diff_foldcolumn_new = 2;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1828 tabpage_T *tp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1829
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1830 p = p_dip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1831 while (*p != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1832 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1833 if (STRNCMP(p, "filler", 6) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1834 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1835 p += 6;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1836 diff_flags_new |= DIFF_FILLER;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1837 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1838 else if (STRNCMP(p, "context:", 8) == 0 && VIM_ISDIGIT(p[8]))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1839 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1840 p += 8;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1841 diff_context_new = getdigits(&p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1842 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1843 else if (STRNCMP(p, "icase", 5) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1844 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1845 p += 5;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1846 diff_flags_new |= DIFF_ICASE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1847 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1848 else if (STRNCMP(p, "iwhite", 6) == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1849 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1850 p += 6;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1851 diff_flags_new |= DIFF_IWHITE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1852 }
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1853 else if (STRNCMP(p, "horizontal", 10) == 0)
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1854 {
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1855 p += 10;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1856 diff_flags_new |= DIFF_HORIZONTAL;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1857 }
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1858 else if (STRNCMP(p, "vertical", 8) == 0)
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1859 {
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1860 p += 8;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1861 diff_flags_new |= DIFF_VERTICAL;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1862 }
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1863 else if (STRNCMP(p, "foldcolumn:", 11) == 0 && VIM_ISDIGIT(p[11]))
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1864 {
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1865 p += 11;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1866 diff_foldcolumn_new = getdigits(&p);
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1867 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1868 if (*p != ',' && *p != NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1869 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1870 if (*p == ',')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1871 ++p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1872 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1873
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1874 /* Can't have both "horizontal" and "vertical". */
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1875 if ((diff_flags_new & DIFF_HORIZONTAL) && (diff_flags_new & DIFF_VERTICAL))
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1876 return FAIL;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1877
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1878 /* If "icase" or "iwhite" was added or removed, need to update the diff. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1879 if (diff_flags != diff_flags_new)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1880 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1881 tp->tp_diff_invalid = TRUE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1882
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1883 diff_flags = diff_flags_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1884 diff_context = diff_context_new;
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1885 diff_foldcolumn = diff_foldcolumn_new;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1886
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1887 diff_redraw(TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1888
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1889 /* recompute the scroll binding with the new option value, may
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1890 * remove or add filler lines */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1891 check_scrollbind((linenr_T)0, 0L);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1892
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1893 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1894 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1895
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1896 /*
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1897 * Return TRUE if 'diffopt' contains "horizontal".
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1898 */
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1899 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1900 diffopt_horizontal(void)
764
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1901 {
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1902 return (diff_flags & DIFF_HORIZONTAL) != 0;
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1903 }
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1904
986753bbc441 updated for version 7.0225
vimboss
parents: 738
diff changeset
1905 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1906 * Find the difference within a changed line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1907 * Returns TRUE if the line was added, no other buffer has it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1908 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1909 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1910 diff_find_change(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1911 win_T *wp,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1912 linenr_T lnum,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1913 int *startp, /* first char of the change */
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
1914 int *endp) /* last char of the change */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1915 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1916 char_u *line_org;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1917 char_u *line_new;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1918 int i;
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1919 int si_org, si_new;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1920 int ei_org, ei_new;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1921 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1922 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1923 int off;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1924 int added = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1925
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1926 /* Make a copy of the line, the next ml_get() will invalidate it. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1927 line_org = vim_strsave(ml_get_buf(wp->w_buffer, lnum, FALSE));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1928 if (line_org == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1929 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1930
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1931 idx = diff_buf_idx(wp->w_buffer);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1932 if (idx == DB_COUNT) /* cannot happen */
1074
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
1933 {
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
1934 vim_free(line_org);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1935 return FALSE;
1074
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
1936 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1937
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1938 /* search for a change that includes "lnum" in the list of diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1939 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1940 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1941 break;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1942 if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
1074
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
1943 {
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
1944 vim_free(line_org);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1945 return FALSE;
1074
a112fdce9ebd updated for version 7.0-200
vimboss
parents: 840
diff changeset
1946 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1947
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1948 off = lnum - dp->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1949
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1950 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
1951 if (curtab->tp_diffbuf[i] != NULL && i != idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1952 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1953 /* Skip lines that are not in the other change (filler lines). */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1954 if (off >= dp->df_count[i])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1955 continue;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1956 added = FALSE;
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1957 line_new = ml_get_buf(curtab->tp_diffbuf[i],
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1958 dp->df_lnum[i] + off, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1959
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1960 /* Search for start of difference */
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1961 si_org = si_new = 0;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1962 while (line_org[si_org] != NUL)
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1963 {
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1964 if ((diff_flags & DIFF_IWHITE)
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1965 && vim_iswhite(line_org[si_org])
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1966 && vim_iswhite(line_new[si_new]))
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1967 {
835
8bebcabccc2c updated for version 7.0e01
vimboss
parents: 829
diff changeset
1968 si_org = (int)(skipwhite(line_org + si_org) - line_org);
8bebcabccc2c updated for version 7.0e01
vimboss
parents: 829
diff changeset
1969 si_new = (int)(skipwhite(line_new + si_new) - line_new);
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1970 }
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1971 else
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1972 {
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1973 if (line_org[si_org] != line_new[si_new])
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1974 break;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1975 ++si_org;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1976 ++si_new;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1977 }
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1978 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1979 #ifdef FEAT_MBYTE
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1980 if (has_mbyte)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1981 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1982 /* Move back to first byte of character in both lines (may
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1983 * have "nn^" in line_org and "n^ in line_new). */
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1984 si_org -= (*mb_head_off)(line_org, line_org + si_org);
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1985 si_new -= (*mb_head_off)(line_new, line_new + si_new);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1986 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1987 #endif
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1988 if (*startp > si_org)
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1989 *startp = si_org;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1990
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1991 /* Search for end of difference, if any. */
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1992 if (line_org[si_org] != NUL || line_new[si_new] != NUL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1993 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1994 ei_org = (int)STRLEN(line_org);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1995 ei_new = (int)STRLEN(line_new);
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1996 while (ei_org >= *startp && ei_new >= si_new
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1997 && ei_org >= 0 && ei_new >= 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1998 {
829
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
1999 if ((diff_flags & DIFF_IWHITE)
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2000 && vim_iswhite(line_org[ei_org])
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2001 && vim_iswhite(line_new[ei_new]))
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2002 {
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2003 while (ei_org >= *startp
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2004 && vim_iswhite(line_org[ei_org]))
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2005 --ei_org;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2006 while (ei_new >= si_new
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2007 && vim_iswhite(line_new[ei_new]))
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2008 --ei_new;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2009 }
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2010 else
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2011 {
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2012 if (line_org[ei_org] != line_new[ei_new])
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2013 break;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2014 --ei_org;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2015 --ei_new;
dc8197342755 updated for version 7.0d04
vimboss
parents: 828
diff changeset
2016 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2017 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2018 if (*endp < ei_org)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2019 *endp = ei_org;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2020 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2021 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2022
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2023 vim_free(line_org);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2024 return added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2025 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2026
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2027 #if defined(FEAT_FOLDING) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2028 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2029 * Return TRUE if line "lnum" is not close to a diff block, this line should
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2030 * be in a fold.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2031 * Return FALSE if there are no diff blocks at all in this window.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2032 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2033 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2034 diff_infold(win_T *wp, linenr_T lnum)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2035 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2036 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2037 int idx = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2038 int other = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2039 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2040
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2041 /* Return if 'diff' isn't set. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2042 if (!wp->w_p_diff)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2043 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2044
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2045 for (i = 0; i < DB_COUNT; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2046 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2047 if (curtab->tp_diffbuf[i] == wp->w_buffer)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2048 idx = i;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2049 else if (curtab->tp_diffbuf[i] != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2050 other = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2051 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2052
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2053 /* return here if there are no diffs in the window */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2054 if (idx == -1 || !other)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2055 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2056
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2057 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2058 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2059
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2060 /* Return if there are no diff blocks. All lines will be folded. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2061 if (curtab->tp_first_diff == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2062 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2063
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2064 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2065 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2066 /* If this change is below the line there can't be any further match. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2067 if (dp->df_lnum[idx] - diff_context > lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2068 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2069 /* If this change ends before the line we have a match. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2070 if (dp->df_lnum[idx] + dp->df_count[idx] + diff_context > lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2071 return FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2072 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2073 return TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2074 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2075 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2076
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2077 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2078 * "dp" and "do" commands.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2079 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2080 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2081 nv_diffgetput(int put, long count)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2082 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2083 exarg_T ea;
6314
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2084 char_u buf[30];
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2085
6314
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2086 if (count == 0)
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2087 ea.arg = (char_u *)"";
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2088 else
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2089 {
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2090 vim_snprintf((char *)buf, 30, "%ld", count);
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2091 ea.arg = buf;
df92c2b2a179 updated for version 7.4.490
Bram Moolenaar <bram@vim.org>
parents: 6286
diff changeset
2092 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2093 if (put)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2094 ea.cmdidx = CMD_diffput;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2095 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2096 ea.cmdidx = CMD_diffget;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2097 ea.addr_count = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2098 ea.line1 = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2099 ea.line2 = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2100 ex_diffgetput(&ea);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2101 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2102
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2103 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2104 * ":diffget"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2105 * ":diffput"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2106 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2107 void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2108 ex_diffgetput(exarg_T *eap)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2109 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2110 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2111 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2112 linenr_T off = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2113 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2114 diff_T *dprev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2115 diff_T *dfree;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2116 int idx_cur;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2117 int idx_other;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2118 int idx_from;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2119 int idx_to;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2120 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2121 int added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2122 char_u *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2123 aco_save_T aco;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2124 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2125 int start_skip, end_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2126 int new_count;
648
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2127 int buf_empty;
1075
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2128 int found_not_ma = FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2129
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2130 /* Find the current buffer in the list of diff buffers. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2131 idx_cur = diff_buf_idx(curbuf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2132 if (idx_cur == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2133 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2134 EMSG(_("E99: Current buffer is not in diff mode"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2135 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2136 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2137
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2138 if (*eap->arg == NUL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2139 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2140 /* No argument: Find the other buffer in the list of diff buffers. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2141 for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2142 if (curtab->tp_diffbuf[idx_other] != curbuf
1075
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2143 && curtab->tp_diffbuf[idx_other] != NULL)
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2144 {
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2145 if (eap->cmdidx != CMD_diffput
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2146 || curtab->tp_diffbuf[idx_other]->b_p_ma)
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2147 break;
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2148 found_not_ma = TRUE;
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2149 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2150 if (idx_other == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2151 {
1075
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2152 if (found_not_ma)
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2153 EMSG(_("E793: No other buffer in diff mode is modifiable"));
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2154 else
21ce954cbdca updated for version 7.0-201
vimboss
parents: 1074
diff changeset
2155 EMSG(_("E100: No other buffer in diff mode"));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2156 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2157 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2158
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2159 /* Check that there isn't a third buffer in the list */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2160 for (i = idx_other + 1; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2161 if (curtab->tp_diffbuf[i] != curbuf
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2162 && curtab->tp_diffbuf[i] != NULL
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2163 && (eap->cmdidx != CMD_diffput || curtab->tp_diffbuf[i]->b_p_ma))
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2164 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2165 EMSG(_("E101: More than two buffers in diff mode, don't know which one to use"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2166 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2167 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2168 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2169 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2170 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2171 /* Buffer number or pattern given. Ignore trailing white space. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2172 p = eap->arg + STRLEN(eap->arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2173 while (p > eap->arg && vim_iswhite(p[-1]))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2174 --p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2175 for (i = 0; vim_isdigit(eap->arg[i]) && eap->arg + i < p; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2176 ;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2177 if (eap->arg + i == p) /* digits only */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2178 i = atol((char *)eap->arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2179 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2180 {
4236
23ce9a61bdc2 updated for version 7.3.869
Bram Moolenaar <bram@vim.org>
parents: 3904
diff changeset
2181 i = buflist_findpat(eap->arg, p, FALSE, TRUE, FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2182 if (i < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2183 return; /* error message already given */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2184 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2185 buf = buflist_findnr(i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2186 if (buf == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2187 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2188 EMSG2(_("E102: Can't find buffer \"%s\""), eap->arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2189 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2190 }
1788
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
2191 if (buf == curbuf)
61d080cb268e updated for version 7.2-086
vimboss
parents: 1761
diff changeset
2192 return; /* nothing to do */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2193 idx_other = diff_buf_idx(buf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2194 if (idx_other == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2195 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2196 EMSG2(_("E103: Buffer \"%s\" is not in diff mode"), eap->arg);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2197 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2198 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2199 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2200
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2201 diff_busy = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2202
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2203 /* When no range given include the line above or below the cursor. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2204 if (eap->addr_count == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2205 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2206 /* Make it possible that ":diffget" on the last line gets line below
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2207 * the cursor line when there is no difference above the cursor. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2208 if (eap->cmdidx == CMD_diffget
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2209 && eap->line1 == curbuf->b_ml.ml_line_count
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2210 && diff_check(curwin, eap->line1) == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2211 && (eap->line1 == 1 || diff_check(curwin, eap->line1 - 1) == 0))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2212 ++eap->line2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2213 else if (eap->line1 > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2214 --eap->line1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2215 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2216
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2217 if (eap->cmdidx == CMD_diffget)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2218 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2219 idx_from = idx_other;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2220 idx_to = idx_cur;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2221 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2222 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2223 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2224 idx_from = idx_cur;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2225 idx_to = idx_other;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2226 /* Need to make the other buffer the current buffer to be able to make
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2227 * changes in it. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2228 /* set curwin/curbuf to buf and save a few things */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2229 aucmd_prepbuf(&aco, curtab->tp_diffbuf[idx_other]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2230 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2231
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2232 /* May give the warning for a changed buffer here, which can trigger the
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2233 * FileChangedRO autocommand, which may do nasty things and mess
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2234 * everything up. */
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2235 if (!curbuf->b_changed)
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2236 {
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2237 change_warning(0);
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2238 if (diff_buf_idx(curbuf) != idx_to)
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2239 {
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2240 EMSG(_("E787: Buffer changed unexpectedly"));
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2241 return;
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2242 }
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2243 }
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2244
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2245 dprev = NULL;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2246 for (dp = curtab->tp_first_diff; dp != NULL; )
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2247 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2248 if (dp->df_lnum[idx_cur] > eap->line2 + off)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2249 break; /* past the range that was specified */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2250
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2251 dfree = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2252 lnum = dp->df_lnum[idx_to];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2253 count = dp->df_count[idx_to];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2254 if (dp->df_lnum[idx_cur] + dp->df_count[idx_cur] > eap->line1 + off
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2255 && u_save(lnum - 1, lnum + count) != FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2256 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2257 /* Inside the specified range and saving for undo worked. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2258 start_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2259 end_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2260 if (eap->addr_count > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2261 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2262 /* A range was specified: check if lines need to be skipped. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2263 start_skip = eap->line1 + off - dp->df_lnum[idx_cur];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2264 if (start_skip > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2265 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2266 /* range starts below start of current diff block */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2267 if (start_skip > count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2268 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2269 lnum += count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2270 count = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2271 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2272 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2273 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2274 count -= start_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2275 lnum += start_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2276 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2277 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2278 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2279 start_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2280
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2281 end_skip = dp->df_lnum[idx_cur] + dp->df_count[idx_cur] - 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2282 - (eap->line2 + off);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2283 if (end_skip > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2284 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2285 /* range ends above end of current/from diff block */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2286 if (idx_cur == idx_from) /* :diffput */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2287 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2288 i = dp->df_count[idx_cur] - start_skip - end_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2289 if (count > i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2290 count = i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2291 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2292 else /* :diffget */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2293 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2294 count -= end_skip;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2295 end_skip = dp->df_count[idx_from] - start_skip - count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2296 if (end_skip < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2297 end_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2298 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2299 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2300 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2301 end_skip = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2302 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2303
6286
f21a2f67bdbb updated for version 7.4.477
Bram Moolenaar <bram@vim.org>
parents: 5934
diff changeset
2304 buf_empty = bufempty();
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2305 added = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2306 for (i = 0; i < count; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2307 {
648
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2308 /* remember deleting the last line of the buffer */
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2309 buf_empty = curbuf->b_ml.ml_line_count == 1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2310 ml_delete(lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2311 --added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2312 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2313 for (i = 0; i < dp->df_count[idx_from] - start_skip - end_skip; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2314 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2315 linenr_T nr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2316
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2317 nr = dp->df_lnum[idx_from] + start_skip + i;
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2318 if (nr > curtab->tp_diffbuf[idx_from]->b_ml.ml_line_count)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2319 break;
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2320 p = vim_strsave(ml_get_buf(curtab->tp_diffbuf[idx_from],
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2321 nr, FALSE));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2322 if (p != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2323 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2324 ml_append(lnum + i - 1, p, 0, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2325 vim_free(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2326 ++added;
648
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2327 if (buf_empty && curbuf->b_ml.ml_line_count == 2)
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2328 {
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2329 /* Added the first line into an empty buffer, need to
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2330 * delete the dummy empty line. */
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2331 buf_empty = FALSE;
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2332 ml_delete((linenr_T)2, FALSE);
9032e4668296 updated for version 7.0189
vimboss
parents: 638
diff changeset
2333 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2334 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2335 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2336 new_count = dp->df_count[idx_to] + added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2337 dp->df_count[idx_to] = new_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2338
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2339 if (start_skip == 0 && end_skip == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2340 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2341 /* Check if there are any other buffers and if the diff is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2342 * equal in them. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2343 for (i = 0; i < DB_COUNT; ++i)
819
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2344 if (curtab->tp_diffbuf[i] != NULL && i != idx_from
23f82b5d2814 updated for version 7.0c10
vimboss
parents: 764
diff changeset
2345 && i != idx_to
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2346 && !diff_equal_entry(dp, idx_from, i))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2347 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2348 if (i == DB_COUNT)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2349 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2350 /* delete the diff entry, the buffers are now equal here */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2351 dfree = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2352 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2353 if (dprev == NULL)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2354 curtab->tp_first_diff = dp;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2355 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2356 dprev->df_next = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2357 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2358 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2359
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2360 /* Adjust marks. This will change the following entries! */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2361 if (added != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2362 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2363 mark_adjust(lnum, lnum + count - 1, (long)MAXLNUM, (long)added);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2364 if (curwin->w_cursor.lnum >= lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2365 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2366 /* Adjust the cursor position if it's in/after the changed
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2367 * lines. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2368 if (curwin->w_cursor.lnum >= lnum + count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2369 curwin->w_cursor.lnum += added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2370 else if (added < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2371 curwin->w_cursor.lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2372 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2373 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2374 changed_lines(lnum, 0, lnum + count, (long)added);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2375
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2376 if (dfree != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2377 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2378 /* Diff is deleted, update folds in other windows. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2379 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2380 diff_fold_update(dfree, idx_to);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2381 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2382 vim_free(dfree);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2383 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2384 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2385 /* mark_adjust() may have changed the count in a wrong way */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2386 dp->df_count[idx_to] = new_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2387
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2388 /* When changing the current buffer, keep track of line numbers */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2389 if (idx_cur == idx_to)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2390 off += added;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2391 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2392
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2393 /* If before the range or not deleted, go to next diff. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2394 if (dfree == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2395 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2396 dprev = dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2397 dp = dp->df_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2398 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2399 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2400
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2401 /* restore curwin/curbuf and a few other things */
2445
04dae202d316 Fixes for coverity warnings.
Bram Moolenaar <bram@vim.org>
parents: 2250
diff changeset
2402 if (eap->cmdidx != CMD_diffget)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2403 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2404 /* Syncing undo only works for the current buffer, but we change
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2405 * another buffer. Sync undo if the command was typed. This isn't
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2406 * 100% right when ":diffput" is used in a function or mapping. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2407 if (KeyTyped)
825
6675076019ae updated for version 7.0d
vimboss
parents: 819
diff changeset
2408 u_sync(FALSE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2409 aucmd_restbuf(&aco);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2410 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2411
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2412 diff_busy = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2413
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2414 /* Check that the cursor is on a valid character and update it's position.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2415 * When there were filler lines the topline has become invalid. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2416 check_cursor();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2417 changed_line_abv_curs();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2418
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2419 /* Also need to redraw the other buffers. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2420 diff_redraw(FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2421 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2422
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2423 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2424 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2425 * Update folds for all diff buffers for entry "dp".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2426 * Skip buffer with index "skip_idx".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2427 * When there are no diffs, all folds are removed.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2428 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2429 static void
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2430 diff_fold_update(diff_T *dp, int skip_idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2431 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2432 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2433 win_T *wp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2434
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2435 for (wp = firstwin; wp != NULL; wp = wp->w_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2436 for (i = 0; i < DB_COUNT; ++i)
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2437 if (curtab->tp_diffbuf[i] == wp->w_buffer && i != skip_idx)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2438 foldUpdate(wp, dp->df_lnum[i],
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2439 dp->df_lnum[i] + dp->df_count[i]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2440 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2441 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2442
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2443 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2444 * Return TRUE if buffer "buf" is in diff-mode.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2445 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2446 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2447 diff_mode_buf(buf_T *buf)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2448 {
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2449 tabpage_T *tp;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2450
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2451 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2452 if (diff_buf_idx_tp(buf, tp) != DB_COUNT)
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2453 return TRUE;
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2454 return FALSE;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2455 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2456
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2457 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2458 * Move "count" times in direction "dir" to the next diff block.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2459 * Return FAIL if there isn't such a diff block.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2460 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2461 int
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2462 diff_move_to(int dir, long count)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2463 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2464 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2465 linenr_T lnum = curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2466 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2467
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2468 idx = diff_buf_idx(curbuf);
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2469 if (idx == DB_COUNT || curtab->tp_first_diff == NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2470 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2471
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2472 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2473 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2474
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2475 if (curtab->tp_first_diff == NULL) /* no diffs today */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2476 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2477
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2478 while (--count >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2479 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2480 /* Check if already before first diff. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2481 if (dir == BACKWARD && lnum <= curtab->tp_first_diff->df_lnum[idx])
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2482 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2483
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2484 for (dp = curtab->tp_first_diff; ; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2485 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2486 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2487 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2488 if ((dir == FORWARD && lnum < dp->df_lnum[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2489 || (dir == BACKWARD
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2490 && (dp->df_next == NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2491 || lnum <= dp->df_next->df_lnum[idx])))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2492 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2493 lnum = dp->df_lnum[idx];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2494 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2495 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2496 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2497 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2498
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2499 /* don't end up past the end of the file */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2500 if (lnum > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2501 lnum = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2502
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2503 /* When the cursor didn't move at all we fail. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2504 if (lnum == curwin->w_cursor.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2505 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2506
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2507 setpcmark();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2508 curwin->w_cursor.lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2509 curwin->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2510
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2511 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2512 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2513
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2514 linenr_T
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2515 diff_get_corresponding_line(
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2516 buf_T *buf1,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2517 linenr_T lnum1,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2518 buf_T *buf2,
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2519 linenr_T lnum3)
2250
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2520 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2521 int idx1;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2522 int idx2;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2523 diff_T *dp;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2524 int baseline = 0;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2525 linenr_T lnum2;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2526
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2527 idx1 = diff_buf_idx(buf1);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2528 idx2 = diff_buf_idx(buf2);
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2529 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
2530 return lnum1;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2531
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2532 if (curtab->tp_diff_invalid)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2533 ex_diffupdate(NULL); /* update after a big change */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2534
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2535 if (curtab->tp_first_diff == NULL) /* no diffs today */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2536 return lnum1;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2537
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2538 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2539 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2540 if (dp->df_lnum[idx1] > lnum1)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2541 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2542 lnum2 = lnum1 - baseline;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2543 /* don't end up past the end of the file */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2544 if (lnum2 > buf2->b_ml.ml_line_count)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2545 lnum2 = buf2->b_ml.ml_line_count;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2546
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2547 return lnum2;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2548 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2549 else if ((dp->df_lnum[idx1] + dp->df_count[idx1]) > lnum1)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2550 {
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2551 /* Inside the diffblock */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2552 baseline = lnum1 - dp->df_lnum[idx1];
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2553 if (baseline > dp->df_count[idx2])
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2554 baseline = dp->df_count[idx2];
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2555
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2556 return dp->df_lnum[idx2] + baseline;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2557 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2558 else if ( (dp->df_lnum[idx1] == lnum1)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2559 && (dp->df_count[idx1] == 0)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2560 && (dp->df_lnum[idx2] <= lnum3)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2561 && ((dp->df_lnum[idx2] + dp->df_count[idx2]) > lnum3))
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2562 /*
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2563 * 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
2564 * 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
2565 * 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
2566 * 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
2567 * as expected.
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2568 */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2569 return lnum3;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2570 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
2571 - (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
2572 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2573
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2574 /* If we get here then the cursor is after the last diff */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2575 lnum2 = lnum1 - baseline;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2576 /* don't end up past the end of the file */
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2577 if (lnum2 > buf2->b_ml.ml_line_count)
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2578 lnum2 = buf2->b_ml.ml_line_count;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2579
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2580 return lnum2;
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2581 }
1bac28a53fae Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents: 2086
diff changeset
2582
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2583 #if defined(FEAT_FOLDING) || defined(PROTO)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2584 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2585 * For line "lnum" in the current window find the equivalent lnum in window
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2586 * "wp", compensating for inserted/deleted lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2587 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2588 linenr_T
7817
83861277e6a3 commit https://github.com/vim/vim/commit/7454a06e2642d2b37afad1c5e71cec68081ca4ff
Christian Brabandt <cb@256bit.org>
parents: 7799
diff changeset
2589 diff_lnum_win(linenr_T lnum, win_T *wp)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2590 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2591 diff_T *dp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2592 int idx;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2593 int i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2594 linenr_T n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2595
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2596 idx = diff_buf_idx(curbuf);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2597 if (idx == DB_COUNT) /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2598 return (linenr_T)0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2599
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2600 if (curtab->tp_diff_invalid)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2601 ex_diffupdate(NULL); /* update after a big change */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2602
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2603 /* search for a change that includes "lnum" in the list of diffblocks. */
672
db58b9066b21 updated for version 7.0200
vimboss
parents: 671
diff changeset
2604 for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2605 if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2606 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2607
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2608 /* When after the last change, compute relative to the last line number. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2609 if (dp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2610 return wp->w_buffer->b_ml.ml_line_count
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2611 - (curbuf->b_ml.ml_line_count - lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2612
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2613 /* Find index for "wp". */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2614 i = diff_buf_idx(wp->w_buffer);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2615 if (i == DB_COUNT) /* safety check */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2616 return (linenr_T)0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2617
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2618 n = lnum + (dp->df_lnum[i] - dp->df_lnum[idx]);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2619 if (n > dp->df_lnum[i] + dp->df_count[i])
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2620 n = dp->df_lnum[i] + dp->df_count[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2621 return n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2622 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2623 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2624
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2625 #endif /* FEAT_DIFF */