annotate src/undo.c @ 753:ac005a544e24

updated for version 7.0223
author vimboss
date Mon, 13 Mar 2006 22:15:53 +0000
parents f08390485cd3
children d591d4ceeaee
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 /* vi: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 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11 * undo.c: multi level undo facility
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 * The saved lines are stored in a list of lists (one for each buffer):
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
15 * b_u_oldhead------------------------------------------------+
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16 * |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
17 * V
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
18 * +--------------+ +--------------+ +--------------+
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
19 * b_u_newhead--->| u_header | | u_header | | u_header |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
20 * | uh_next------>| uh_next------>| uh_next---->NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
21 * NULL<--------uh_prev |<---------uh_prev |<---------uh_prev |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
22 * | uh_entry | | uh_entry | | uh_entry |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
23 * +--------|-----+ +--------|-----+ +--------|-----+
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
24 * | | |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
25 * V V V
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
26 * +--------------+ +--------------+ +--------------+
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
27 * | u_entry | | u_entry | | u_entry |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
28 * | ue_next | | ue_next | | ue_next |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
29 * +--------|-----+ +--------|-----+ +--------|-----+
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
30 * | | |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
31 * V V V
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
32 * +--------------+ NULL NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
33 * | u_entry |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
34 * | ue_next |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
35 * +--------|-----+
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
36 * |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
37 * V
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
38 * etc.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
39 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
40 * Each u_entry list contains the information for one undo or redo.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
41 * curbuf->b_u_curhead points to the header of the last undo (the next redo),
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
42 * or is NULL if nothing has been undone.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
43 *
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
44 * For keeping alternate undo/redo branches the uh_alt field is used. Thus at
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
45 * each point in the list a branch may appear for an alternate to redo. The
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
46 * uh_seq field is numbered sequentially to be able to find a newer or older
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
47 * branch.
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
48 *
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
49 * All data is allocated with U_ALLOC_LINE(), it will be freed as soon as the
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
50 * buffer is unloaded.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
51 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
52
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
53 #include "vim.h"
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
54
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
55 /* See below: use malloc()/free() for memory management. */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
56 #define U_USE_MALLOC 1
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
57
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
58 static u_entry_T *u_get_headentry __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
59 static void u_getbot __ARGS((void));
632
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
60 static int undo_allowed __ARGS((void));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
61 static int u_savecommon __ARGS((linenr_T, linenr_T, linenr_T));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
62 static void u_doit __ARGS((int count));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
63 static void u_undoredo __ARGS((void));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
64 static void u_undo_end __ARGS((void));
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
65 static void u_freelist __ARGS((buf_T *buf, u_header_T *uhp, u_header_T **uhpp));
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
66 static void u_freebranch __ARGS((buf_T *buf, u_header_T *uhp, u_header_T **uhpp));
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
67 static void u_freeentries __ARGS((buf_T *buf, u_header_T *uhp, u_header_T **uhpp));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
68 static void u_freeentry __ARGS((u_entry_T *, long));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
69
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
70 #ifdef U_USE_MALLOC
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
71 # define U_FREE_LINE(ptr) vim_free(ptr)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
72 # define U_ALLOC_LINE(size) lalloc((long_u)((size) + 1), FALSE)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
73 #else
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
74 static void u_free_line __ARGS((char_u *ptr, int keep));
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
75 static char_u *u_alloc_line __ARGS((unsigned size));
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
76 # define U_FREE_LINE(ptr) u_free_line((ptr), FALSE)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
77 # define U_ALLOC_LINE(size) u_alloc_line(size)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
78 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
79 static char_u *u_save_line __ARGS((linenr_T));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
80
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
81 static long u_newcount, u_oldcount;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
82
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
83 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
84 * When 'u' flag included in 'cpoptions', we behave like vi. Need to remember
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
85 * the action that "u" should do.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
86 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
87 static int undo_undoes = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
88
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
89 /*
344
7033303ea0c0 updated for version 7.0089
vimboss
parents: 179
diff changeset
90 * Save the current line for both the "u" and "U" command.
7033303ea0c0 updated for version 7.0089
vimboss
parents: 179
diff changeset
91 * Returns OK or FAIL.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
92 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
93 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
94 u_save_cursor()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
95 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
96 return (u_save((linenr_T)(curwin->w_cursor.lnum - 1),
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
97 (linenr_T)(curwin->w_cursor.lnum + 1)));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
98 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
99
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
100 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
101 * Save the lines between "top" and "bot" for both the "u" and "U" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
102 * "top" may be 0 and bot may be curbuf->b_ml.ml_line_count + 1.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
103 * Returns FAIL when lines could not be saved, OK otherwise.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
104 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
105 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
106 u_save(top, bot)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
107 linenr_T top, bot;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
108 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
109 if (undo_off)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
110 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
111
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
112 if (top > curbuf->b_ml.ml_line_count ||
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
113 top >= bot || bot > curbuf->b_ml.ml_line_count + 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
114 return FALSE; /* rely on caller to do error messages */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
115
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
116 if (top + 2 == bot)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
117 u_saveline((linenr_T)(top + 1));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
118
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
119 return (u_savecommon(top, bot, (linenr_T)0));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
120 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
121
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
122 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
123 * save the line "lnum" (used by ":s" and "~" command)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
124 * The line is replaced, so the new bottom line is lnum + 1.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
125 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
126 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
127 u_savesub(lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
128 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
129 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
130 if (undo_off)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
131 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
132
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
133 return (u_savecommon(lnum - 1, lnum + 1, lnum + 1));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
134 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
135
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
136 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
137 * a new line is inserted before line "lnum" (used by :s command)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
138 * The line is inserted, so the new bottom line is lnum + 1.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
139 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
140 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
141 u_inssub(lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
142 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
143 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
144 if (undo_off)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
145 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
146
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
147 return (u_savecommon(lnum - 1, lnum, lnum + 1));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
148 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
149
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
150 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
151 * save the lines "lnum" - "lnum" + nlines (used by delete command)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
152 * The lines are deleted, so the new bottom line is lnum, unless the buffer
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
153 * becomes empty.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
154 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
155 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
156 u_savedel(lnum, nlines)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
157 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
158 long nlines;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
159 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
160 if (undo_off)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
161 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
162
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
163 return (u_savecommon(lnum - 1, lnum + nlines,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
164 nlines == curbuf->b_ml.ml_line_count ? 2 : lnum));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
165 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
166
632
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
167 /*
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
168 * Return TRUE when undo is allowed. Otherwise give an error message and
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
169 * return FALSE.
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
170 */
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
171 static int
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
172 undo_allowed()
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
173 {
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
174 /* Don't allow changes when 'modifiable' is off. */
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
175 if (!curbuf->b_p_ma)
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
176 {
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
177 EMSG(_(e_modifiable));
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
178 return FALSE;
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
179 }
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
180
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
181 #ifdef HAVE_SANDBOX
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
182 /* In the sandbox it's not allowed to change the text. */
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
183 if (sandbox != 0)
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
184 {
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
185 EMSG(_(e_sandbox));
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
186 return FALSE;
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
187 }
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
188 #endif
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
189
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
190 /* Don't allow changes in the buffer while editing the cmdline. The
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
191 * caller of getcmdline() may get confused. */
634
1c586ee8dd45 updated for version 7.0183
vimboss
parents: 632
diff changeset
192 if (textlock != 0)
632
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
193 {
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
194 EMSG(_(e_secure));
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
195 return FALSE;
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
196 }
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
197
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
198 return TRUE;
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
199 }
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
200
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
201 static int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
202 u_savecommon(top, bot, newbot)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
203 linenr_T top, bot;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
204 linenr_T newbot;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
205 {
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
206 linenr_T lnum;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
207 long i;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
208 u_header_T *uhp;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
209 u_header_T *old_curhead;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
210 u_entry_T *uep;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
211 u_entry_T *prev_uep;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
212 long size;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
213
632
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
214 /* When making changes is not allowed return FAIL. It's a crude way to
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
215 * make all change commands fail. */
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
216 if (!undo_allowed())
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
217 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
218
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
219 #ifdef FEAT_NETBEANS_INTG
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
220 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
221 * Netbeans defines areas that cannot be modified. Bail out here when
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
222 * trying to change text in a guarded area.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
223 */
33
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
224 if (usingNetbeans)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
225 {
33
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
226 if (netbeans_is_guarded(top, bot))
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
227 {
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
228 EMSG(_(e_guarded));
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
229 return FAIL;
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
230 }
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
231 if (curbuf->b_p_ro)
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
232 {
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
233 EMSG(_(e_nbreadonly));
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
234 return FAIL;
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
235 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
236 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
237 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
238
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
239 #ifdef FEAT_AUTOCMD
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
240 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
241 * Saving text for undo means we are going to make a change. Give a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
242 * warning for a read-only file before making the change, so that the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
243 * FileChangedRO event can replace the buffer with a read-write version
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
244 * (e.g., obtained from a source control system).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
245 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
246 change_warning(0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
247 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
248
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
249 size = bot - top - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
250
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
251 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
252 * if curbuf->b_u_synced == TRUE make a new header
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
253 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
254 if (curbuf->b_u_synced)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
255 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
256 #ifdef FEAT_JUMPLIST
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
257 /* Need to create new entry in b_changelist. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
258 curbuf->b_new_change = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
259 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
260
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
261 if (p_ul >= 0)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
262 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
263 /*
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
264 * Make a new header entry. Do this first so that we don't mess
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
265 * up the undo info when out of memory.
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
266 */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
267 uhp = (u_header_T *)U_ALLOC_LINE((unsigned)sizeof(u_header_T));
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
268 if (uhp == NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
269 goto nomem;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
270 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
271
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
272 /*
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
273 * If we undid more than we redid, remove the entry lists before and
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
274 * including curbuf->b_u_curhead to the alternate branch.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
275 */
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
276 old_curhead = curbuf->b_u_curhead;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
277 if (old_curhead != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
278 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
279 curbuf->b_u_newhead = old_curhead->uh_next;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
280 curbuf->b_u_curhead = NULL;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
281 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
282
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
283 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
284 * free headers to keep the size right
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
285 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
286 while (curbuf->b_u_numhead > p_ul && curbuf->b_u_oldhead != NULL)
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
287 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
288 u_header_T *upfree = curbuf->b_u_oldhead;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
289
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
290 /* If there is no branch only free one header. */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
291 if (upfree->uh_alt_next == NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
292 u_freelist(curbuf, upfree, &old_curhead);
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
293 else
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
294 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
295 /* Free the oldest alternate branch as a whole. */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
296 while (upfree->uh_alt_next != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
297 upfree = upfree->uh_alt_next;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
298 u_freebranch(curbuf, upfree, &old_curhead);
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
299 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
300 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
301
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
302 if (p_ul < 0) /* no undo at all */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
303 {
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
304 if (old_curhead != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
305 u_freebranch(curbuf, old_curhead, NULL);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
306 curbuf->b_u_synced = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
307 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
308 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
309
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
310 uhp->uh_prev = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
311 uhp->uh_next = curbuf->b_u_newhead;
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
312 uhp->uh_alt_next = old_curhead;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
313 if (old_curhead != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
314 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
315 old_curhead->uh_alt_prev = uhp;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
316 if (curbuf->b_u_oldhead == old_curhead)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
317 curbuf->b_u_oldhead = uhp;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
318 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
319 uhp->uh_alt_prev = NULL;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
320 uhp->uh_seq = curbuf->b_u_seq_last++;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
321 curbuf->b_u_seq_cur = curbuf->b_u_seq_last;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
322 if (curbuf->b_u_newhead != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
323 curbuf->b_u_newhead->uh_prev = uhp;
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
324 uhp->uh_walk = 0;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
325 uhp->uh_entry = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
326 uhp->uh_getbot_entry = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
327 uhp->uh_cursor = curwin->w_cursor; /* save cursor pos. for undo */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
328 #ifdef FEAT_VIRTUALEDIT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
329 if (virtual_active() && curwin->w_cursor.coladd > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
330 uhp->uh_cursor_vcol = getviscol();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
331 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
332 uhp->uh_cursor_vcol = -1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
333 #endif
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
334 uhp->uh_time = time(NULL);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
335
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
336 /* save changed and buffer empty flag for undo */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
337 uhp->uh_flags = (curbuf->b_changed ? UH_CHANGED : 0) +
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
338 ((curbuf->b_ml.ml_flags & ML_EMPTY) ? UH_EMPTYBUF : 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
339
692
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
340 /* save named marks and Visual marks for undo */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
341 mch_memmove(uhp->uh_namedm, curbuf->b_namedm, sizeof(pos_T) * NMARKS);
692
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
342 #ifdef FEAT_VISUAL
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
343 uhp->uh_visual = curbuf->b_visual;
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
344 #endif
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
345
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
346 curbuf->b_u_newhead = uhp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
347 if (curbuf->b_u_oldhead == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
348 curbuf->b_u_oldhead = uhp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
349 ++curbuf->b_u_numhead;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
350 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
351 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
352 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
353 if (p_ul < 0) /* no undo at all */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
354 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
355
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
356 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
357 * When saving a single line, and it has been saved just before, it
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
358 * doesn't make sense saving it again. Saves a lot of memory when
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
359 * making lots of changes inside the same line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
360 * This is only possible if the previous change didn't increase or
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
361 * decrease the number of lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
362 * Check the ten last changes. More doesn't make sense and takes too
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
363 * long.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
364 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
365 if (size == 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
366 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
367 uep = u_get_headentry();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
368 prev_uep = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
369 for (i = 0; i < 10; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
370 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
371 if (uep == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
372 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
373
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
374 /* If lines have been inserted/deleted we give up.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
375 * Also when the line was included in a multi-line save. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
376 if ((curbuf->b_u_newhead->uh_getbot_entry != uep
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
377 ? (uep->ue_top + uep->ue_size + 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
378 != (uep->ue_bot == 0
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
379 ? curbuf->b_ml.ml_line_count + 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
380 : uep->ue_bot))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
381 : uep->ue_lcount != curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
382 || (uep->ue_size > 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
383 && top >= uep->ue_top
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
384 && top + 2 <= uep->ue_top + uep->ue_size + 1))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
385 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
386
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
387 /* If it's the same line we can skip saving it again. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
388 if (uep->ue_size == 1 && uep->ue_top == top)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
389 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
390 if (i > 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
391 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
392 /* It's not the last entry: get ue_bot for the last
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
393 * entry now. Following deleted/inserted lines go to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
394 * the re-used entry. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
395 u_getbot();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
396 curbuf->b_u_synced = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
397
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
398 /* Move the found entry to become the last entry. The
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
399 * order of undo/redo doesn't matter for the entries
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
400 * we move it over, since they don't change the line
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
401 * count and don't include this line. It does matter
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
402 * for the found entry if the line count is changed by
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
403 * the executed command. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
404 prev_uep->ue_next = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
405 uep->ue_next = curbuf->b_u_newhead->uh_entry;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
406 curbuf->b_u_newhead->uh_entry = uep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
407 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
408
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
409 /* The executed command may change the line count. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
410 if (newbot != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
411 uep->ue_bot = newbot;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
412 else if (bot > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
413 uep->ue_bot = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
414 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
415 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
416 uep->ue_lcount = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
417 curbuf->b_u_newhead->uh_getbot_entry = uep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
418 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
419 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
420 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
421 prev_uep = uep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
422 uep = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
423 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
424 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
425
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
426 /* find line number for ue_bot for previous u_save() */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
427 u_getbot();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
428 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
429
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
430 #if !defined(UNIX) && !defined(DJGPP) && !defined(WIN32) && !defined(__EMX__)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
431 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
432 * With Amiga and MSDOS 16 bit we can't handle big undo's, because
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
433 * then u_alloc_line would have to allocate a block larger than 32K
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
434 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
435 if (size >= 8000)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
436 goto nomem;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
437 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
438
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
439 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
440 * add lines in front of entry list
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
441 */
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
442 uep = (u_entry_T *)U_ALLOC_LINE((unsigned)sizeof(u_entry_T));
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
443 if (uep == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
444 goto nomem;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
445
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
446 uep->ue_size = size;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
447 uep->ue_top = top;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
448 if (newbot != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
449 uep->ue_bot = newbot;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
450 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
451 * Use 0 for ue_bot if bot is below last line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
452 * Otherwise we have to compute ue_bot later.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
453 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
454 else if (bot > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
455 uep->ue_bot = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
456 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
457 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
458 uep->ue_lcount = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
459 curbuf->b_u_newhead->uh_getbot_entry = uep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
460 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
461
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
462 if (size > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
463 {
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
464 if ((uep->ue_array = (char_u **)U_ALLOC_LINE(
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
465 (unsigned)(sizeof(char_u *) * size))) == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
466 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
467 u_freeentry(uep, 0L);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
468 goto nomem;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
469 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
470 for (i = 0, lnum = top + 1; i < size; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
471 {
481
66080ac5dab7 updated for version 7.0130
vimboss
parents: 414
diff changeset
472 fast_breakcheck();
66080ac5dab7 updated for version 7.0130
vimboss
parents: 414
diff changeset
473 if (got_int)
66080ac5dab7 updated for version 7.0130
vimboss
parents: 414
diff changeset
474 {
66080ac5dab7 updated for version 7.0130
vimboss
parents: 414
diff changeset
475 u_freeentry(uep, i);
66080ac5dab7 updated for version 7.0130
vimboss
parents: 414
diff changeset
476 return FAIL;
66080ac5dab7 updated for version 7.0130
vimboss
parents: 414
diff changeset
477 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
478 if ((uep->ue_array[i] = u_save_line(lnum++)) == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
479 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
480 u_freeentry(uep, i);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
481 goto nomem;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
482 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
483 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
484 }
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
485 else
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
486 uep->ue_array = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
487 uep->ue_next = curbuf->b_u_newhead->uh_entry;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
488 curbuf->b_u_newhead->uh_entry = uep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
489 curbuf->b_u_synced = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
490 undo_undoes = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
491
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
492 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
493
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
494 nomem:
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
495 msg_silent = 0; /* must display the prompt */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
496 if (ask_yesno((char_u *)_("No undo possible; continue anyway"), TRUE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
497 == 'y')
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
498 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
499 undo_off = TRUE; /* will be reset when character typed */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
500 return OK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
501 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
502 do_outofmem_msg((long_u)0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
503 return FAIL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
504 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
505
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
506 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
507 * If 'cpoptions' contains 'u': Undo the previous undo or redo (vi compatible).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
508 * If 'cpoptions' does not contain 'u': Always undo.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
509 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
510 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
511 u_undo(count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
512 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
513 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
514 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
515 * If we get an undo command while executing a macro, we behave like the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
516 * original vi. If this happens twice in one macro the result will not
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
517 * be compatible.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
518 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
519 if (curbuf->b_u_synced == FALSE)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
520 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
521 u_sync();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
522 count = 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
523 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
524
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
525 if (vim_strchr(p_cpo, CPO_UNDO) == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
526 undo_undoes = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
527 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
528 undo_undoes = !undo_undoes;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
529 u_doit(count);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
530 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
531
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
532 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
533 * If 'cpoptions' contains 'u': Repeat the previous undo or redo.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
534 * If 'cpoptions' does not contain 'u': Always redo.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
535 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
536 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
537 u_redo(count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
538 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
539 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
540 if (vim_strchr(p_cpo, CPO_UNDO) == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
541 undo_undoes = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
542 u_doit(count);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
543 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
544
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
545 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
546 * Undo or redo, depending on 'undo_undoes', 'count' times.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
547 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
548 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
549 u_doit(count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
550 int count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
551 {
632
b6632d553df3 updated for version 7.0182
vimboss
parents: 481
diff changeset
552 if (!undo_allowed())
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
553 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
554
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
555 u_newcount = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
556 u_oldcount = 0;
179
7fd70926e2e1 updated for version 7.0055
vimboss
parents: 168
diff changeset
557 if (curbuf->b_ml.ml_flags & ML_EMPTY)
7fd70926e2e1 updated for version 7.0055
vimboss
parents: 168
diff changeset
558 u_oldcount = -1;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
559 while (count--)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
560 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
561 if (undo_undoes)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
562 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
563 if (curbuf->b_u_curhead == NULL) /* first undo */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
564 curbuf->b_u_curhead = curbuf->b_u_newhead;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
565 else if (p_ul > 0) /* multi level undo */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
566 /* get next undo */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
567 curbuf->b_u_curhead = curbuf->b_u_curhead->uh_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
568 /* nothing to undo */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
569 if (curbuf->b_u_numhead == 0 || curbuf->b_u_curhead == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
570 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
571 /* stick curbuf->b_u_curhead at end */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
572 curbuf->b_u_curhead = curbuf->b_u_oldhead;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
573 beep_flush();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
574 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
575 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
576
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
577 u_undoredo();
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
578 curbuf->b_u_seq_cur = curbuf->b_u_curhead->uh_seq;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
579 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
580 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
581 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
582 if (curbuf->b_u_curhead == NULL || p_ul <= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
583 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
584 beep_flush(); /* nothing to redo */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
585 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
586 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
587
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
588 u_undoredo();
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
589 curbuf->b_u_seq_cur = curbuf->b_u_curhead->uh_seq + 1;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
590
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
591 /* Advance for next redo. Set "newhead" when at the end of the
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
592 * redoable changes. */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
593 if (curbuf->b_u_curhead->uh_prev == NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
594 curbuf->b_u_newhead = curbuf->b_u_curhead;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
595 curbuf->b_u_curhead = curbuf->b_u_curhead->uh_prev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
596 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
597 }
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
598 u_undo_end();
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
599 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
600
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
601 static int lastmark = 0;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
602
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
603 /*
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
604 * Undo or redo over the timeline.
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
605 * When "step" is negative go back in time, otherwise goes forward in time.
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
606 */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
607 void
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
608 undo_time(step)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
609 int step;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
610 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
611 long target;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
612 long closest;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
613 u_header_T *uhp;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
614 u_header_T *last;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
615 int mark;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
616 int nomark;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
617 int round;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
618
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
619 u_newcount = 0;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
620 u_oldcount = 0;
179
7fd70926e2e1 updated for version 7.0055
vimboss
parents: 168
diff changeset
621 if (curbuf->b_ml.ml_flags & ML_EMPTY)
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
622 u_oldcount = -1;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
623
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
624 /* "target" is the node below which we want to be. When going forward
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
625 * the current one also counts, thus do one less. */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
626 if (step < 0)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
627 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
628 target = curbuf->b_u_seq_cur + step;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
629 closest = -1;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
630 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
631 else
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
632 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
633 target = curbuf->b_u_seq_cur + step - 1;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
634 closest = curbuf->b_u_seq_last + 1;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
635 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
636
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
637 /* May do this twice:
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
638 * 1. Search for "target", update "closest" to the best match found.
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
639 * 2. If "target" not found search for "closest". */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
640 for (round = 1; round <= 2; ++round)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
641 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
642 /* Find the path from the current state to where we want to go. The
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
643 * desired state can be anywhere in the undo tree, need to go all over
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
644 * it. We put "nomark" in uh_walk where we have been without success,
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
645 * "mark" where it could possibly be. */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
646 mark = ++lastmark;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
647 nomark = ++lastmark;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
648
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
649 if (curbuf->b_u_curhead == NULL) /* at leaf of the tree */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
650 uhp = curbuf->b_u_newhead;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
651 else
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
652 uhp = curbuf->b_u_curhead;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
653
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
654 while (uhp != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
655 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
656 uhp->uh_walk = mark;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
657 if (uhp->uh_seq == target) /* found it! */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
658 break;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
659
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
660 if (round == 1 && (step < 0
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
661 ? (uhp->uh_seq < target && uhp->uh_seq > closest)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
662 : (uhp->uh_seq > target && uhp->uh_seq < closest)))
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
663 closest = uhp->uh_seq;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
664
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
665 /* go down in the tree if we haven't been there */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
666 if (uhp->uh_prev != NULL && uhp->uh_prev->uh_walk != nomark
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
667 && uhp->uh_prev->uh_walk != mark)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
668 uhp = uhp->uh_prev;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
669
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
670 /* go to alternate branch if we haven't been there */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
671 else if (uhp->uh_alt_next != NULL
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
672 && uhp->uh_alt_next->uh_walk != nomark
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
673 && uhp->uh_alt_next->uh_walk != mark)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
674 uhp = uhp->uh_alt_next;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
675
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
676 /* go up in the tree if we haven't been there and we are at the
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
677 * start of alternate branches */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
678 else if (uhp->uh_next != NULL && uhp->uh_alt_prev == NULL
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
679 && uhp->uh_next->uh_walk != nomark
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
680 && uhp->uh_next->uh_walk != mark)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
681 uhp = uhp->uh_next;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
682
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
683 else
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
684 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
685 /* need to backtrack; mark this node as useless */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
686 uhp->uh_walk = nomark;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
687 if (uhp->uh_alt_prev != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
688 uhp = uhp->uh_alt_prev;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
689 else
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
690 uhp = uhp->uh_next;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
691 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
692 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
693
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
694 if (uhp != NULL) /* found it */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
695 break;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
696 if (step < 0 && closest == -1)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
697 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
698 MSG(_("Already at oldest change"));
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
699 return;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
700 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
701 if (step > 0 && closest == curbuf->b_u_seq_last + 1)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
702 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
703 MSG(_("Already at newest change"));
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
704 return;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
705 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
706
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
707 target = closest;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
708 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
709
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
710 /* If we found it: Follow the path to go to where we want to be. */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
711 if (uhp != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
712 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
713 /*
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
714 * First go up the tree as much as needed.
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
715 */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
716 for (;;)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
717 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
718 uhp = curbuf->b_u_curhead;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
719 if (uhp == NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
720 uhp = curbuf->b_u_newhead;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
721 else
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
722 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
723 while (uhp->uh_alt_prev != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
724 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
725 uhp->uh_walk = nomark;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
726 uhp = uhp->uh_alt_prev;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
727 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
728 uhp = uhp->uh_next;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
729 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
730 if (uhp == NULL || uhp->uh_walk != mark)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
731 break;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
732 curbuf->b_u_curhead = uhp;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
733 u_undoredo();
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
734 uhp->uh_walk = nomark; /* don't go back down here */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
735 curbuf->b_u_seq_cur = uhp->uh_seq;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
736 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
737
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
738 /*
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
739 * And now go down the tree, branching off where needed.
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
740 */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
741 uhp = curbuf->b_u_curhead;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
742 for (;;)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
743 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
744 /* Find the last branch with a mark, that's the one. */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
745 last = uhp;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
746 while (last->uh_alt_next != NULL
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
747 && last->uh_alt_next->uh_walk == mark)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
748 last = last->uh_alt_next;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
749 if (last != uhp)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
750 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
751 /* Make the used branch the first entry in the list of
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
752 * alternatives to make "u" and CTRL-R take this branch. */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
753 if (last->uh_alt_next != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
754 last->uh_alt_next->uh_alt_prev = last->uh_alt_prev;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
755 last->uh_alt_prev->uh_alt_next = last->uh_alt_next;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
756 last->uh_alt_prev = NULL;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
757 last->uh_alt_next = uhp;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
758 uhp->uh_alt_prev = last;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
759
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
760 uhp = last;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
761 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
762
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
763 if (uhp->uh_walk != mark)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
764 break; /* must have reached the target */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
765
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
766 curbuf->b_u_curhead = uhp;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
767 u_undoredo();
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
768 curbuf->b_u_seq_cur = uhp->uh_seq + 1;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
769
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
770 /* Advance "curhead" to below the header we last used. If it
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
771 * becomes NULL then we need to set "newhead" to this leaf. */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
772 if (uhp->uh_prev == NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
773 curbuf->b_u_newhead = uhp;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
774 curbuf->b_u_curhead = uhp->uh_prev;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
775
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
776 if (uhp->uh_seq == target) /* found it! */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
777 break;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
778
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
779 uhp = uhp->uh_prev;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
780 if (uhp == NULL || uhp->uh_walk != mark)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
781 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
782 EMSG2(_(e_intern2), "undo_time()");
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
783 break;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
784 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
785 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
786 }
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
787 u_undo_end();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
788 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
789
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
790 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
791 * u_undoredo: common code for undo and redo
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
792 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
793 * The lines in the file are replaced by the lines in the entry list at
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
794 * curbuf->b_u_curhead. The replaced lines in the file are saved in the entry
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
795 * list for the next undo/redo.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
796 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
797 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
798 u_undoredo()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
799 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
800 char_u **newarray = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
801 linenr_T oldsize;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
802 linenr_T newsize;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
803 linenr_T top, bot;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
804 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
805 linenr_T newlnum = MAXLNUM;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
806 long i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
807 u_entry_T *uep, *nuep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
808 u_entry_T *newlist = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
809 int old_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
810 int new_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
811 pos_T namedm[NMARKS];
692
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
812 #ifdef FEAT_VISUAL
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
813 visualinfo_T visualinfo;
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
814 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
815 int empty_buffer; /* buffer became empty */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
816
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
817 old_flags = curbuf->b_u_curhead->uh_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
818 new_flags = (curbuf->b_changed ? UH_CHANGED : 0) +
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
819 ((curbuf->b_ml.ml_flags & ML_EMPTY) ? UH_EMPTYBUF : 0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
820 setpcmark();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
821
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
822 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
823 * save marks before undo/redo
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
824 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
825 mch_memmove(namedm, curbuf->b_namedm, sizeof(pos_T) * NMARKS);
692
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
826 #ifdef FEAT_VISUAL
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
827 visualinfo = curbuf->b_visual;
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
828 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
829 curbuf->b_op_start.lnum = curbuf->b_ml.ml_line_count;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
830 curbuf->b_op_start.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
831 curbuf->b_op_end.lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
832 curbuf->b_op_end.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
833
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
834 for (uep = curbuf->b_u_curhead->uh_entry; uep != NULL; uep = nuep)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
835 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
836 top = uep->ue_top;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
837 bot = uep->ue_bot;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
838 if (bot == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
839 bot = curbuf->b_ml.ml_line_count + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
840 if (top > curbuf->b_ml.ml_line_count || top >= bot
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
841 || bot > curbuf->b_ml.ml_line_count + 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
842 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
843 EMSG(_("E438: u_undo: line numbers wrong"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
844 changed(); /* don't want UNCHANGED now */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
845 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
846 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
847
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
848 oldsize = bot - top - 1; /* number of lines before undo */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
849 newsize = uep->ue_size; /* number of lines after undo */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
850
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
851 if (top < newlnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
852 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
853 /* If the saved cursor is somewhere in this undo block, move it to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
854 * the remembered position. Makes "gwap" put the cursor back
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
855 * where it was. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
856 lnum = curbuf->b_u_curhead->uh_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
857 if (lnum >= top && lnum <= top + newsize + 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
858 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
859 curwin->w_cursor = curbuf->b_u_curhead->uh_cursor;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
860 newlnum = curwin->w_cursor.lnum - 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
861 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
862 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
863 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
864 /* Use the first line that actually changed. Avoids that
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
865 * undoing auto-formatting puts the cursor in the previous
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
866 * line. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
867 for (i = 0; i < newsize && i < oldsize; ++i)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
868 if (STRCMP(uep->ue_array[i], ml_get(top + 1 + i)) != 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
869 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
870 if (i == newsize && newlnum == MAXLNUM && uep->ue_next == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
871 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
872 newlnum = top;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
873 curwin->w_cursor.lnum = newlnum + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
874 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
875 else if (i < newsize)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
876 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
877 newlnum = top + i;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
878 curwin->w_cursor.lnum = newlnum + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
879 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
880 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
881 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
882
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
883 empty_buffer = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
884
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
885 /* delete the lines between top and bot and save them in newarray */
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
886 if (oldsize > 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
887 {
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
888 if ((newarray = (char_u **)U_ALLOC_LINE(
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
889 (unsigned)(sizeof(char_u *) * oldsize))) == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
890 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
891 do_outofmem_msg((long_u)(sizeof(char_u *) * oldsize));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
892 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
893 * We have messed up the entry list, repair is impossible.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
894 * we have to free the rest of the list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
895 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
896 while (uep != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
897 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
898 nuep = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
899 u_freeentry(uep, uep->ue_size);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
900 uep = nuep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
901 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
902 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
903 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
904 /* delete backwards, it goes faster in most cases */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
905 for (lnum = bot - 1, i = oldsize; --i >= 0; --lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
906 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
907 /* what can we do when we run out of memory? */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
908 if ((newarray[i] = u_save_line(lnum)) == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
909 do_outofmem_msg((long_u)0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
910 /* remember we deleted the last line in the buffer, and a
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
911 * dummy empty line will be inserted */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
912 if (curbuf->b_ml.ml_line_count == 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
913 empty_buffer = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
914 ml_delete(lnum, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
915 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
916 }
414
8ab9c77240d4 updated for version 7.0108
vimboss
parents: 407
diff changeset
917 else
8ab9c77240d4 updated for version 7.0108
vimboss
parents: 407
diff changeset
918 newarray = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
919
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
920 /* insert the lines in u_array between top and bot */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
921 if (newsize)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
922 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
923 for (lnum = top, i = 0; i < newsize; ++i, ++lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
924 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
925 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
926 * If the file is empty, there is an empty line 1 that we
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
927 * should get rid of, by replacing it with the new line
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
928 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
929 if (empty_buffer && lnum == 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
930 ml_replace((linenr_T)1, uep->ue_array[i], TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
931 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
932 ml_append(lnum, uep->ue_array[i], (colnr_T)0, FALSE);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
933 U_FREE_LINE(uep->ue_array[i]);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
934 }
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
935 U_FREE_LINE((char_u *)uep->ue_array);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
936 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
937
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
938 /* adjust marks */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
939 if (oldsize != newsize)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
940 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
941 mark_adjust(top + 1, top + oldsize, (long)MAXLNUM,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
942 (long)newsize - (long)oldsize);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
943 if (curbuf->b_op_start.lnum > top + oldsize)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
944 curbuf->b_op_start.lnum += newsize - oldsize;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
945 if (curbuf->b_op_end.lnum > top + oldsize)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
946 curbuf->b_op_end.lnum += newsize - oldsize;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
947 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
948
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
949 changed_lines(top + 1, 0, bot, newsize - oldsize);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
950
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
951 /* set '[ and '] mark */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
952 if (top + 1 < curbuf->b_op_start.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
953 curbuf->b_op_start.lnum = top + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
954 if (newsize == 0 && top + 1 > curbuf->b_op_end.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
955 curbuf->b_op_end.lnum = top + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
956 else if (top + newsize > curbuf->b_op_end.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
957 curbuf->b_op_end.lnum = top + newsize;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
958
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
959 u_newcount += newsize;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
960 u_oldcount += oldsize;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
961 uep->ue_size = oldsize;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
962 uep->ue_array = newarray;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
963 uep->ue_bot = top + newsize + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
964
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
965 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
966 * insert this entry in front of the new entry list
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
967 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
968 nuep = uep->ue_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
969 uep->ue_next = newlist;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
970 newlist = uep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
971 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
972
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
973 curbuf->b_u_curhead->uh_entry = newlist;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
974 curbuf->b_u_curhead->uh_flags = new_flags;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
975 if ((old_flags & UH_EMPTYBUF) && bufempty())
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
976 curbuf->b_ml.ml_flags |= ML_EMPTY;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
977 if (old_flags & UH_CHANGED)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
978 changed();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
979 else
33
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
980 #ifdef FEAT_NETBEANS_INTG
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
981 /* per netbeans undo rules, keep it as modified */
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
982 if (!isNetbeansModified(curbuf))
f6033dcbaf31 updated for version 7.0020
vimboss
parents: 7
diff changeset
983 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
984 unchanged(curbuf, FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
985
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
986 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
987 * restore marks from before undo/redo
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
988 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
989 for (i = 0; i < NMARKS; ++i)
692
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
990 if (curbuf->b_u_curhead->uh_namedm[i].lnum != 0)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
991 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
992 curbuf->b_namedm[i] = curbuf->b_u_curhead->uh_namedm[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
993 curbuf->b_u_curhead->uh_namedm[i] = namedm[i];
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
994 }
692
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
995 #ifdef FEAT_VISUAL
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
996 if (curbuf->b_u_curhead->uh_visual.vi_start.lnum != 0)
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
997 {
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
998 curbuf->b_visual = curbuf->b_u_curhead->uh_visual;
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
999 curbuf->b_u_curhead->uh_visual = visualinfo;
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
1000 }
a28f83d37113 updated for version 7.0208
vimboss
parents: 634
diff changeset
1001 #endif
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1002
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1003 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1004 * If the cursor is only off by one line, put it at the same position as
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1005 * before starting the change (for the "o" command).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1006 * Otherwise the cursor should go to the first undone line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1007 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1008 if (curbuf->b_u_curhead->uh_cursor.lnum + 1 == curwin->w_cursor.lnum
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1009 && curwin->w_cursor.lnum > 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1010 --curwin->w_cursor.lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1011 if (curbuf->b_u_curhead->uh_cursor.lnum == curwin->w_cursor.lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1012 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1013 curwin->w_cursor.col = curbuf->b_u_curhead->uh_cursor.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1014 #ifdef FEAT_VIRTUALEDIT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1015 if (virtual_active() && curbuf->b_u_curhead->uh_cursor_vcol >= 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1016 coladvance((colnr_T)curbuf->b_u_curhead->uh_cursor_vcol);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1017 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1018 curwin->w_cursor.coladd = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1019 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1020 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1021 else if (curwin->w_cursor.lnum <= curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1022 beginline(BL_SOL | BL_FIX);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1023 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1024 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1025 /* We get here with the current cursor line being past the end (eg
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1026 * after adding lines at the end of the file, and then undoing it).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1027 * check_cursor() will move the cursor to the last line. Move it to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1028 * the first column here. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1029 curwin->w_cursor.col = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1030 #ifdef FEAT_VIRTUALEDIT
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1031 curwin->w_cursor.coladd = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1032 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1033 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1034
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1035 /* Make sure the cursor is on an existing line and column. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1036 check_cursor();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1037 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1038
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1039 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1040 * If we deleted or added lines, report the number of less/more lines.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1041 * Otherwise, report the number of changes (this may be incorrect
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1042 * in some cases, but it's better than nothing).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1043 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1044 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1045 u_undo_end()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1046 {
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1047 long sec;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1048 char *msg;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1049
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1050 #ifdef FEAT_FOLDING
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1051 if ((fdo_flags & FDO_UNDO) && KeyTyped)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1052 foldOpenCursor();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1053 #endif
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1054
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1055 if (global_busy /* no messages now, wait until global is finished */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1056 || !messaging()) /* 'lazyredraw' set, don't do messages now */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1057 return;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1058
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1059 if (curbuf->b_ml.ml_flags & ML_EMPTY)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1060 --u_newcount;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1061
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1062 u_oldcount -= u_newcount;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1063 if (u_oldcount == -1)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1064 msg = N_("more line");
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1065 else if (u_oldcount < 0)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1066 msg = N_("more lines");
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1067 else if (u_oldcount == 1)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1068 msg = N_("line less");
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1069 else if (u_oldcount > 1)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1070 msg = N_("fewer lines");
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1071 else
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1072 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1073 u_oldcount = u_newcount;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1074 if (u_newcount == 1)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1075 msg = N_("change");
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1076 else
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1077 msg = N_("changes");
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1078 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1079
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1080 if (curbuf->b_u_curhead == 0)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1081 sec = 0;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1082 else
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1083 sec = time(NULL) - curbuf->b_u_curhead->uh_time;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1084
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1085 smsg((char_u *)_("%ld %s; %ld seconds ago"), u_oldcount, _(msg), sec);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1086 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1087
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1088 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1089 * u_sync: stop adding to the current entry list
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1090 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1091 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1092 u_sync()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1093 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1094 if (curbuf->b_u_synced)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1095 return; /* already synced */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1096 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1097 if (im_is_preediting())
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1098 return; /* XIM is busy, don't break an undo sequence */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1099 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1100 if (p_ul < 0)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1101 curbuf->b_u_synced = TRUE; /* no entries, nothing to do */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1102 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1103 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1104 u_getbot(); /* compute ue_bot of previous u_save */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1105 curbuf->b_u_curhead = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1106 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1107 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1108
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1109 /*
697
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1110 * ":undojoin": continue adding to the last entry list
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1111 */
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1112 /*ARGSUSED*/
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1113 void
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1114 ex_undojoin(eap)
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1115 exarg_T *eap;
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1116 {
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1117 if (!curbuf->b_u_synced)
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1118 return; /* already unsynced */
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1119 if (curbuf->b_u_newhead == NULL)
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1120 return; /* nothing changed before */
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1121 if (p_ul < 0)
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1122 return; /* no entries, nothing to do */
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1123 else
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1124 {
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1125 /* Go back to the last entry */
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1126 curbuf->b_u_curhead = curbuf->b_u_newhead;
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1127 curbuf->b_u_synced = FALSE; /* no entries, nothing to do */
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1128 }
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1129 }
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1130
f08390485cd3 updated for version 7.0210
vimboss
parents: 692
diff changeset
1131 /*
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1132 * Called after writing the file and setting b_changed to FALSE.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1133 * Now an undo means that the buffer is modified.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1134 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1135 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1136 u_unchanged(buf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1137 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1138 {
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1139 u_header_T *uh;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1140
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1141 for (uh = buf->b_u_newhead; uh; uh = uh->uh_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1142 uh->uh_flags |= UH_CHANGED;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1143 buf->b_did_warn = FALSE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1144 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1145
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1146 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1147 * Get pointer to last added entry.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1148 * If it's not valid, give an error message and return NULL.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1149 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1150 static u_entry_T *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1151 u_get_headentry()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1152 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1153 if (curbuf->b_u_newhead == NULL || curbuf->b_u_newhead->uh_entry == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1154 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1155 EMSG(_("E439: undo list corrupt"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1156 return NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1157 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1158 return curbuf->b_u_newhead->uh_entry;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1159 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1160
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1161 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1162 * u_getbot(): compute the line number of the previous u_save
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1163 * It is called only when b_u_synced is FALSE.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1164 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1165 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1166 u_getbot()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1167 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1168 u_entry_T *uep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1169 linenr_T extra;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1170
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1171 uep = u_get_headentry(); /* check for corrupt undo list */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1172 if (uep == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1173 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1174
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1175 uep = curbuf->b_u_newhead->uh_getbot_entry;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1176 if (uep != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1177 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1178 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1179 * the new ue_bot is computed from the number of lines that has been
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1180 * inserted (0 - deleted) since calling u_save. This is equal to the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1181 * old line count subtracted from the current line count.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1182 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1183 extra = curbuf->b_ml.ml_line_count - uep->ue_lcount;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1184 uep->ue_bot = uep->ue_top + uep->ue_size + 1 + extra;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1185 if (uep->ue_bot < 1 || uep->ue_bot > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1186 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1187 EMSG(_("E440: undo line missing"));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1188 uep->ue_bot = uep->ue_top + 1; /* assume all lines deleted, will
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1189 * get all the old lines back
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1190 * without deleting the current
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1191 * ones */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1192 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1193
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1194 curbuf->b_u_newhead->uh_getbot_entry = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1195 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1196
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1197 curbuf->b_u_synced = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1198 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1199
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1200 /*
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1201 * Free one header and its entry list and adjust the pointers.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1202 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1203 static void
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1204 u_freelist(buf, uhp, uhpp)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1205 buf_T *buf;
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1206 u_header_T *uhp;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1207 u_header_T **uhpp; /* if not NULL reset when freeing this header */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1208 {
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1209 /* When there is an alternate redo list free that branch completely,
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1210 * because we can never go there. */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1211 if (uhp->uh_alt_next != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1212 u_freebranch(buf, uhp->uh_alt_next, uhpp);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1213
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1214 if (uhp->uh_alt_prev != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1215 uhp->uh_alt_prev->uh_alt_next = NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1216
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1217 /* Update the links in the list to remove the header. */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1218 if (uhp->uh_next == NULL)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1219 buf->b_u_oldhead = uhp->uh_prev;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1220 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1221 uhp->uh_next->uh_prev = uhp->uh_prev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1222
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1223 if (uhp->uh_prev == NULL)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1224 buf->b_u_newhead = uhp->uh_next;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1225 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1226 uhp->uh_prev->uh_next = uhp->uh_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1227
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1228 u_freeentries(buf, uhp, uhpp);
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1229 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1230
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1231 /*
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1232 * Free an alternate branch and all following alternate branches.
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1233 */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1234 static void
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1235 u_freebranch(buf, uhp, uhpp)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1236 buf_T *buf;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1237 u_header_T *uhp;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1238 u_header_T **uhpp; /* if not NULL reset when freeing this header */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1239 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1240 u_header_T *tofree, *next;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1241
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1242 if (uhp->uh_alt_prev != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1243 uhp->uh_alt_prev->uh_alt_next = NULL;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1244
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1245 next = uhp;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1246 while (next != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1247 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1248 tofree = next;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1249 if (tofree->uh_alt_next != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1250 u_freebranch(buf, tofree->uh_alt_next, uhpp); /* recursive */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1251 next = tofree->uh_prev;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1252 u_freeentries(buf, tofree, uhpp);
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1253 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1254 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1255
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1256 /*
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1257 * Free all the undo entries for one header and the header itself.
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1258 * This means that "uhp" is invalid when returning.
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1259 */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1260 static void
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1261 u_freeentries(buf, uhp, uhpp)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1262 buf_T *buf;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1263 u_header_T *uhp;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1264 u_header_T **uhpp; /* if not NULL reset when freeing this header */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1265 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1266 u_entry_T *uep, *nuep;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1267
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1268 /* Check for pointers to the header that become invalid now. */
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1269 if (buf->b_u_curhead == uhp)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1270 buf->b_u_curhead = NULL;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1271 if (uhpp != NULL && uhp == *uhpp)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1272 *uhpp = NULL;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1273
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1274 for (uep = uhp->uh_entry; uep != NULL; uep = nuep)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1275 {
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1276 nuep = uep->ue_next;
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1277 u_freeentry(uep, uep->ue_size);
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1278 }
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1279
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1280 U_FREE_LINE((char_u *)uhp);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1281 --buf->b_u_numhead;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1282 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1283
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1284 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1285 * free entry 'uep' and 'n' lines in uep->ue_array[]
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1286 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1287 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1288 u_freeentry(uep, n)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1289 u_entry_T *uep;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1290 long n;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1291 {
414
8ab9c77240d4 updated for version 7.0108
vimboss
parents: 407
diff changeset
1292 while (n > 0)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1293 U_FREE_LINE(uep->ue_array[--n]);
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
1294 U_FREE_LINE((char_u *)uep->ue_array);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1295 U_FREE_LINE((char_u *)uep);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1296 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1297
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1298 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1299 * invalidate the undo buffer; called when storage has already been released
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1300 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1301 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1302 u_clearall(buf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1303 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1304 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1305 buf->b_u_newhead = buf->b_u_oldhead = buf->b_u_curhead = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1306 buf->b_u_synced = TRUE;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1307 buf->b_u_numhead = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1308 buf->b_u_line_ptr = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1309 buf->b_u_line_lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1310 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1311
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1312 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1313 * save the line "lnum" for the "U" command
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1314 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1315 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1316 u_saveline(lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1317 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1318 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1319 if (lnum == curbuf->b_u_line_lnum) /* line is already saved */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1320 return;
356
0f2b5d1b8117 updated for version 7.0092
vimboss
parents: 344
diff changeset
1321 if (lnum < 1 || lnum > curbuf->b_ml.ml_line_count) /* should never happen */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1322 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1323 u_clearline();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1324 curbuf->b_u_line_lnum = lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1325 if (curwin->w_cursor.lnum == lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1326 curbuf->b_u_line_colnr = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1327 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1328 curbuf->b_u_line_colnr = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1329 if ((curbuf->b_u_line_ptr = u_save_line(lnum)) == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1330 do_outofmem_msg((long_u)0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1331 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1332
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1333 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1334 * clear the line saved for the "U" command
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1335 * (this is used externally for crossing a line while in insert mode)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1336 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1337 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1338 u_clearline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1339 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1340 if (curbuf->b_u_line_ptr != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1341 {
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1342 U_FREE_LINE(curbuf->b_u_line_ptr);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1343 curbuf->b_u_line_ptr = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1344 curbuf->b_u_line_lnum = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1345 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1346 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1347
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1348 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1349 * Implementation of the "U" command.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1350 * Differentiation from vi: "U" can be undone with the next "U".
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1351 * We also allow the cursor to be in another line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1352 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1353 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1354 u_undoline()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1355 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1356 colnr_T t;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1357 char_u *oldp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1358
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1359 if (undo_off)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1360 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1361
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1362 if (curbuf->b_u_line_ptr == NULL ||
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1363 curbuf->b_u_line_lnum > curbuf->b_ml.ml_line_count)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1364 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1365 beep_flush();
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1366 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1367 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1368 /* first save the line for the 'u' command */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1369 if (u_savecommon(curbuf->b_u_line_lnum - 1,
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1370 curbuf->b_u_line_lnum + 1, (linenr_T)0) == FAIL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1371 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1372 oldp = u_save_line(curbuf->b_u_line_lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1373 if (oldp == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1374 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1375 do_outofmem_msg((long_u)0);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1376 return;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1377 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1378 ml_replace(curbuf->b_u_line_lnum, curbuf->b_u_line_ptr, TRUE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1379 changed_bytes(curbuf->b_u_line_lnum, 0);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1380 U_FREE_LINE(curbuf->b_u_line_ptr);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1381 curbuf->b_u_line_ptr = oldp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1382
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1383 t = curbuf->b_u_line_colnr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1384 if (curwin->w_cursor.lnum == curbuf->b_u_line_lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1385 curbuf->b_u_line_colnr = curwin->w_cursor.col;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1386 curwin->w_cursor.col = t;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1387 curwin->w_cursor.lnum = curbuf->b_u_line_lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1388 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1389
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1390 /*
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1391 * There are two implementations of the memory management for undo:
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1392 * 1. Use the standard malloc()/free() functions.
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1393 * This should be fast for allocating memory, but when a buffer is
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1394 * abandoned every single allocated chunk must be freed, which may be slow.
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1395 * 2. Allocate larger blocks of memory and keep track of chunks ourselves.
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1396 * This is fast for abandoning, but the use of linked lists is slow for
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1397 * finding a free chunk. Esp. when a lot of lines are changed or deleted.
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1398 * A bit of profiling showed that the first method is faster, especially when
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1399 * making a large number of changes, under the condition that malloc()/free()
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1400 * is implemented efficiently.
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1401 */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1402 #ifdef U_USE_MALLOC
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1403 /*
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1404 * Version of undo memory allocation using malloc()/free()
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1405 *
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1406 * U_FREE_LINE() and U_ALLOC_LINE() are macros that invoke vim_free() and
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1407 * lalloc() directly.
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1408 */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1409
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1410 /*
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1411 * Free all allocated memory blocks for the buffer 'buf'.
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1412 */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1413 void
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1414 u_blockfree(buf)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1415 buf_T *buf;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1416 {
753
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1417 while (buf->b_u_oldhead != NULL)
ac005a544e24 updated for version 7.0223
vimboss
parents: 697
diff changeset
1418 u_freelist(buf, buf->b_u_oldhead, NULL);
359
6c62b9b939bd updated for version 7.0093
vimboss
parents: 356
diff changeset
1419 U_FREE_LINE(buf->b_u_line_ptr);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1420 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1421
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1422 #else
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1423 /*
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1424 * Storage allocation for the undo lines and blocks of the current file.
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1425 * Version where Vim keeps track of the available memory.
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1426 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1427
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1428 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1429 * Memory is allocated in relatively large blocks. These blocks are linked
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1430 * in the allocated block list, headed by curbuf->b_block_head. They are all
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1431 * freed when abandoning a file, so we don't have to free every single line.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1432 * The list is kept sorted on memory address.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1433 * block_alloc() allocates a block.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1434 * m_blockfree() frees all blocks.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1435 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1436 * The available chunks of memory are kept in free chunk lists. There is
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1437 * one free list for each block of allocated memory. The list is kept sorted
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1438 * on memory address.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1439 * u_alloc_line() gets a chunk from the free lists.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1440 * u_free_line() returns a chunk to the free lists.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1441 * curbuf->b_m_search points to the chunk before the chunk that was
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1442 * freed/allocated the last time.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1443 * curbuf->b_mb_current points to the b_head where curbuf->b_m_search
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1444 * points into the free list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1445 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1446 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1447 * b_block_head /---> block #1 /---> block #2
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1448 * mb_next ---/ mb_next ---/ mb_next ---> NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1449 * mb_info mb_info mb_info
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1450 * | | |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1451 * V V V
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1452 * NULL free chunk #1.1 free chunk #2.1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1453 * | |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1454 * V V
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1455 * free chunk #1.2 NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1456 * |
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1457 * V
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1458 * NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1459 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1460 * When a single free chunk list would have been used, it could take a lot
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1461 * of time in u_free_line() to find the correct place to insert a chunk in the
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1462 * free list. The single free list would become very long when many lines are
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1463 * changed (e.g. with :%s/^M$//).
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1464 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1465
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1466 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1467 * this blocksize is used when allocating new lines
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1468 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1469 #define MEMBLOCKSIZE 2044
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1470
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1471 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1472 * The size field contains the size of the chunk, including the size field
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1473 * itself.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1474 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1475 * When the chunk is not in-use it is preceded with the m_info structure.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1476 * The m_next field links it in one of the free chunk lists.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1477 *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1478 * On most unix systems structures have to be longword (32 or 64 bit) aligned.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1479 * On most other systems they are short (16 bit) aligned.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1480 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1481
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1482 /* the structure definitions are now in structs.h */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1483
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1484 #ifdef ALIGN_LONG
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1485 /* size of m_size */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1486 # define M_OFFSET (sizeof(long_u))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1487 #else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1488 /* size of m_size */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1489 # define M_OFFSET (sizeof(short_u))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1490 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1491
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1492 static char_u *u_blockalloc __ARGS((long_u));
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1493
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1494 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1495 * Allocate a block of memory and link it in the allocated block list.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1496 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1497 static char_u *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1498 u_blockalloc(size)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1499 long_u size;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1500 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1501 mblock_T *p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1502 mblock_T *mp, *next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1503
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1504 p = (mblock_T *)lalloc(size + sizeof(mblock_T), FALSE);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1505 if (p != NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1506 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1507 /* Insert the block into the allocated block list, keeping it
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1508 sorted on address. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1509 for (mp = &curbuf->b_block_head;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1510 (next = mp->mb_next) != NULL && next < p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1511 mp = next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1512 ;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1513 p->mb_next = next; /* link in block list */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1514 p->mb_size = size;
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1515 p->mb_maxsize = 0; /* nothing free yet */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1516 mp->mb_next = p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1517 p->mb_info.m_next = NULL; /* clear free list */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1518 p->mb_info.m_size = 0;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1519 curbuf->b_mb_current = p; /* remember current block */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1520 curbuf->b_m_search = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1521 p++; /* return usable memory */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1522 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1523 return (char_u *)p;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1524 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1525
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1526 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1527 * free all allocated memory blocks for the buffer 'buf'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1528 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1529 void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1530 u_blockfree(buf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1531 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1532 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1533 mblock_T *p, *np;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1534
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1535 for (p = buf->b_block_head.mb_next; p != NULL; p = np)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1536 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1537 np = p->mb_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1538 vim_free(p);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1539 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1540 buf->b_block_head.mb_next = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1541 buf->b_m_search = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1542 buf->b_mb_current = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1543 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1544
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1545 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1546 * Free a chunk of memory for the current buffer.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1547 * Insert the chunk into the correct free list, keeping it sorted on address.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1548 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1549 static void
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1550 u_free_line(ptr, keep)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1551 char_u *ptr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1552 int keep; /* don't free the block when it's empty */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1553 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1554 minfo_T *next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1555 minfo_T *prev, *curr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1556 minfo_T *mp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1557 mblock_T *nextb;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1558 mblock_T *prevb;
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1559 long_u maxsize;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1560
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1561 if (ptr == NULL || ptr == IObuff)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1562 return; /* illegal address can happen in out-of-memory situations */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1563
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1564 mp = (minfo_T *)(ptr - M_OFFSET);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1565
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1566 /* find block where chunk could be a part off */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1567 /* if we change curbuf->b_mb_current, curbuf->b_m_search is set to NULL */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1568 if (curbuf->b_mb_current == NULL || mp < (minfo_T *)curbuf->b_mb_current)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1569 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1570 curbuf->b_mb_current = curbuf->b_block_head.mb_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1571 curbuf->b_m_search = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1572 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1573 if ((nextb = curbuf->b_mb_current->mb_next) != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1574 && (minfo_T *)nextb < mp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1575 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1576 curbuf->b_mb_current = nextb;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1577 curbuf->b_m_search = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1578 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1579 while ((nextb = curbuf->b_mb_current->mb_next) != NULL
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1580 && (minfo_T *)nextb < mp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1581 curbuf->b_mb_current = nextb;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1582
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1583 curr = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1584 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1585 * If mp is smaller than curbuf->b_m_search->m_next go to the start of
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1586 * the free list
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1587 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1588 if (curbuf->b_m_search == NULL || mp < (curbuf->b_m_search->m_next))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1589 next = &(curbuf->b_mb_current->mb_info);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1590 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1591 next = curbuf->b_m_search;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1592 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1593 * The following loop is executed very often.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1594 * Therefore it has been optimized at the cost of readability.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1595 * Keep it fast!
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1596 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1597 #ifdef SLOW_BUT_EASY_TO_READ
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1598 do
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1599 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1600 prev = curr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1601 curr = next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1602 next = next->m_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1603 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1604 while (mp > next && next != NULL);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1605 #else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1606 do /* first, middle, last */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1607 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1608 prev = next->m_next; /* curr, next, prev */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1609 if (prev == NULL || mp <= prev)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1610 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1611 prev = curr;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1612 curr = next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1613 next = next->m_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1614 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1615 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1616 curr = prev->m_next; /* next, prev, curr */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1617 if (curr == NULL || mp <= curr)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1618 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1619 prev = next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1620 curr = prev->m_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1621 next = curr->m_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1622 break;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1623 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1624 next = curr->m_next; /* prev, curr, next */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1625 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1626 while (mp > next && next != NULL);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1627 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1628
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1629 /* if *mp and *next are concatenated, join them into one chunk */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1630 if ((char_u *)mp + mp->m_size == (char_u *)next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1631 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1632 mp->m_size += next->m_size;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1633 mp->m_next = next->m_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1634 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1635 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1636 mp->m_next = next;
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1637 maxsize = mp->m_size;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1638
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1639 /* if *curr and *mp are concatenated, join them */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1640 if (prev != NULL && (char_u *)curr + curr->m_size == (char_u *)mp)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1641 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1642 curr->m_size += mp->m_size;
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1643 maxsize = curr->m_size;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1644 curr->m_next = mp->m_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1645 curbuf->b_m_search = prev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1646 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1647 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1648 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1649 curr->m_next = mp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1650 curbuf->b_m_search = curr; /* put curbuf->b_m_search before freed
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1651 chunk */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1652 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1653
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1654 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1655 * If the block only containes free memory now, release it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1656 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1657 if (!keep && curbuf->b_mb_current->mb_size
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1658 == curbuf->b_mb_current->mb_info.m_next->m_size)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1659 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1660 /* Find the block before the current one to be able to unlink it from
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1661 * the list of blocks. */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1662 prevb = &curbuf->b_block_head;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1663 for (nextb = prevb->mb_next; nextb != curbuf->b_mb_current;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1664 nextb = nextb->mb_next)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1665 prevb = nextb;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1666 prevb->mb_next = nextb->mb_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1667 vim_free(nextb);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1668 curbuf->b_mb_current = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1669 curbuf->b_m_search = NULL;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1670 }
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1671 else if (curbuf->b_mb_current->mb_maxsize < maxsize)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1672 curbuf->b_mb_current->mb_maxsize = maxsize;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1673 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1674
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1675 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1676 * Allocate and initialize a new line structure with room for at least
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1677 * 'size' characters plus a terminating NUL.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1678 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1679 static char_u *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1680 u_alloc_line(size)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1681 unsigned size;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1682 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1683 minfo_T *mp, *mprev, *mp2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1684 mblock_T *mbp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1685 int size_align;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1686
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1687 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1688 * Add room for size field and trailing NUL byte.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1689 * Adjust for minimal size (must be able to store minfo_T
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1690 * plus a trailing NUL, so the chunk can be released again)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1691 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1692 size += M_OFFSET + 1;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1693 if (size < sizeof(minfo_T) + 1)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1694 size = sizeof(minfo_T) + 1;
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 * round size up for alignment
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1698 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1699 size_align = (size + ALIGN_MASK) & ~ALIGN_MASK;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1700
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1701 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1702 * If curbuf->b_m_search is NULL (uninitialized free list) start at
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1703 * curbuf->b_block_head
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1704 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1705 if (curbuf->b_mb_current == NULL || curbuf->b_m_search == NULL)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1706 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1707 curbuf->b_mb_current = &curbuf->b_block_head;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1708 curbuf->b_m_search = &(curbuf->b_block_head.mb_info);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1709 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1710
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1711 /* Search for a block with enough space. */
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1712 mbp = curbuf->b_mb_current;
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1713 while (mbp->mb_maxsize < size_align)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1714 {
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1715 if (mbp->mb_next != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1716 mbp = mbp->mb_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1717 else
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1718 mbp = &curbuf->b_block_head;
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1719 if (mbp == curbuf->b_mb_current)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1720 {
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1721 int n = (size_align > (MEMBLOCKSIZE / 4)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1722 ? size_align : MEMBLOCKSIZE);
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1723
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1724 /* Back where we started in block list: need to add a new block
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1725 * with enough space. */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1726 mp = (minfo_T *)u_blockalloc((long_u)n);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1727 if (mp == NULL)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1728 return (NULL);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1729 mp->m_size = n;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1730 u_free_line((char_u *)mp + M_OFFSET, TRUE);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1731 mbp = curbuf->b_mb_current;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1732 break;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1733 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1734 }
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1735 if (mbp != curbuf->b_mb_current)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1736 curbuf->b_m_search = &(mbp->mb_info);
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1737
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1738 /* In this block find a chunk with enough space. */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1739 mprev = curbuf->b_m_search;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1740 mp = curbuf->b_m_search->m_next;
407
0f6afaf1b8d1 updated for version 7.0106
vimboss
parents: 359
diff changeset
1741 for (;;)
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1742 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1743 if (mp == NULL) /* at end of the list */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1744 mp = &(mbp->mb_info); /* wrap around to begin */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1745 if (mp->m_size >= size)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1746 break;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1747 if (mp == curbuf->b_m_search)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1748 {
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1749 /* back where we started in free chunk list: "cannot happen" */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1750 EMSG2(_(e_intern2), "u_alloc_line()");
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1751 return NULL;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1752 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1753 mprev = mp;
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1754 mp = mp->m_next;
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1755 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1756
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1757 /* when using the largest chunk adjust mb_maxsize */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1758 if (mp->m_size >= mbp->mb_maxsize)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1759 mbp->mb_maxsize = 0;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1760
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1761 /* if the chunk we found is large enough, split it up in two */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1762 if ((long)mp->m_size - size_align >= (long)(sizeof(minfo_T) + 1))
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1763 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1764 mp2 = (minfo_T *)((char_u *)mp + size_align);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1765 mp2->m_size = mp->m_size - size_align;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1766 mp2->m_next = mp->m_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1767 mprev->m_next = mp2;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1768 mp->m_size = size_align;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1769 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1770 else /* remove *mp from the free list */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1771 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1772 mprev->m_next = mp->m_next;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1773 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1774 curbuf->b_m_search = mprev;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1775 curbuf->b_mb_current = mbp;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1776
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1777 /* If using the largest chunk need to find the new largest chunk */
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1778 if (mbp->mb_maxsize == 0)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1779 for (mp2 = &(mbp->mb_info); mp2 != NULL; mp2 = mp2->m_next)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1780 if (mbp->mb_maxsize < mp2->m_size)
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1781 mbp->mb_maxsize = mp2->m_size;
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1782
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1783 mp = (minfo_T *)((char_u *)mp + M_OFFSET);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1784 *(char_u *)mp = NUL; /* set the first byte to NUL */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1785
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1786 return ((char_u *)mp);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1787 }
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1788 #endif
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 * u_save_line(): allocate memory with u_alloc_line() and copy line 'lnum'
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1792 * into it.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1793 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1794 static char_u *
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1795 u_save_line(lnum)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1796 linenr_T lnum;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1797 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1798 char_u *src;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1799 char_u *dst;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1800 unsigned len;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1801
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1802 src = ml_get(lnum);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1803 len = (unsigned)STRLEN(src);
168
4d9eabb1396e updated for version 7.0051
vimboss
parents: 33
diff changeset
1804 if ((dst = U_ALLOC_LINE(len)) != NULL)
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1805 mch_memmove(dst, src, (size_t)(len + 1));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1806 return (dst);
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1807 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1808
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1809 /*
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1810 * Check if the 'modified' flag is set, or 'ff' has changed (only need to
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1811 * check the first character, because it can only be "dos", "unix" or "mac").
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1812 * "nofile" and "scratch" type buffers are considered to always be unchanged.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1813 */
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1814 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1815 bufIsChanged(buf)
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1816 buf_T *buf;
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1817 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1818 return
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1819 #ifdef FEAT_QUICKFIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1820 !bt_dontwrite(buf) &&
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1821 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1822 (buf->b_changed || file_ff_differs(buf));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1823 }
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1824
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1825 int
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1826 curbufIsChanged()
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1827 {
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1828 return
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1829 #ifdef FEAT_QUICKFIX
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1830 !bt_dontwrite(curbuf) &&
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1831 #endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1832 (curbuf->b_changed || file_ff_differs(curbuf));
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1833 }