Mercurial > vim
annotate src/ops.c @ 11083:ae86651164d7 v8.0.0430
patch 8.0.0430: options test fails or hangs on MS-Windows
commit https://github.com/vim/vim/commit/bb962262eb6b18d93161d7506317d215ae80bfe5
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Mar 8 00:01:35 2017 +0100
patch 8.0.0430: options test fails or hangs on MS-Windows
Problem: Options test fails or hangs on MS-Windows.
Solution: Run it separately instead of part of test_alot. Use "-S" instead
of "-u" to run the script. Fix failures.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Wed, 08 Mar 2017 00:15:04 +0100 |
parents | f5bd684e47a1 |
children | 778c10516955 |
rev | line source |
---|---|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9834
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
7 | 2 * |
3 * VIM - Vi IMproved by Bram Moolenaar | |
4 * | |
5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
6 * Do ":help credits" in Vim to see a list of people who contributed. | |
7 * See README.txt for an overview of the Vim source code. | |
8 */ | |
9 | |
10 /* | |
11 * ops.c: implementation of various operators: op_shift, op_delete, op_tilde, | |
12 * op_change, op_yank, do_put, do_join | |
13 */ | |
14 | |
15 #include "vim.h" | |
16 | |
17 /* | |
18 * Number of registers. | |
19 * 0 = unnamed register, for normal yanks and puts | |
20 * 1..9 = registers '1' to '9', for deletes | |
21 * 10..35 = registers 'a' to 'z' | |
22 * 36 = delete register '-' | |
23 * 37 = Selection register '*'. Only if FEAT_CLIPBOARD defined | |
24 * 38 = Clipboard register '+'. Only if FEAT_CLIPBOARD and FEAT_X11 defined | |
25 */ | |
26 /* | |
27 * Symbolic names for some registers. | |
28 */ | |
29 #define DELETION_REGISTER 36 | |
30 #ifdef FEAT_CLIPBOARD | |
31 # define STAR_REGISTER 37 | |
32 # ifdef FEAT_X11 | |
33 # define PLUS_REGISTER 38 | |
34 # else | |
35 # define PLUS_REGISTER STAR_REGISTER /* there is only one */ | |
36 # endif | |
37 #endif | |
38 #ifdef FEAT_DND | |
39 # define TILDE_REGISTER (PLUS_REGISTER + 1) | |
40 #endif | |
41 | |
42 #ifdef FEAT_CLIPBOARD | |
43 # ifdef FEAT_DND | |
44 # define NUM_REGISTERS (TILDE_REGISTER + 1) | |
45 # else | |
46 # define NUM_REGISTERS (PLUS_REGISTER + 1) | |
47 # endif | |
48 #else | |
49 # define NUM_REGISTERS 37 | |
50 #endif | |
51 | |
52 /* | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
53 * Each yank register has an array of pointers to lines. |
7 | 54 */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
55 typedef struct |
7 | 56 { |
57 char_u **y_array; /* pointer to array of line pointers */ | |
58 linenr_T y_size; /* number of lines in y_array */ | |
59 char_u y_type; /* MLINE, MCHAR or MBLOCK */ | |
60 colnr_T y_width; /* only set if y_type == MBLOCK */ | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
61 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
62 time_t y_time_set; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
63 #endif |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
64 } yankreg_T; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
65 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
66 static yankreg_T y_regs[NUM_REGISTERS]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
67 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
68 static yankreg_T *y_current; /* ptr to current yankreg */ |
7 | 69 static int y_append; /* TRUE when appending */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
70 static yankreg_T *y_previous = NULL; /* ptr to last written yankreg */ |
7 | 71 |
72 /* | |
73 * structure used by block_prep, op_delete and op_yank for blockwise operators | |
74 * also op_change, op_shift, op_insert, op_replace - AKelly | |
75 */ | |
76 struct block_def | |
77 { | |
1839 | 78 int startspaces; /* 'extra' cols before first char */ |
79 int endspaces; /* 'extra' cols after last char */ | |
7 | 80 int textlen; /* chars in block */ |
1839 | 81 char_u *textstart; /* pointer to 1st char (partially) in block */ |
82 colnr_T textcol; /* index of chars (partially) in block */ | |
7 | 83 colnr_T start_vcol; /* start col of 1st char wholly inside block */ |
84 colnr_T end_vcol; /* start col of 1st char wholly after block */ | |
85 #ifdef FEAT_VISUALEXTRA | |
86 int is_short; /* TRUE if line is too short to fit in block */ | |
87 int is_MAX; /* TRUE if curswant==MAXCOL when starting */ | |
88 int is_oneChar; /* TRUE if block within one character */ | |
89 int pre_whitesp; /* screen cols of ws before block */ | |
90 int pre_whitesp_c; /* chars of ws before block */ | |
91 colnr_T end_char_vcols; /* number of vcols of post-block char */ | |
92 #endif | |
93 colnr_T start_char_vcols; /* number of vcols of pre-block char */ | |
94 }; | |
95 | |
96 #ifdef FEAT_VISUALEXTRA | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
97 static void shift_block(oparg_T *oap, int amount); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
98 static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def*bdp); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
99 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
100 static int stuff_yank(int, char_u *); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
101 static void put_reedit_in_typebuf(int silent); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
102 static int put_in_typebuf(char_u *s, int esc, int colon, |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
103 int silent); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
104 static void stuffescaped(char_u *arg, int literally); |
7 | 105 #ifdef FEAT_MBYTE |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
106 static void mb_adjust_opend(oparg_T *oap); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
107 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
108 static void free_yank(long); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
109 static void free_yank_all(void); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
110 static int yank_copy_line(struct block_def *bd, long y_idx); |
7 | 111 #ifdef FEAT_CLIPBOARD |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
112 static void copy_yank_reg(yankreg_T *reg); |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
113 static void may_set_selection(void); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
114 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
115 static void dis_msg(char_u *p, int skip_esc); |
3562 | 116 #if defined(FEAT_COMMENTS) || defined(PROTO) |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
117 static char_u *skip_comment(char_u *line, int process, int include_space, int *is_comment); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
118 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
119 static void block_prep(oparg_T *oap, struct block_def *, linenr_T, int); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
120 static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1); |
7 | 121 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
122 static void str_to_reg(yankreg_T *y_ptr, int yank_type, char_u *str, long len, long blocklen, int str_list); |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
123 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
124 static int ends_in_white(linenr_T lnum); |
7 | 125 #ifdef FEAT_COMMENTS |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
126 static int same_leader(linenr_T lnum, int, char_u *, int, char_u *); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
127 static int fmt_check_par(linenr_T, int *, char_u **, int do_comments); |
7 | 128 #else |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
129 static int fmt_check_par(linenr_T); |
7 | 130 #endif |
131 | |
132 /* | |
133 * The names of operators. | |
134 * IMPORTANT: Index must correspond with defines in vim.h!!! | |
135 * The third field indicates whether the operator always works on lines. | |
136 */ | |
137 static char opchars[][3] = | |
138 { | |
139 {NUL, NUL, FALSE}, /* OP_NOP */ | |
140 {'d', NUL, FALSE}, /* OP_DELETE */ | |
141 {'y', NUL, FALSE}, /* OP_YANK */ | |
142 {'c', NUL, FALSE}, /* OP_CHANGE */ | |
143 {'<', NUL, TRUE}, /* OP_LSHIFT */ | |
144 {'>', NUL, TRUE}, /* OP_RSHIFT */ | |
145 {'!', NUL, TRUE}, /* OP_FILTER */ | |
146 {'g', '~', FALSE}, /* OP_TILDE */ | |
147 {'=', NUL, TRUE}, /* OP_INDENT */ | |
148 {'g', 'q', TRUE}, /* OP_FORMAT */ | |
149 {':', NUL, TRUE}, /* OP_COLON */ | |
150 {'g', 'U', FALSE}, /* OP_UPPER */ | |
151 {'g', 'u', FALSE}, /* OP_LOWER */ | |
152 {'J', NUL, TRUE}, /* DO_JOIN */ | |
153 {'g', 'J', TRUE}, /* DO_JOIN_NS */ | |
154 {'g', '?', FALSE}, /* OP_ROT13 */ | |
155 {'r', NUL, FALSE}, /* OP_REPLACE */ | |
156 {'I', NUL, FALSE}, /* OP_INSERT */ | |
157 {'A', NUL, FALSE}, /* OP_APPEND */ | |
158 {'z', 'f', TRUE}, /* OP_FOLD */ | |
159 {'z', 'o', TRUE}, /* OP_FOLDOPEN */ | |
160 {'z', 'O', TRUE}, /* OP_FOLDOPENREC */ | |
161 {'z', 'c', TRUE}, /* OP_FOLDCLOSE */ | |
162 {'z', 'C', TRUE}, /* OP_FOLDCLOSEREC */ | |
163 {'z', 'd', TRUE}, /* OP_FOLDDEL */ | |
164 {'z', 'D', TRUE}, /* OP_FOLDDELREC */ | |
165 {'g', 'w', TRUE}, /* OP_FORMAT2 */ | |
603 | 166 {'g', '@', FALSE}, /* OP_FUNCTION */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
167 {Ctrl_A, NUL, FALSE}, /* OP_NR_ADD */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
168 {Ctrl_X, NUL, FALSE}, /* OP_NR_SUB */ |
7 | 169 }; |
170 | |
171 /* | |
172 * Translate a command name into an operator type. | |
173 * Must only be called with a valid operator name! | |
174 */ | |
175 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
176 get_op_type(int char1, int char2) |
7 | 177 { |
178 int i; | |
179 | |
180 if (char1 == 'r') /* ignore second character */ | |
181 return OP_REPLACE; | |
182 if (char1 == '~') /* when tilde is an operator */ | |
183 return OP_TILDE; | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
184 if (char1 == 'g' && char2 == Ctrl_A) /* add */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
185 return OP_NR_ADD; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
186 if (char1 == 'g' && char2 == Ctrl_X) /* subtract */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
187 return OP_NR_SUB; |
7 | 188 for (i = 0; ; ++i) |
189 if (opchars[i][0] == char1 && opchars[i][1] == char2) | |
190 break; | |
191 return i; | |
192 } | |
193 | |
194 /* | |
195 * Return TRUE if operator "op" always works on whole lines. | |
196 */ | |
197 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
198 op_on_lines(int op) |
7 | 199 { |
200 return opchars[op][2]; | |
201 } | |
202 | |
203 /* | |
204 * Get first operator command character. | |
205 * Returns 'g' or 'z' if there is another command character. | |
206 */ | |
207 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
208 get_op_char(int optype) |
7 | 209 { |
210 return opchars[optype][0]; | |
211 } | |
212 | |
213 /* | |
214 * Get second operator command character. | |
215 */ | |
216 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
217 get_extra_op_char(int optype) |
7 | 218 { |
219 return opchars[optype][1]; | |
220 } | |
221 | |
222 /* | |
223 * op_shift - handle a shift operation | |
224 */ | |
225 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
226 op_shift(oparg_T *oap, int curs_top, int amount) |
7 | 227 { |
228 long i; | |
229 int first_char; | |
230 char_u *s; | |
231 int block_col = 0; | |
232 | |
233 if (u_save((linenr_T)(oap->start.lnum - 1), | |
234 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
235 return; | |
236 | |
237 if (oap->block_mode) | |
238 block_col = curwin->w_cursor.col; | |
239 | |
240 for (i = oap->line_count; --i >= 0; ) | |
241 { | |
242 first_char = *ml_get_curline(); | |
243 if (first_char == NUL) /* empty line */ | |
244 curwin->w_cursor.col = 0; | |
245 #ifdef FEAT_VISUALEXTRA | |
246 else if (oap->block_mode) | |
247 shift_block(oap, amount); | |
248 #endif | |
249 else | |
250 /* Move the line right if it doesn't start with '#', 'smartindent' | |
251 * isn't set or 'cindent' isn't set or '#' isn't in 'cino'. */ | |
252 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
253 if (first_char != '#' || !preprocs_left()) | |
254 #endif | |
255 { | |
1516 | 256 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE); |
7 | 257 } |
258 ++curwin->w_cursor.lnum; | |
259 } | |
260 | |
261 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
262 if (oap->block_mode) | |
263 { | |
264 curwin->w_cursor.lnum = oap->start.lnum; | |
265 curwin->w_cursor.col = block_col; | |
266 } | |
5735 | 267 else if (curs_top) /* put cursor on first line, for ">>" */ |
7 | 268 { |
269 curwin->w_cursor.lnum = oap->start.lnum; | |
270 beginline(BL_SOL | BL_FIX); /* shift_line() may have set cursor.col */ | |
271 } | |
272 else | |
273 --curwin->w_cursor.lnum; /* put cursor on last line, for ":>" */ | |
274 | |
10486
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
275 #ifdef FEAT_FOLDING |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
276 /* The cursor line is not in a closed fold */ |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
277 foldOpenCursor(); |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
278 #endif |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
279 |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
280 |
7 | 281 if (oap->line_count > p_report) |
282 { | |
283 if (oap->op_type == OP_RSHIFT) | |
284 s = (char_u *)">"; | |
285 else | |
286 s = (char_u *)"<"; | |
287 if (oap->line_count == 1) | |
288 { | |
289 if (amount == 1) | |
290 sprintf((char *)IObuff, _("1 line %sed 1 time"), s); | |
291 else | |
292 sprintf((char *)IObuff, _("1 line %sed %d times"), s, amount); | |
293 } | |
294 else | |
295 { | |
296 if (amount == 1) | |
297 sprintf((char *)IObuff, _("%ld lines %sed 1 time"), | |
298 oap->line_count, s); | |
299 else | |
300 sprintf((char *)IObuff, _("%ld lines %sed %d times"), | |
301 oap->line_count, s, amount); | |
302 } | |
303 msg(IObuff); | |
304 } | |
305 | |
306 /* | |
307 * Set "'[" and "']" marks. | |
308 */ | |
309 curbuf->b_op_start = oap->start; | |
310 curbuf->b_op_end.lnum = oap->end.lnum; | |
311 curbuf->b_op_end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
312 if (curbuf->b_op_end.col > 0) | |
313 --curbuf->b_op_end.col; | |
314 } | |
315 | |
316 /* | |
317 * shift the current line one shiftwidth left (if left != 0) or right | |
318 * leaves cursor on first blank in the line | |
319 */ | |
320 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
321 shift_line( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
322 int left, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
323 int round, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
324 int amount, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
325 int call_changed_bytes) /* call changed_bytes() */ |
7 | 326 { |
327 int count; | |
328 int i, j; | |
5438 | 329 int p_sw = (int)get_sw_value(curbuf); |
7 | 330 |
331 count = get_indent(); /* get current indent */ | |
332 | |
333 if (round) /* round off indent */ | |
334 { | |
335 i = count / p_sw; /* number of p_sw rounded down */ | |
336 j = count % p_sw; /* extra spaces */ | |
337 if (j && left) /* first remove extra spaces */ | |
338 --amount; | |
339 if (left) | |
340 { | |
341 i -= amount; | |
342 if (i < 0) | |
343 i = 0; | |
344 } | |
345 else | |
346 i += amount; | |
347 count = i * p_sw; | |
348 } | |
349 else /* original vi indent */ | |
350 { | |
351 if (left) | |
352 { | |
353 count -= p_sw * amount; | |
354 if (count < 0) | |
355 count = 0; | |
356 } | |
357 else | |
358 count += p_sw * amount; | |
359 } | |
360 | |
361 /* Set new indent */ | |
362 #ifdef FEAT_VREPLACE | |
363 if (State & VREPLACE_FLAG) | |
1516 | 364 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes); |
7 | 365 else |
366 #endif | |
1516 | 367 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0); |
7 | 368 } |
369 | |
370 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
371 /* | |
372 * Shift one line of the current block one shiftwidth right or left. | |
373 * Leaves cursor on first character in block. | |
374 */ | |
375 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
376 shift_block(oparg_T *oap, int amount) |
7 | 377 { |
378 int left = (oap->op_type == OP_LSHIFT); | |
379 int oldstate = State; | |
1839 | 380 int total; |
381 char_u *newp, *oldp; | |
7 | 382 int oldcol = curwin->w_cursor.col; |
5438 | 383 int p_sw = (int)get_sw_value(curbuf); |
7 | 384 int p_ts = (int)curbuf->b_p_ts; |
385 struct block_def bd; | |
386 int incr; | |
1839 | 387 colnr_T ws_vcol; |
7 | 388 int i = 0, j = 0; |
389 int len; | |
390 #ifdef FEAT_RIGHTLEFT | |
391 int old_p_ri = p_ri; | |
392 | |
4352 | 393 p_ri = 0; /* don't want revins in indent */ |
7 | 394 #endif |
395 | |
396 State = INSERT; /* don't want REPLACE for State */ | |
397 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); | |
398 if (bd.is_short) | |
399 return; | |
400 | |
401 /* total is number of screen columns to be inserted/removed */ | |
402 total = amount * p_sw; | |
403 oldp = ml_get_curline(); | |
404 | |
405 if (!left) | |
406 { | |
407 /* | |
408 * 1. Get start vcol | |
409 * 2. Total ws vcols | |
410 * 3. Divvy into TABs & spp | |
411 * 4. Construct new string | |
412 */ | |
413 total += bd.pre_whitesp; /* all virtual WS upto & incl a split TAB */ | |
414 ws_vcol = bd.start_vcol - bd.pre_whitesp; | |
415 if (bd.startspaces) | |
416 { | |
417 #ifdef FEAT_MBYTE | |
418 if (has_mbyte) | |
8399
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
419 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
420 if ((*mb_ptr2len)(bd.textstart) == 1) |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
421 ++bd.textstart; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
422 else |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
423 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
424 ws_vcol = 0; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
425 bd.startspaces = 0; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
426 } |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
427 } |
1995 | 428 else |
429 #endif | |
430 ++bd.textstart; | |
7 | 431 } |
432 for ( ; vim_iswhite(*bd.textstart); ) | |
433 { | |
5995 | 434 /* TODO: is passing bd.textstart for start of the line OK? */ |
435 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, | |
436 (colnr_T)(bd.start_vcol)); | |
7 | 437 total += incr; |
438 bd.start_vcol += incr; | |
439 } | |
440 /* OK, now total=all the VWS reqd, and textstart points at the 1st | |
441 * non-ws char in the block. */ | |
442 if (!curbuf->b_p_et) | |
443 i = ((ws_vcol % p_ts) + total) / p_ts; /* number of tabs */ | |
444 if (i) | |
445 j = ((ws_vcol % p_ts) + total) % p_ts; /* number of spp */ | |
446 else | |
447 j = total; | |
448 /* if we're splitting a TAB, allow for it */ | |
449 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0); | |
450 len = (int)STRLEN(bd.textstart) + 1; | |
451 newp = alloc_check((unsigned)(bd.textcol + i + j + len)); | |
452 if (newp == NULL) | |
453 return; | |
454 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len)); | |
455 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
6929 | 456 vim_memset(newp + bd.textcol, TAB, (size_t)i); |
457 vim_memset(newp + bd.textcol + i, ' ', (size_t)j); | |
7 | 458 /* the end */ |
459 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len); | |
460 } | |
461 else /* left */ | |
462 { | |
1839 | 463 colnr_T destination_col; /* column to which text in block will |
464 be shifted */ | |
465 char_u *verbatim_copy_end; /* end of the part of the line which is | |
466 copied verbatim */ | |
467 colnr_T verbatim_copy_width;/* the (displayed) width of this part | |
468 of line */ | |
469 unsigned fill; /* nr of spaces that replace a TAB */ | |
470 unsigned new_line_len; /* the length of the line after the | |
471 block shift */ | |
472 size_t block_space_width; | |
473 size_t shift_amount; | |
474 char_u *non_white = bd.textstart; | |
475 colnr_T non_white_col; | |
476 | |
477 /* | |
478 * Firstly, let's find the first non-whitespace character that is | |
479 * displayed after the block's start column and the character's column | |
480 * number. Also, let's calculate the width of all the whitespace | |
481 * characters that are displayed in the block and precede the searched | |
482 * non-whitespace character. | |
483 */ | |
484 | |
485 /* If "bd.startspaces" is set, "bd.textstart" points to the character, | |
486 * the part of which is displayed at the block's beginning. Let's start | |
487 * searching from the next character. */ | |
488 if (bd.startspaces) | |
489 mb_ptr_adv(non_white); | |
490 | |
491 /* The character's column is in "bd.start_vcol". */ | |
492 non_white_col = bd.start_vcol; | |
493 | |
494 while (vim_iswhite(*non_white)) | |
7 | 495 { |
5995 | 496 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col); |
1839 | 497 non_white_col += incr; |
7 | 498 } |
1839 | 499 |
500 block_space_width = non_white_col - oap->start_vcol; | |
501 /* We will shift by "total" or "block_space_width", whichever is less. | |
502 */ | |
1860 | 503 shift_amount = (block_space_width < (size_t)total |
504 ? block_space_width : (size_t)total); | |
1839 | 505 |
506 /* The column to which we will shift the text. */ | |
1860 | 507 destination_col = (colnr_T)(non_white_col - shift_amount); |
1839 | 508 |
509 /* Now let's find out how much of the beginning of the line we can | |
510 * reuse without modification. */ | |
511 verbatim_copy_end = bd.textstart; | |
512 verbatim_copy_width = bd.start_vcol; | |
513 | |
514 /* If "bd.startspaces" is set, "bd.textstart" points to the character | |
515 * preceding the block. We have to subtract its width to obtain its | |
516 * column number. */ | |
517 if (bd.startspaces) | |
518 verbatim_copy_width -= bd.start_char_vcols; | |
519 while (verbatim_copy_width < destination_col) | |
7 | 520 { |
5995 | 521 char_u *line = verbatim_copy_end; |
522 | |
523 /* TODO: is passing verbatim_copy_end for start of the line OK? */ | |
524 incr = lbr_chartabsize(line, verbatim_copy_end, | |
525 verbatim_copy_width); | |
1839 | 526 if (verbatim_copy_width + incr > destination_col) |
527 break; | |
528 verbatim_copy_width += incr; | |
529 mb_ptr_adv(verbatim_copy_end); | |
7 | 530 } |
531 | |
1839 | 532 /* If "destination_col" is different from the width of the initial |
533 * part of the line that will be copied, it means we encountered a tab | |
534 * character, which we will have to partly replace with spaces. */ | |
535 fill = destination_col - verbatim_copy_width; | |
536 | |
537 /* The replacement line will consist of: | |
538 * - the beginning of the original line up to "verbatim_copy_end", | |
539 * - "fill" number of spaces, | |
540 * - the rest of the line, pointed to by non_white. */ | |
541 new_line_len = (unsigned)(verbatim_copy_end - oldp) | |
542 + fill | |
543 + (unsigned)STRLEN(non_white) + 1; | |
544 | |
545 newp = alloc_check(new_line_len); | |
7 | 546 if (newp == NULL) |
547 return; | |
1839 | 548 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); |
6929 | 549 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill); |
1839 | 550 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); |
7 | 551 } |
552 /* replace the line */ | |
553 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
554 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol); | |
555 State = oldstate; | |
556 curwin->w_cursor.col = oldcol; | |
557 #ifdef FEAT_RIGHTLEFT | |
558 p_ri = old_p_ri; | |
559 #endif | |
560 } | |
561 #endif | |
562 | |
563 #ifdef FEAT_VISUALEXTRA | |
564 /* | |
565 * Insert string "s" (b_insert ? before : after) block :AKelly | |
566 * Caller must prepare for undo. | |
567 */ | |
568 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
569 block_insert( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
570 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
571 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
572 int b_insert, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
573 struct block_def *bdp) |
7 | 574 { |
575 int p_ts; | |
576 int count = 0; /* extra spaces to replace a cut TAB */ | |
577 int spaces = 0; /* non-zero if cutting a TAB */ | |
578 colnr_T offset; /* pointer along new line */ | |
579 unsigned s_len; /* STRLEN(s) */ | |
580 char_u *newp, *oldp; /* new, old lines */ | |
581 linenr_T lnum; /* loop var */ | |
582 int oldstate = State; | |
583 | |
584 State = INSERT; /* don't want REPLACE for State */ | |
585 s_len = (unsigned)STRLEN(s); | |
586 | |
587 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) | |
588 { | |
589 block_prep(oap, bdp, lnum, TRUE); | |
590 if (bdp->is_short && b_insert) | |
591 continue; /* OP_INSERT, line ends before block start */ | |
592 | |
593 oldp = ml_get(lnum); | |
594 | |
595 if (b_insert) | |
596 { | |
597 p_ts = bdp->start_char_vcols; | |
598 spaces = bdp->startspaces; | |
599 if (spaces != 0) | |
600 count = p_ts - 1; /* we're cutting a TAB */ | |
601 offset = bdp->textcol; | |
602 } | |
603 else /* append */ | |
604 { | |
605 p_ts = bdp->end_char_vcols; | |
606 if (!bdp->is_short) /* spaces = padding after block */ | |
607 { | |
608 spaces = (bdp->endspaces ? p_ts - bdp->endspaces : 0); | |
609 if (spaces != 0) | |
610 count = p_ts - 1; /* we're cutting a TAB */ | |
611 offset = bdp->textcol + bdp->textlen - (spaces != 0); | |
612 } | |
613 else /* spaces = padding to block edge */ | |
614 { | |
615 /* if $ used, just append to EOL (ie spaces==0) */ | |
616 if (!bdp->is_MAX) | |
617 spaces = (oap->end_vcol - bdp->end_vcol) + 1; | |
618 count = spaces; | |
619 offset = bdp->textcol + bdp->textlen; | |
620 } | |
621 } | |
622 | |
6140 | 623 #ifdef FEAT_MBYTE |
624 if (has_mbyte && spaces > 0) | |
625 { | |
6460 | 626 int off; |
627 | |
6140 | 628 /* Avoid starting halfway a multi-byte character. */ |
629 if (b_insert) | |
630 { | |
6460 | 631 off = (*mb_head_off)(oldp, oldp + offset + spaces); |
6140 | 632 } |
633 else | |
634 { | |
6460 | 635 off = (*mb_off_next)(oldp, oldp + offset); |
6140 | 636 offset += off; |
637 } | |
6460 | 638 spaces -= off; |
639 count -= off; | |
6140 | 640 } |
641 #endif | |
642 | |
7 | 643 newp = alloc_check((unsigned)(STRLEN(oldp)) + s_len + count + 1); |
644 if (newp == NULL) | |
645 continue; | |
646 | |
647 /* copy up to shifted part */ | |
648 mch_memmove(newp, oldp, (size_t)(offset)); | |
649 oldp += offset; | |
650 | |
651 /* insert pre-padding */ | |
6929 | 652 vim_memset(newp + offset, ' ', (size_t)spaces); |
7 | 653 |
654 /* copy the new text */ | |
655 mch_memmove(newp + offset + spaces, s, (size_t)s_len); | |
656 offset += s_len; | |
657 | |
658 if (spaces && !bdp->is_short) | |
659 { | |
660 /* insert post-padding */ | |
6929 | 661 vim_memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces)); |
7 | 662 /* We're splitting a TAB, don't copy it. */ |
663 oldp++; | |
664 /* We allowed for that TAB, remember this now */ | |
665 count++; | |
666 } | |
667 | |
668 if (spaces > 0) | |
669 offset += count; | |
1622 | 670 STRMOVE(newp + offset, oldp); |
7 | 671 |
672 ml_replace(lnum, newp, FALSE); | |
673 | |
674 if (lnum == oap->end.lnum) | |
675 { | |
676 /* Set "']" mark to the end of the block instead of the end of | |
677 * the insert in the first line. */ | |
678 curbuf->b_op_end.lnum = oap->end.lnum; | |
679 curbuf->b_op_end.col = offset; | |
680 } | |
681 } /* for all lnum */ | |
682 | |
683 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
684 | |
685 State = oldstate; | |
686 } | |
687 #endif | |
688 | |
689 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(PROTO) | |
690 /* | |
691 * op_reindent - handle reindenting a block of lines. | |
692 */ | |
693 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
694 op_reindent(oparg_T *oap, int (*how)(void)) |
7 | 695 { |
696 long i; | |
697 char_u *l; | |
6971 | 698 int amount; |
7 | 699 linenr_T first_changed = 0; |
700 linenr_T last_changed = 0; | |
701 linenr_T start_lnum = curwin->w_cursor.lnum; | |
702 | |
216 | 703 /* Don't even try when 'modifiable' is off. */ |
704 if (!curbuf->b_p_ma) | |
705 { | |
706 EMSG(_(e_modifiable)); | |
707 return; | |
708 } | |
709 | |
7 | 710 for (i = oap->line_count; --i >= 0 && !got_int; ) |
711 { | |
712 /* it's a slow thing to do, so give feedback so there's no worry that | |
713 * the computer's just hung. */ | |
714 | |
715 if (i > 1 | |
716 && (i % 50 == 0 || i == oap->line_count - 1) | |
717 && oap->line_count > p_report) | |
718 smsg((char_u *)_("%ld lines to indent... "), i); | |
719 | |
720 /* | |
721 * Be vi-compatible: For lisp indenting the first line is not | |
722 * indented, unless there is only one line. | |
723 */ | |
724 #ifdef FEAT_LISP | |
725 if (i != oap->line_count - 1 || oap->line_count == 1 | |
726 || how != get_lisp_indent) | |
727 #endif | |
728 { | |
729 l = skipwhite(ml_get_curline()); | |
730 if (*l == NUL) /* empty or blank line */ | |
6971 | 731 amount = 0; |
7 | 732 else |
6971 | 733 amount = how(); /* get the indent for this line */ |
734 | |
735 if (amount >= 0 && set_indent(amount, SIN_UNDO)) | |
7 | 736 { |
737 /* did change the indent, call changed_lines() later */ | |
738 if (first_changed == 0) | |
739 first_changed = curwin->w_cursor.lnum; | |
740 last_changed = curwin->w_cursor.lnum; | |
741 } | |
742 } | |
743 ++curwin->w_cursor.lnum; | |
1550 | 744 curwin->w_cursor.col = 0; /* make sure it's valid */ |
7 | 745 } |
746 | |
747 /* put cursor on first non-blank of indented line */ | |
748 curwin->w_cursor.lnum = start_lnum; | |
749 beginline(BL_SOL | BL_FIX); | |
750 | |
751 /* Mark changed lines so that they will be redrawn. When Visual | |
752 * highlighting was present, need to continue until the last line. When | |
753 * there is no change still need to remove the Visual highlighting. */ | |
754 if (last_changed != 0) | |
755 changed_lines(first_changed, 0, | |
756 oap->is_VIsual ? start_lnum + oap->line_count : | |
757 last_changed + 1, 0L); | |
758 else if (oap->is_VIsual) | |
759 redraw_curbuf_later(INVERTED); | |
760 | |
761 if (oap->line_count > p_report) | |
762 { | |
763 i = oap->line_count - (i + 1); | |
764 if (i == 1) | |
765 MSG(_("1 line indented ")); | |
766 else | |
767 smsg((char_u *)_("%ld lines indented "), i); | |
768 } | |
769 /* set '[ and '] marks */ | |
770 curbuf->b_op_start = oap->start; | |
771 curbuf->b_op_end = oap->end; | |
772 } | |
773 #endif /* defined(FEAT_LISP) || defined(FEAT_CINDENT) */ | |
774 | |
775 #if defined(FEAT_EVAL) || defined(PROTO) | |
776 /* | |
777 * Keep the last expression line here, for repeating. | |
778 */ | |
779 static char_u *expr_line = NULL; | |
780 | |
781 /* | |
782 * Get an expression for the "\"=expr1" or "CTRL-R =expr1" | |
783 * Returns '=' when OK, NUL otherwise. | |
784 */ | |
785 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
786 get_expr_register(void) |
7 | 787 { |
788 char_u *new_line; | |
789 | |
790 new_line = getcmdline('=', 0L, 0); | |
791 if (new_line == NULL) | |
792 return NUL; | |
793 if (*new_line == NUL) /* use previous line */ | |
794 vim_free(new_line); | |
795 else | |
796 set_expr_line(new_line); | |
797 return '='; | |
798 } | |
799 | |
800 /* | |
801 * Set the expression for the '=' register. | |
802 * Argument must be an allocated string. | |
803 */ | |
804 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
805 set_expr_line(char_u *new_line) |
7 | 806 { |
807 vim_free(expr_line); | |
808 expr_line = new_line; | |
809 } | |
810 | |
811 /* | |
812 * Get the result of the '=' register expression. | |
813 * Returns a pointer to allocated memory, or NULL for failure. | |
814 */ | |
815 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
816 get_expr_line(void) |
7 | 817 { |
818 char_u *expr_copy; | |
819 char_u *rv; | |
994 | 820 static int nested = 0; |
7 | 821 |
822 if (expr_line == NULL) | |
823 return NULL; | |
824 | |
825 /* Make a copy of the expression, because evaluating it may cause it to be | |
826 * changed. */ | |
827 expr_copy = vim_strsave(expr_line); | |
828 if (expr_copy == NULL) | |
829 return NULL; | |
830 | |
994 | 831 /* When we are invoked recursively limit the evaluation to 10 levels. |
832 * Then return the string as-is. */ | |
833 if (nested >= 10) | |
834 return expr_copy; | |
835 | |
836 ++nested; | |
714 | 837 rv = eval_to_string(expr_copy, NULL, TRUE); |
994 | 838 --nested; |
7 | 839 vim_free(expr_copy); |
840 return rv; | |
841 } | |
283 | 842 |
843 /* | |
844 * Get the '=' register expression itself, without evaluating it. | |
845 */ | |
846 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
847 get_expr_line_src(void) |
283 | 848 { |
849 if (expr_line == NULL) | |
850 return NULL; | |
851 return vim_strsave(expr_line); | |
852 } | |
7 | 853 #endif /* FEAT_EVAL */ |
854 | |
855 /* | |
856 * Check if 'regname' is a valid name of a yank register. | |
857 * Note: There is no check for 0 (default register), caller should do this | |
858 */ | |
859 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
860 valid_yank_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
861 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
862 int writing) /* if TRUE check for writable registers */ |
7 | 863 { |
864 if ( (regname > 0 && ASCII_ISALNUM(regname)) | |
865 || (!writing && vim_strchr((char_u *) | |
866 #ifdef FEAT_EVAL | |
6557 | 867 "/.%:=" |
7 | 868 #else |
6557 | 869 "/.%:" |
7 | 870 #endif |
871 , regname) != NULL) | |
6557 | 872 || regname == '#' |
7 | 873 || regname == '"' |
874 || regname == '-' | |
875 || regname == '_' | |
876 #ifdef FEAT_CLIPBOARD | |
877 || regname == '*' | |
878 || regname == '+' | |
879 #endif | |
880 #ifdef FEAT_DND | |
881 || (!writing && regname == '~') | |
882 #endif | |
883 ) | |
884 return TRUE; | |
885 return FALSE; | |
886 } | |
887 | |
888 /* | |
889 * Set y_current and y_append, according to the value of "regname". | |
890 * Cannot handle the '_' register. | |
140 | 891 * Must only be called with a valid register name! |
7 | 892 * |
893 * If regname is 0 and writing, use register 0 | |
894 * If regname is 0 and reading, use previous register | |
895 */ | |
15 | 896 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
897 get_yank_register(int regname, int writing) |
7 | 898 { |
899 int i; | |
900 | |
901 y_append = FALSE; | |
902 if ((regname == 0 || regname == '"') && !writing && y_previous != NULL) | |
903 { | |
904 y_current = y_previous; | |
905 return; | |
906 } | |
907 i = regname; | |
908 if (VIM_ISDIGIT(i)) | |
909 i -= '0'; | |
910 else if (ASCII_ISLOWER(i)) | |
911 i = CharOrdLow(i) + 10; | |
912 else if (ASCII_ISUPPER(i)) | |
913 { | |
914 i = CharOrdUp(i) + 10; | |
915 y_append = TRUE; | |
916 } | |
917 else if (regname == '-') | |
918 i = DELETION_REGISTER; | |
919 #ifdef FEAT_CLIPBOARD | |
920 /* When selection is not available, use register 0 instead of '*' */ | |
921 else if (clip_star.available && regname == '*') | |
922 i = STAR_REGISTER; | |
923 /* When clipboard is not available, use register 0 instead of '+' */ | |
924 else if (clip_plus.available && regname == '+') | |
925 i = PLUS_REGISTER; | |
926 #endif | |
927 #ifdef FEAT_DND | |
928 else if (!writing && regname == '~') | |
929 i = TILDE_REGISTER; | |
930 #endif | |
931 else /* not 0-9, a-z, A-Z or '-': use register 0 */ | |
932 i = 0; | |
933 y_current = &(y_regs[i]); | |
934 if (writing) /* remember the register we write into for do_put() */ | |
935 y_previous = y_current; | |
936 } | |
937 | |
15 | 938 #if defined(FEAT_CLIPBOARD) || defined(PROTO) |
7 | 939 /* |
940 * When "regname" is a clipboard register, obtain the selection. If it's not | |
941 * available return zero, otherwise return "regname". | |
942 */ | |
15 | 943 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
944 may_get_selection(int regname) |
7 | 945 { |
946 if (regname == '*') | |
947 { | |
948 if (!clip_star.available) | |
949 regname = 0; | |
950 else | |
951 clip_get_selection(&clip_star); | |
952 } | |
953 else if (regname == '+') | |
954 { | |
955 if (!clip_plus.available) | |
956 regname = 0; | |
957 else | |
958 clip_get_selection(&clip_plus); | |
959 } | |
960 return regname; | |
961 } | |
962 #endif | |
963 | |
964 /* | |
965 * Obtain the contents of a "normal" register. The register is made empty. | |
966 * The returned pointer has allocated memory, use put_register() later. | |
967 */ | |
968 void * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
969 get_register( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
970 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
971 int copy) /* make a copy, if FALSE make register empty. */ |
7 | 972 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
973 yankreg_T *reg; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
974 int i; |
7 | 975 |
976 #ifdef FEAT_CLIPBOARD | |
977 /* When Visual area changed, may have to update selection. Obtain the | |
978 * selection too. */ | |
1435 | 979 if (name == '*' && clip_star.available) |
7 | 980 { |
3674 | 981 if (clip_isautosel_star()) |
982 clip_update_selection(&clip_star); | |
983 may_get_selection(name); | |
984 } | |
985 if (name == '+' && clip_plus.available) | |
986 { | |
987 if (clip_isautosel_plus()) | |
988 clip_update_selection(&clip_plus); | |
7 | 989 may_get_selection(name); |
990 } | |
991 #endif | |
992 | |
993 get_yank_register(name, 0); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
994 reg = (yankreg_T *)alloc((unsigned)sizeof(yankreg_T)); |
7 | 995 if (reg != NULL) |
996 { | |
997 *reg = *y_current; | |
998 if (copy) | |
999 { | |
1000 /* If we run out of memory some or all of the lines are empty. */ | |
1001 if (reg->y_size == 0) | |
1002 reg->y_array = NULL; | |
1003 else | |
1004 reg->y_array = (char_u **)alloc((unsigned)(sizeof(char_u *) | |
1005 * reg->y_size)); | |
1006 if (reg->y_array != NULL) | |
1007 { | |
1008 for (i = 0; i < reg->y_size; ++i) | |
1009 reg->y_array[i] = vim_strsave(y_current->y_array[i]); | |
1010 } | |
1011 } | |
1012 else | |
1013 y_current->y_array = NULL; | |
1014 } | |
1015 return (void *)reg; | |
1016 } | |
1017 | |
1018 /* | |
1451 | 1019 * Put "reg" into register "name". Free any previous contents and "reg". |
7 | 1020 */ |
1021 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1022 put_register(int name, void *reg) |
7 | 1023 { |
1024 get_yank_register(name, 0); | |
1025 free_yank_all(); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1026 *y_current = *(yankreg_T *)reg; |
1451 | 1027 vim_free(reg); |
7 | 1028 |
5735 | 1029 #ifdef FEAT_CLIPBOARD |
7 | 1030 /* Send text written to clipboard register to the clipboard. */ |
1031 may_set_selection(); | |
5735 | 1032 #endif |
7 | 1033 } |
4209 | 1034 |
1035 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1036 free_register(void *reg) |
4209 | 1037 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1038 yankreg_T tmp; |
4209 | 1039 |
1040 tmp = *y_current; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1041 *y_current = *(yankreg_T *)reg; |
4209 | 1042 free_yank_all(); |
1043 vim_free(reg); | |
1044 *y_current = tmp; | |
1045 } | |
7 | 1046 |
1047 #if defined(FEAT_MOUSE) || defined(PROTO) | |
1048 /* | |
1049 * return TRUE if the current yank register has type MLINE | |
1050 */ | |
1051 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1052 yank_register_mline(int regname) |
7 | 1053 { |
1054 if (regname != 0 && !valid_yank_reg(regname, FALSE)) | |
1055 return FALSE; | |
1056 if (regname == '_') /* black hole is always empty */ | |
1057 return FALSE; | |
1058 get_yank_register(regname, FALSE); | |
1059 return (y_current->y_type == MLINE); | |
1060 } | |
1061 #endif | |
1062 | |
1063 /* | |
1157 | 1064 * Start or stop recording into a yank register. |
7 | 1065 * |
1157 | 1066 * Return FAIL for failure, OK otherwise. |
7 | 1067 */ |
1068 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1069 do_record(int c) |
7 | 1070 { |
1157 | 1071 char_u *p; |
1072 static int regname; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1073 yankreg_T *old_y_previous, *old_y_current; |
1157 | 1074 int retval; |
7 | 1075 |
1076 if (Recording == FALSE) /* start recording */ | |
1077 { | |
1078 /* registers 0-9, a-z and " are allowed */ | |
1079 if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) | |
1080 retval = FAIL; | |
1081 else | |
1082 { | |
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7011
diff
changeset
|
1083 Recording = c; |
7 | 1084 showmode(); |
1085 regname = c; | |
1086 retval = OK; | |
1087 } | |
1088 } | |
1089 else /* stop recording */ | |
1090 { | |
1091 /* | |
1157 | 1092 * Get the recorded key hits. K_SPECIAL and CSI will be escaped, this |
1093 * needs to be removed again to put it in a register. exec_reg then | |
1094 * adds the escaping back later. | |
7 | 1095 */ |
1096 Recording = FALSE; | |
1097 MSG(""); | |
1098 p = get_recorded(); | |
1099 if (p == NULL) | |
1100 retval = FAIL; | |
1101 else | |
1102 { | |
1081 | 1103 /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ |
1104 vim_unescape_csi(p); | |
1105 | |
7 | 1106 /* |
1107 * We don't want to change the default register here, so save and | |
1108 * restore the current register name. | |
1109 */ | |
1110 old_y_previous = y_previous; | |
1111 old_y_current = y_current; | |
1112 | |
1113 retval = stuff_yank(regname, p); | |
1114 | |
1115 y_previous = old_y_previous; | |
1116 y_current = old_y_current; | |
1117 } | |
1118 } | |
1119 return retval; | |
1120 } | |
1121 | |
1122 /* | |
1123 * Stuff string "p" into yank register "regname" as a single line (append if | |
1124 * uppercase). "p" must have been alloced. | |
1125 * | |
1126 * return FAIL for failure, OK otherwise | |
1127 */ | |
1128 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1129 stuff_yank(int regname, char_u *p) |
7 | 1130 { |
1131 char_u *lp; | |
1132 char_u **pp; | |
1133 | |
1134 /* check for read-only register */ | |
1135 if (regname != 0 && !valid_yank_reg(regname, TRUE)) | |
1136 { | |
1137 vim_free(p); | |
1138 return FAIL; | |
1139 } | |
1140 if (regname == '_') /* black hole: don't do anything */ | |
1141 { | |
1142 vim_free(p); | |
1143 return OK; | |
1144 } | |
1145 get_yank_register(regname, TRUE); | |
1146 if (y_append && y_current->y_array != NULL) | |
1147 { | |
1148 pp = &(y_current->y_array[y_current->y_size - 1]); | |
1149 lp = lalloc((long_u)(STRLEN(*pp) + STRLEN(p) + 1), TRUE); | |
1150 if (lp == NULL) | |
1151 { | |
1152 vim_free(p); | |
1153 return FAIL; | |
1154 } | |
1155 STRCPY(lp, *pp); | |
1156 STRCAT(lp, p); | |
1157 vim_free(p); | |
1158 vim_free(*pp); | |
1159 *pp = lp; | |
1160 } | |
1161 else | |
1162 { | |
1163 free_yank_all(); | |
1164 if ((y_current->y_array = | |
1165 (char_u **)alloc((unsigned)sizeof(char_u *))) == NULL) | |
1166 { | |
1167 vim_free(p); | |
1168 return FAIL; | |
1169 } | |
1170 y_current->y_array[0] = p; | |
1171 y_current->y_size = 1; | |
1172 y_current->y_type = MCHAR; /* used to be MLINE, why? */ | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1173 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1174 y_current->y_time_set = vim_time(); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1175 #endif |
7 | 1176 } |
1177 return OK; | |
1178 } | |
1179 | |
1893 | 1180 static int execreg_lastc = NUL; |
1181 | |
7 | 1182 /* |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1183 * Execute a yank register: copy it into the stuff buffer. |
7 | 1184 * |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1185 * Return FAIL for failure, OK otherwise. |
7 | 1186 */ |
1187 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1188 do_execreg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1189 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1190 int colon, /* insert ':' before each line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1191 int addcr, /* always add '\n' to end of line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1192 int silent) /* set "silent" flag in typeahead buffer */ |
7 | 1193 { |
1194 long i; | |
1195 char_u *p; | |
1196 int retval = OK; | |
1197 int remap; | |
1198 | |
1199 if (regname == '@') /* repeat previous one */ | |
168 | 1200 { |
1893 | 1201 if (execreg_lastc == NUL) |
168 | 1202 { |
1203 EMSG(_("E748: No previously used register")); | |
1204 return FAIL; | |
1205 } | |
1893 | 1206 regname = execreg_lastc; |
168 | 1207 } |
7 | 1208 /* check for valid regname */ |
1209 if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) | |
168 | 1210 { |
1211 emsg_invreg(regname); | |
7 | 1212 return FAIL; |
168 | 1213 } |
1893 | 1214 execreg_lastc = regname; |
7 | 1215 |
1216 #ifdef FEAT_CLIPBOARD | |
1217 regname = may_get_selection(regname); | |
1218 #endif | |
1219 | |
1220 if (regname == '_') /* black hole: don't stuff anything */ | |
1221 return OK; | |
1222 | |
1223 #ifdef FEAT_CMDHIST | |
1224 if (regname == ':') /* use last command line */ | |
1225 { | |
1226 if (last_cmdline == NULL) | |
1227 { | |
1228 EMSG(_(e_nolastcmd)); | |
1229 return FAIL; | |
1230 } | |
1231 vim_free(new_last_cmdline); /* don't keep the cmdline containing @: */ | |
1232 new_last_cmdline = NULL; | |
16 | 1233 /* Escape all control characters with a CTRL-V */ |
1234 p = vim_strsave_escaped_ext(last_cmdline, | |
20 | 1235 (char_u *)"\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037", Ctrl_V, FALSE); |
16 | 1236 if (p != NULL) |
480 | 1237 { |
1238 /* When in Visual mode "'<,'>" will be prepended to the command. | |
1239 * Remove it when it's already there. */ | |
1240 if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) | |
1077 | 1241 retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); |
480 | 1242 else |
1077 | 1243 retval = put_in_typebuf(p, TRUE, TRUE, silent); |
480 | 1244 } |
16 | 1245 vim_free(p); |
7 | 1246 } |
1247 #endif | |
1248 #ifdef FEAT_EVAL | |
1249 else if (regname == '=') | |
1250 { | |
1251 p = get_expr_line(); | |
1252 if (p == NULL) | |
1253 return FAIL; | |
1077 | 1254 retval = put_in_typebuf(p, TRUE, colon, silent); |
7 | 1255 vim_free(p); |
1256 } | |
1257 #endif | |
1258 else if (regname == '.') /* use last inserted text */ | |
1259 { | |
1260 p = get_last_insert_save(); | |
1261 if (p == NULL) | |
1262 { | |
1263 EMSG(_(e_noinstext)); | |
1264 return FAIL; | |
1265 } | |
1077 | 1266 retval = put_in_typebuf(p, FALSE, colon, silent); |
7 | 1267 vim_free(p); |
1268 } | |
1269 else | |
1270 { | |
1271 get_yank_register(regname, FALSE); | |
1272 if (y_current->y_array == NULL) | |
1273 return FAIL; | |
1274 | |
1275 /* Disallow remaping for ":@r". */ | |
1276 remap = colon ? REMAP_NONE : REMAP_YES; | |
1277 | |
1278 /* | |
1279 * Insert lines into typeahead buffer, from last one to first one. | |
1280 */ | |
1034 | 1281 put_reedit_in_typebuf(silent); |
7 | 1282 for (i = y_current->y_size; --i >= 0; ) |
1283 { | |
1077 | 1284 char_u *escaped; |
1285 | |
7 | 1286 /* insert NL between lines and after last line if type is MLINE */ |
1287 if (y_current->y_type == MLINE || i < y_current->y_size - 1 | |
1288 || addcr) | |
1289 { | |
1034 | 1290 if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) |
7 | 1291 return FAIL; |
1292 } | |
1077 | 1293 escaped = vim_strsave_escape_csi(y_current->y_array[i]); |
1294 if (escaped == NULL) | |
1295 return FAIL; | |
1296 retval = ins_typebuf(escaped, remap, 0, TRUE, silent); | |
1297 vim_free(escaped); | |
1298 if (retval == FAIL) | |
7 | 1299 return FAIL; |
1034 | 1300 if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) |
7 | 1301 == FAIL) |
1302 return FAIL; | |
1303 } | |
1304 Exec_reg = TRUE; /* disable the 'q' command */ | |
1305 } | |
1306 return retval; | |
1307 } | |
1308 | |
1309 /* | |
1310 * If "restart_edit" is not zero, put it in the typeahead buffer, so that it's | |
1311 * used only after other typeahead has been processed. | |
1312 */ | |
1313 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1314 put_reedit_in_typebuf(int silent) |
7 | 1315 { |
1316 char_u buf[3]; | |
1317 | |
1318 if (restart_edit != NUL) | |
1319 { | |
1320 if (restart_edit == 'V') | |
1321 { | |
1322 buf[0] = 'g'; | |
1323 buf[1] = 'R'; | |
1324 buf[2] = NUL; | |
1325 } | |
1326 else | |
1327 { | |
1328 buf[0] = restart_edit == 'I' ? 'i' : restart_edit; | |
1329 buf[1] = NUL; | |
1330 } | |
1034 | 1331 if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK) |
7 | 1332 restart_edit = NUL; |
1333 } | |
1334 } | |
1335 | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1336 /* |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1337 * Insert register contents "s" into the typeahead buffer, so that it will be |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1338 * executed again. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1339 * When "esc" is TRUE it is to be taken literally: Escape CSI characters and |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1340 * no remapping. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1341 */ |
7 | 1342 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1343 put_in_typebuf( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1344 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1345 int esc, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1346 int colon, /* add ':' before the line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1347 int silent) |
7 | 1348 { |
1349 int retval = OK; | |
1350 | |
1034 | 1351 put_reedit_in_typebuf(silent); |
7 | 1352 if (colon) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1353 retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent); |
7 | 1354 if (retval == OK) |
1077 | 1355 { |
1356 char_u *p; | |
1357 | |
1358 if (esc) | |
1359 p = vim_strsave_escape_csi(s); | |
1360 else | |
1361 p = s; | |
1362 if (p == NULL) | |
1363 retval = FAIL; | |
1364 else | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1365 retval = ins_typebuf(p, esc ? REMAP_NONE : REMAP_YES, |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1366 0, TRUE, silent); |
1077 | 1367 if (esc) |
1368 vim_free(p); | |
1369 } | |
7 | 1370 if (colon && retval == OK) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1371 retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent); |
7 | 1372 return retval; |
1373 } | |
1374 | |
1375 /* | |
1376 * Insert a yank register: copy it into the Read buffer. | |
1377 * Used by CTRL-R command and middle mouse button in insert mode. | |
1378 * | |
1379 * return FAIL for failure, OK otherwise | |
1380 */ | |
1381 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1382 insert_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1383 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1384 int literally) /* insert literally, not as if typed */ |
7 | 1385 { |
1386 long i; | |
1387 int retval = OK; | |
1388 char_u *arg; | |
1389 int allocated; | |
1390 | |
1391 /* | |
1392 * It is possible to get into an endless loop by having CTRL-R a in | |
1393 * register a and then, in insert mode, doing CTRL-R a. | |
1394 * If you hit CTRL-C, the loop will be broken here. | |
1395 */ | |
1396 ui_breakcheck(); | |
1397 if (got_int) | |
1398 return FAIL; | |
1399 | |
1400 /* check for valid regname */ | |
1401 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
1402 return FAIL; | |
1403 | |
1404 #ifdef FEAT_CLIPBOARD | |
1405 regname = may_get_selection(regname); | |
1406 #endif | |
1407 | |
1408 if (regname == '.') /* insert last inserted text */ | |
1409 retval = stuff_inserted(NUL, 1L, TRUE); | |
1410 else if (get_spec_reg(regname, &arg, &allocated, TRUE)) | |
1411 { | |
1412 if (arg == NULL) | |
1413 return FAIL; | |
1414 stuffescaped(arg, literally); | |
1415 if (allocated) | |
1416 vim_free(arg); | |
1417 } | |
1418 else /* name or number register */ | |
1419 { | |
1420 get_yank_register(regname, FALSE); | |
1421 if (y_current->y_array == NULL) | |
1422 retval = FAIL; | |
1423 else | |
1424 { | |
1425 for (i = 0; i < y_current->y_size; ++i) | |
1426 { | |
1427 stuffescaped(y_current->y_array[i], literally); | |
1428 /* | |
1429 * Insert a newline between lines and after last line if | |
1430 * y_type is MLINE. | |
1431 */ | |
1432 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
1433 stuffcharReadbuff('\n'); | |
1434 } | |
1435 } | |
1436 } | |
1437 | |
1438 return retval; | |
1439 } | |
1440 | |
1441 /* | |
1442 * Stuff a string into the typeahead buffer, such that edit() will insert it | |
1443 * literally ("literally" TRUE) or interpret is as typed characters. | |
1444 */ | |
1445 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1446 stuffescaped(char_u *arg, int literally) |
7 | 1447 { |
1448 int c; | |
1449 char_u *start; | |
1450 | |
1451 while (*arg != NUL) | |
1452 { | |
1453 /* Stuff a sequence of normal ASCII characters, that's fast. Also | |
1454 * stuff K_SPECIAL to get the effect of a special key when "literally" | |
1455 * is TRUE. */ | |
1456 start = arg; | |
1457 while ((*arg >= ' ' | |
1458 #ifndef EBCDIC | |
1459 && *arg < DEL /* EBCDIC: chars above space are normal */ | |
1460 #endif | |
1461 ) | |
1462 || (*arg == K_SPECIAL && !literally)) | |
1463 ++arg; | |
1464 if (arg > start) | |
1465 stuffReadbuffLen(start, (long)(arg - start)); | |
1466 | |
1467 /* stuff a single special character */ | |
1468 if (*arg != NUL) | |
1469 { | |
1470 #ifdef FEAT_MBYTE | |
1471 if (has_mbyte) | |
2446
348f64c129df
Fixed: CTRL-R in Insert mode doesn't insert composing characters.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1472 c = mb_cptr2char_adv(&arg); |
7 | 1473 else |
1474 #endif | |
1475 c = *arg++; | |
1476 if (literally && ((c < ' ' && c != TAB) || c == DEL)) | |
1477 stuffcharReadbuff(Ctrl_V); | |
1478 stuffcharReadbuff(c); | |
1479 } | |
1480 } | |
1481 } | |
1482 | |
1483 /* | |
1157 | 1484 * If "regname" is a special register, return TRUE and store a pointer to its |
1485 * value in "argp". | |
7 | 1486 */ |
15 | 1487 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1488 get_spec_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1489 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1490 char_u **argp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1491 int *allocated, /* return: TRUE when value was allocated */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1492 int errmsg) /* give error message when failing */ |
7 | 1493 { |
1494 int cnt; | |
1495 | |
1496 *argp = NULL; | |
1497 *allocated = FALSE; | |
1498 switch (regname) | |
1499 { | |
1500 case '%': /* file name */ | |
1501 if (errmsg) | |
1502 check_fname(); /* will give emsg if not set */ | |
1503 *argp = curbuf->b_fname; | |
1504 return TRUE; | |
1505 | |
1506 case '#': /* alternate file name */ | |
1507 *argp = getaltfname(errmsg); /* may give emsg if not set */ | |
1508 return TRUE; | |
1509 | |
1510 #ifdef FEAT_EVAL | |
1511 case '=': /* result of expression */ | |
1512 *argp = get_expr_line(); | |
1513 *allocated = TRUE; | |
1514 return TRUE; | |
1515 #endif | |
1516 | |
1517 case ':': /* last command line */ | |
1518 if (last_cmdline == NULL && errmsg) | |
1519 EMSG(_(e_nolastcmd)); | |
1520 *argp = last_cmdline; | |
1521 return TRUE; | |
1522 | |
1523 case '/': /* last search-pattern */ | |
1524 if (last_search_pat() == NULL && errmsg) | |
1525 EMSG(_(e_noprevre)); | |
1526 *argp = last_search_pat(); | |
1527 return TRUE; | |
1528 | |
1529 case '.': /* last inserted text */ | |
1530 *argp = get_last_insert_save(); | |
1531 *allocated = TRUE; | |
1532 if (*argp == NULL && errmsg) | |
1533 EMSG(_(e_noinstext)); | |
1534 return TRUE; | |
1535 | |
1536 #ifdef FEAT_SEARCHPATH | |
1537 case Ctrl_F: /* Filename under cursor */ | |
1538 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
1539 if (!errmsg) | |
1540 return FALSE; | |
1541 *argp = file_name_at_cursor(FNAME_MESS | FNAME_HYP | |
681 | 1542 | (regname == Ctrl_P ? FNAME_EXP : 0), 1L, NULL); |
7 | 1543 *allocated = TRUE; |
1544 return TRUE; | |
1545 #endif | |
1546 | |
1547 case Ctrl_W: /* word under cursor */ | |
1548 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
1549 if (!errmsg) | |
1550 return FALSE; | |
1551 cnt = find_ident_under_cursor(argp, regname == Ctrl_W | |
1552 ? (FIND_IDENT|FIND_STRING) : FIND_STRING); | |
1553 *argp = cnt ? vim_strnsave(*argp, cnt) : NULL; | |
1554 *allocated = TRUE; | |
1555 return TRUE; | |
1556 | |
1557 case '_': /* black hole: always empty */ | |
1558 *argp = (char_u *)""; | |
1559 return TRUE; | |
1560 } | |
1561 | |
1562 return FALSE; | |
1563 } | |
1564 | |
1565 /* | |
15 | 1566 * Paste a yank register into the command line. |
1567 * Only for non-special registers. | |
1568 * Used by CTRL-R command in command-line mode | |
7 | 1569 * insert_reg() can't be used here, because special characters from the |
1570 * register contents will be interpreted as commands. | |
1571 * | |
1572 * return FAIL for failure, OK otherwise | |
1573 */ | |
1574 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1575 cmdline_paste_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1576 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1577 int literally, /* Insert text literally instead of "as typed" */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1578 int remcr) /* don't add CR characters */ |
7 | 1579 { |
1580 long i; | |
1581 | |
1582 get_yank_register(regname, FALSE); | |
1583 if (y_current->y_array == NULL) | |
1584 return FAIL; | |
1585 | |
1586 for (i = 0; i < y_current->y_size; ++i) | |
1587 { | |
1588 cmdline_paste_str(y_current->y_array[i], literally); | |
1589 | |
1015 | 1590 /* Insert ^M between lines and after last line if type is MLINE. |
7336
4c5f53a60543
commit https://github.com/vim/vim/commit/6f62fed349bf829da2adb02619dc9acba13c8ab6
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
1591 * Don't do this when "remcr" is TRUE. */ |
4c5f53a60543
commit https://github.com/vim/vim/commit/6f62fed349bf829da2adb02619dc9acba13c8ab6
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
1592 if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr) |
7 | 1593 cmdline_paste_str((char_u *)"\r", literally); |
1594 | |
1595 /* Check for CTRL-C, in case someone tries to paste a few thousand | |
1596 * lines and gets bored. */ | |
1597 ui_breakcheck(); | |
1598 if (got_int) | |
1599 return FAIL; | |
1600 } | |
1601 return OK; | |
1602 } | |
1603 | |
1604 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
1605 /* | |
1606 * Adjust the register name pointed to with "rp" for the clipboard being | |
1607 * used always and the clipboard being available. | |
1608 */ | |
1609 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1610 adjust_clip_reg(int *rp) |
7 | 1611 { |
2654 | 1612 /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', |
1613 * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ | |
6116 | 1614 if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0)) |
1615 { | |
1616 if (clip_unnamed != 0) | |
1617 *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
2654 | 1618 ? '+' : '*'; |
6116 | 1619 else |
1620 *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
1621 ? '+' : '*'; | |
1622 } | |
7 | 1623 if (!clip_star.available && *rp == '*') |
1624 *rp = 0; | |
1625 if (!clip_plus.available && *rp == '+') | |
1626 *rp = 0; | |
1627 } | |
1628 #endif | |
1629 | |
1630 /* | |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1631 * Shift the delete registers: "9 is cleared, "8 becomes "9, etc. |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1632 */ |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1633 void |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1634 shift_delete_registers() |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1635 { |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1636 int n; |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1637 |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1638 y_current = &y_regs[9]; |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1639 free_yank_all(); /* free register nine */ |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1640 for (n = 9; n > 1; --n) |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1641 y_regs[n] = y_regs[n - 1]; |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1642 y_previous = y_current = &y_regs[1]; |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1643 y_regs[1].y_array = NULL; /* set register one to empty */ |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1644 } |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1645 |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1646 /* |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1647 * Handle a delete operation. |
7 | 1648 * |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1649 * Return FAIL if undo failed, OK otherwise. |
7 | 1650 */ |
1651 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1652 op_delete(oparg_T *oap) |
7 | 1653 { |
1654 int n; | |
1655 linenr_T lnum; | |
1656 char_u *ptr; | |
1657 char_u *newp, *oldp; | |
1658 struct block_def bd; | |
1659 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
1660 int did_yank = FALSE; | |
3782 | 1661 int orig_regname = oap->regname; |
7 | 1662 |
1663 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
1664 return OK; | |
1665 | |
1666 /* Nothing to delete, return here. Do prepare undo, for op_change(). */ | |
1667 if (oap->empty) | |
1668 return u_save_cursor(); | |
1669 | |
1670 if (!curbuf->b_p_ma) | |
1671 { | |
1672 EMSG(_(e_modifiable)); | |
1673 return FAIL; | |
1674 } | |
1675 | |
1676 #ifdef FEAT_CLIPBOARD | |
1677 adjust_clip_reg(&oap->regname); | |
1678 #endif | |
1679 | |
1680 #ifdef FEAT_MBYTE | |
1681 if (has_mbyte) | |
1682 mb_adjust_opend(oap); | |
1683 #endif | |
1684 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1685 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1686 * Imitate the strange Vi behaviour: If the delete spans more than one |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1687 * line and motion_type == MCHAR and the result is a blank line, make the |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1688 * delete linewise. Don't do this for the change command or Visual mode. |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1689 */ |
7 | 1690 if ( oap->motion_type == MCHAR |
1691 && !oap->is_VIsual | |
50 | 1692 && !oap->block_mode |
7 | 1693 && oap->line_count > 1 |
3254 | 1694 && oap->motion_force == NUL |
7 | 1695 && oap->op_type == OP_DELETE) |
1696 { | |
2957 | 1697 ptr = ml_get(oap->end.lnum) + oap->end.col; |
1698 if (*ptr != NUL) | |
1699 ptr += oap->inclusive; | |
7 | 1700 ptr = skipwhite(ptr); |
1701 if (*ptr == NUL && inindent(0)) | |
1702 oap->motion_type = MLINE; | |
1703 } | |
1704 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1705 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1706 * Check for trying to delete (e.g. "D") in an empty line. |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1707 * Note: For the change operator it is ok. |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1708 */ |
7 | 1709 if ( oap->motion_type == MCHAR |
1710 && oap->line_count == 1 | |
1711 && oap->op_type == OP_DELETE | |
1712 && *ml_get(oap->start.lnum) == NUL) | |
1713 { | |
1714 /* | |
446 | 1715 * It's an error to operate on an empty region, when 'E' included in |
7 | 1716 * 'cpoptions' (Vi compatible). |
1717 */ | |
446 | 1718 #ifdef FEAT_VIRTUALEDIT |
1719 if (virtual_op) | |
1720 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
1721 * marks as if it happened. */ | |
1722 goto setmarks; | |
1723 #endif | |
7 | 1724 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
1725 beep_flush(); | |
1726 return OK; | |
1727 } | |
1728 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1729 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1730 * Do a yank of whatever we're about to delete. |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1731 * If a yank register was specified, put the deleted text into that |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1732 * register. For the black hole register '_' don't yank anything. |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1733 */ |
7 | 1734 if (oap->regname != '_') |
1735 { | |
1736 if (oap->regname != 0) | |
1737 { | |
1738 /* check for read-only register */ | |
1739 if (!valid_yank_reg(oap->regname, TRUE)) | |
1740 { | |
1741 beep_flush(); | |
1742 return OK; | |
1743 } | |
1744 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
1745 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
1746 did_yank = TRUE; | |
1747 } | |
1748 | |
1749 /* | |
1750 * Put deleted text into register 1 and shift number registers if the | |
1751 * delete contains a line break, or when a regname has been specified. | |
3782 | 1752 * Use the register name from before adjust_clip_reg() may have |
1753 * changed it. | |
7 | 1754 */ |
3782 | 1755 if (orig_regname != 0 || oap->motion_type == MLINE |
7 | 1756 || oap->line_count > 1 || oap->use_reg_one) |
1757 { | |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1758 shift_delete_registers(); |
7 | 1759 if (op_yank(oap, TRUE, FALSE) == OK) |
1760 did_yank = TRUE; | |
1761 } | |
1762 | |
3468 | 1763 /* Yank into small delete register when no named register specified |
1764 * and the delete is within one line. */ | |
1765 if (( | |
1766 #ifdef FEAT_CLIPBOARD | |
3584 | 1767 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
1768 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
3468 | 1769 #endif |
1770 oap->regname == 0) && oap->motion_type != MLINE | |
7 | 1771 && oap->line_count == 1) |
1772 { | |
1773 oap->regname = '-'; | |
1774 get_yank_register(oap->regname, TRUE); | |
1775 if (op_yank(oap, TRUE, FALSE) == OK) | |
1776 did_yank = TRUE; | |
1777 oap->regname = 0; | |
1778 } | |
1779 | |
1780 /* | |
1781 * If there's too much stuff to fit in the yank register, then get a | |
1782 * confirmation before doing the delete. This is crude, but simple. | |
1783 * And it avoids doing a delete of something we can't put back if we | |
1784 * want. | |
1785 */ | |
1786 if (!did_yank) | |
1787 { | |
1788 int msg_silent_save = msg_silent; | |
1789 | |
1790 msg_silent = 0; /* must display the prompt */ | |
1791 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
1792 msg_silent = msg_silent_save; | |
1793 if (n != 'y') | |
1794 { | |
1795 EMSG(_(e_abort)); | |
1796 return FAIL; | |
1797 } | |
1798 } | |
1799 } | |
1800 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1801 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1802 * block mode delete |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1803 */ |
7 | 1804 if (oap->block_mode) |
1805 { | |
1806 if (u_save((linenr_T)(oap->start.lnum - 1), | |
1807 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
1808 return FAIL; | |
1809 | |
1810 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
1811 { | |
1812 block_prep(oap, &bd, lnum, TRUE); | |
1813 if (bd.textlen == 0) /* nothing to delete */ | |
1814 continue; | |
1815 | |
1816 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
1817 if (lnum == curwin->w_cursor.lnum) | |
1818 { | |
1819 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
1820 # ifdef FEAT_VIRTUALEDIT | |
1821 curwin->w_cursor.coladd = 0; | |
1822 # endif | |
1823 } | |
1824 | |
1825 /* n == number of chars deleted | |
1826 * If we delete a TAB, it may be replaced by several characters. | |
1827 * Thus the number of characters may increase! | |
1828 */ | |
1829 n = bd.textlen - bd.startspaces - bd.endspaces; | |
1830 oldp = ml_get(lnum); | |
1831 newp = alloc_check((unsigned)STRLEN(oldp) + 1 - n); | |
1832 if (newp == NULL) | |
1833 continue; | |
1834 /* copy up to deleted part */ | |
1835 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
1836 /* insert spaces */ | |
6929 | 1837 vim_memset(newp + bd.textcol, ' ', |
7 | 1838 (size_t)(bd.startspaces + bd.endspaces)); |
1839 /* copy the part after the deleted part */ | |
1840 oldp += bd.textcol + bd.textlen; | |
1622 | 1841 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
7 | 1842 /* replace the line */ |
1843 ml_replace(lnum, newp, FALSE); | |
1844 } | |
1845 | |
1846 check_cursor_col(); | |
1847 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
1848 oap->end.lnum + 1, 0L); | |
1849 oap->line_count = 0; /* no lines deleted */ | |
1850 } | |
5735 | 1851 else if (oap->motion_type == MLINE) |
7 | 1852 { |
1853 if (oap->op_type == OP_CHANGE) | |
1854 { | |
1855 /* Delete the lines except the first one. Temporarily move the | |
1856 * cursor to the next line. Save the current line number, if the | |
1857 * last line is deleted it may be changed. | |
1858 */ | |
1859 if (oap->line_count > 1) | |
1860 { | |
1861 lnum = curwin->w_cursor.lnum; | |
1862 ++curwin->w_cursor.lnum; | |
1863 del_lines((long)(oap->line_count - 1), TRUE); | |
1864 curwin->w_cursor.lnum = lnum; | |
1865 } | |
1866 if (u_save_cursor() == FAIL) | |
1867 return FAIL; | |
1868 if (curbuf->b_p_ai) /* don't delete indent */ | |
1869 { | |
1870 beginline(BL_WHITE); /* cursor on first non-white */ | |
1871 did_ai = TRUE; /* delete the indent when ESC hit */ | |
1872 ai_col = curwin->w_cursor.col; | |
1873 } | |
1874 else | |
1875 beginline(0); /* cursor in column 0 */ | |
1876 truncate_line(FALSE); /* delete the rest of the line */ | |
1877 /* leave cursor past last char in line */ | |
1878 if (oap->line_count > 1) | |
1879 u_clearline(); /* "U" command not possible after "2cc" */ | |
1880 } | |
1881 else | |
1882 { | |
1883 del_lines(oap->line_count, TRUE); | |
1884 beginline(BL_WHITE | BL_FIX); | |
1885 u_clearline(); /* "U" command not possible after "dd" */ | |
1886 } | |
1887 } | |
1888 else | |
1889 { | |
1890 #ifdef FEAT_VIRTUALEDIT | |
1891 if (virtual_op) | |
1892 { | |
1893 int endcol = 0; | |
1894 | |
1895 /* For virtualedit: break the tabs that are partly included. */ | |
1896 if (gchar_pos(&oap->start) == '\t') | |
1897 { | |
1898 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
1899 return FAIL; | |
1900 if (oap->line_count == 1) | |
1901 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
1902 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
1903 oap->start = curwin->w_cursor; | |
1904 if (oap->line_count == 1) | |
1905 { | |
1906 coladvance(endcol); | |
1907 oap->end.col = curwin->w_cursor.col; | |
1908 oap->end.coladd = curwin->w_cursor.coladd; | |
1909 curwin->w_cursor = oap->start; | |
1910 } | |
1911 } | |
1912 | |
1913 /* Break a tab only when it's included in the area. */ | |
1914 if (gchar_pos(&oap->end) == '\t' | |
1915 && (int)oap->end.coladd < oap->inclusive) | |
1916 { | |
1917 /* save last line for undo */ | |
1918 if (u_save((linenr_T)(oap->end.lnum - 1), | |
1919 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
1920 return FAIL; | |
1921 curwin->w_cursor = oap->end; | |
1922 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
1923 oap->end = curwin->w_cursor; | |
1924 curwin->w_cursor = oap->start; | |
1925 } | |
1926 } | |
1927 #endif | |
1928 | |
1929 if (oap->line_count == 1) /* delete characters within one line */ | |
1930 { | |
1931 if (u_save_cursor() == FAIL) /* save line for undo */ | |
1932 return FAIL; | |
1933 | |
1934 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
5735 | 1935 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
7 | 1936 && oap->op_type == OP_CHANGE |
1937 && oap->end.lnum == curwin->w_cursor.lnum | |
5735 | 1938 && !oap->is_VIsual) |
7 | 1939 display_dollar(oap->end.col - !oap->inclusive); |
1940 | |
1941 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
1942 | |
1943 #ifdef FEAT_VIRTUALEDIT | |
1944 if (virtual_op) | |
1945 { | |
1946 /* fix up things for virtualedit-delete: | |
1947 * break the tabs which are going to get in our way | |
1948 */ | |
1949 char_u *curline = ml_get_curline(); | |
1950 int len = (int)STRLEN(curline); | |
1951 | |
1952 if (oap->end.coladd != 0 | |
1953 && (int)oap->end.col >= len - 1 | |
1954 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
1955 n++; | |
1956 /* Delete at least one char (e.g, when on a control char). */ | |
1957 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
1958 n = 1; | |
1959 | |
1960 /* When deleted a char in the line, reset coladd. */ | |
1961 if (gchar_cursor() != NUL) | |
1962 curwin->w_cursor.coladd = 0; | |
1963 } | |
1964 #endif | |
6826 | 1965 (void)del_bytes((long)n, !virtual_op, |
1966 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
7 | 1967 } |
1968 else /* delete characters between lines */ | |
1969 { | |
1970 pos_T curpos; | |
1971 | |
1972 /* save deleted and changed lines for undo */ | |
1973 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
1974 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
1975 return FAIL; | |
1976 | |
1977 truncate_line(TRUE); /* delete from cursor to end of line */ | |
1978 | |
1979 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
1980 ++curwin->w_cursor.lnum; | |
1981 del_lines((long)(oap->line_count - 2), FALSE); | |
1982 | |
6826 | 1983 /* delete from start of line until op_end */ |
2957 | 1984 n = (oap->end.col + 1 - !oap->inclusive); |
6826 | 1985 curwin->w_cursor.col = 0; |
1986 (void)del_bytes((long)n, !virtual_op, | |
1987 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
1988 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
1989 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
7 | 1990 } |
1991 } | |
1992 | |
1993 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
1994 | |
446 | 1995 #ifdef FEAT_VIRTUALEDIT |
1996 setmarks: | |
1997 #endif | |
7 | 1998 if (oap->block_mode) |
1999 { | |
2000 curbuf->b_op_end.lnum = oap->end.lnum; | |
2001 curbuf->b_op_end.col = oap->start.col; | |
2002 } | |
2003 else | |
2004 curbuf->b_op_end = oap->start; | |
2005 curbuf->b_op_start = oap->start; | |
2006 | |
2007 return OK; | |
2008 } | |
2009 | |
2010 #ifdef FEAT_MBYTE | |
2011 /* | |
2012 * Adjust end of operating area for ending on a multi-byte character. | |
2013 * Used for deletion. | |
2014 */ | |
2015 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2016 mb_adjust_opend(oparg_T *oap) |
7 | 2017 { |
2018 char_u *p; | |
2019 | |
2020 if (oap->inclusive) | |
2021 { | |
2022 p = ml_get(oap->end.lnum); | |
2023 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
2024 } | |
2025 } | |
2026 #endif | |
2027 | |
2028 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
2029 /* | |
2030 * Replace a whole area with one character. | |
2031 */ | |
2032 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2033 op_replace(oparg_T *oap, int c) |
7 | 2034 { |
2035 int n, numc; | |
2036 #ifdef FEAT_MBYTE | |
2037 int num_chars; | |
2038 #endif | |
2039 char_u *newp, *oldp; | |
2040 size_t oldlen; | |
2041 struct block_def bd; | |
5428 | 2042 char_u *after_p = NULL; |
2043 int had_ctrl_v_cr = (c == -1 || c == -2); | |
7 | 2044 |
2045 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
2046 return OK; /* nothing to do */ | |
2047 | |
5428 | 2048 if (had_ctrl_v_cr) |
2049 c = (c == -1 ? '\r' : '\n'); | |
2050 | |
7 | 2051 #ifdef FEAT_MBYTE |
2052 if (has_mbyte) | |
2053 mb_adjust_opend(oap); | |
2054 #endif | |
2055 | |
2056 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2057 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2058 return FAIL; | |
2059 | |
2060 /* | |
2061 * block mode replace | |
2062 */ | |
2063 if (oap->block_mode) | |
2064 { | |
2065 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2066 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
2067 { | |
1982 | 2068 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
7 | 2069 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
2070 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
2071 continue; /* nothing to replace */ | |
2072 | |
2073 /* n == number of extra chars required | |
2074 * If we split a TAB, it may be replaced by several characters. | |
2075 * Thus the number of characters may increase! | |
2076 */ | |
2077 #ifdef FEAT_VIRTUALEDIT | |
2078 /* If the range starts in virtual space, count the initial | |
2079 * coladd offset as part of "startspaces" */ | |
2080 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
2081 { | |
2082 pos_T vpos; | |
2083 | |
1982 | 2084 vpos.lnum = curwin->w_cursor.lnum; |
7 | 2085 getvpos(&vpos, oap->start_vcol); |
2086 bd.startspaces += vpos.coladd; | |
2087 n = bd.startspaces; | |
2088 } | |
2089 else | |
2090 #endif | |
2091 /* allow for pre spaces */ | |
2092 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
2093 | |
2094 /* allow for post spp */ | |
2095 n += (bd.endspaces | |
2096 #ifdef FEAT_VIRTUALEDIT | |
2097 && !bd.is_oneChar | |
2098 #endif | |
2099 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
2100 /* Figure out how many characters to replace. */ | |
2101 numc = oap->end_vcol - oap->start_vcol + 1; | |
2102 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
2103 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
2104 | |
2105 #ifdef FEAT_MBYTE | |
2106 /* A double-wide character can be replaced only up to half the | |
2107 * times. */ | |
2108 if ((*mb_char2cells)(c) > 1) | |
2109 { | |
2110 if ((numc & 1) && !bd.is_short) | |
2111 { | |
2112 ++bd.endspaces; | |
2113 ++n; | |
2114 } | |
2115 numc = numc / 2; | |
2116 } | |
2117 | |
2118 /* Compute bytes needed, move character count to num_chars. */ | |
2119 num_chars = numc; | |
2120 numc *= (*mb_char2len)(c); | |
2121 #endif | |
2122 /* oldlen includes textlen, so don't double count */ | |
2123 n += numc - bd.textlen; | |
2124 | |
2125 oldp = ml_get_curline(); | |
2126 oldlen = STRLEN(oldp); | |
2127 newp = alloc_check((unsigned)oldlen + 1 + n); | |
2128 if (newp == NULL) | |
2129 continue; | |
2130 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
2131 /* copy up to deleted part */ | |
2132 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2133 oldp += bd.textcol + bd.textlen; | |
2134 /* insert pre-spaces */ | |
6929 | 2135 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
7 | 2136 /* insert replacement chars CHECK FOR ALLOCATED SPACE */ |
5428 | 2137 /* -1/-2 is used for entering CR literally. */ |
2138 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) | |
7 | 2139 { |
5428 | 2140 #ifdef FEAT_MBYTE |
2141 if (has_mbyte) | |
2142 { | |
2143 n = (int)STRLEN(newp); | |
2144 while (--num_chars >= 0) | |
2145 n += (*mb_char2bytes)(c, newp + n); | |
2146 } | |
2147 else | |
2148 #endif | |
6929 | 2149 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
5428 | 2150 if (!bd.is_short) |
2151 { | |
2152 /* insert post-spaces */ | |
6929 | 2153 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
5428 | 2154 /* copy the part after the changed part */ |
2155 STRMOVE(newp + STRLEN(newp), oldp); | |
2156 } | |
7 | 2157 } |
2158 else | |
2159 { | |
5428 | 2160 /* Replacing with \r or \n means splitting the line. */ |
5475 | 2161 after_p = alloc_check( |
2162 (unsigned)(oldlen + 1 + n - STRLEN(newp))); | |
5428 | 2163 if (after_p != NULL) |
2164 STRMOVE(after_p, oldp); | |
7 | 2165 } |
2166 /* replace the line */ | |
2167 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
5428 | 2168 if (after_p != NULL) |
2169 { | |
2170 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
2171 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
2172 oap->end.lnum++; | |
2173 vim_free(after_p); | |
2174 } | |
7 | 2175 } |
2176 } | |
2177 else | |
2178 { | |
2179 /* | |
2180 * MCHAR and MLINE motion replace. | |
2181 */ | |
2182 if (oap->motion_type == MLINE) | |
2183 { | |
2184 oap->start.col = 0; | |
2185 curwin->w_cursor.col = 0; | |
2186 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2187 if (oap->end.col) | |
2188 --oap->end.col; | |
2189 } | |
2190 else if (!oap->inclusive) | |
2191 dec(&(oap->end)); | |
2192 | |
2193 while (ltoreq(curwin->w_cursor, oap->end)) | |
2194 { | |
2195 n = gchar_cursor(); | |
2196 if (n != NUL) | |
2197 { | |
2198 #ifdef FEAT_MBYTE | |
2199 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
2200 { | |
2201 /* This is slow, but it handles replacing a single-byte | |
2202 * with a multi-byte and the other way around. */ | |
4203 | 2203 if (curwin->w_cursor.lnum == oap->end.lnum) |
2204 oap->end.col += (*mb_char2len)(c) - (*mb_char2len)(n); | |
7 | 2205 n = State; |
2206 State = REPLACE; | |
2207 ins_char(c); | |
2208 State = n; | |
2209 /* Backup to the replaced character. */ | |
2210 dec_cursor(); | |
2211 } | |
2212 else | |
2213 #endif | |
2214 { | |
2215 #ifdef FEAT_VIRTUALEDIT | |
2216 if (n == TAB) | |
2217 { | |
2218 int end_vcol = 0; | |
2219 | |
2220 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2221 { | |
2222 /* oap->end has to be recalculated when | |
2223 * the tab breaks */ | |
2224 end_vcol = getviscol2(oap->end.col, | |
2225 oap->end.coladd); | |
2226 } | |
2227 coladvance_force(getviscol()); | |
2228 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2229 getvpos(&oap->end, end_vcol); | |
2230 } | |
2231 #endif | |
2232 pchar(curwin->w_cursor, c); | |
2233 } | |
2234 } | |
2235 #ifdef FEAT_VIRTUALEDIT | |
2236 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
2237 { | |
2238 int virtcols = oap->end.coladd; | |
2239 | |
2240 if (curwin->w_cursor.lnum == oap->start.lnum | |
2241 && oap->start.col == oap->end.col && oap->start.coladd) | |
2242 virtcols -= oap->start.coladd; | |
2243 | |
2244 /* oap->end has been trimmed so it's effectively inclusive; | |
2245 * as a result an extra +1 must be counted so we don't | |
2246 * trample the NUL byte. */ | |
2247 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
2248 curwin->w_cursor.col -= (virtcols + 1); | |
2249 for (; virtcols >= 0; virtcols--) | |
2250 { | |
2251 pchar(curwin->w_cursor, c); | |
2252 if (inc(&curwin->w_cursor) == -1) | |
2253 break; | |
2254 } | |
2255 } | |
2256 #endif | |
2257 | |
2258 /* Advance to next character, stop at the end of the file. */ | |
2259 if (inc_cursor() == -1) | |
2260 break; | |
2261 } | |
2262 } | |
2263 | |
2264 curwin->w_cursor = oap->start; | |
2265 check_cursor(); | |
2266 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
2267 | |
2268 /* Set "'[" and "']" marks. */ | |
2269 curbuf->b_op_start = oap->start; | |
2270 curbuf->b_op_end = oap->end; | |
2271 | |
2272 return OK; | |
2273 } | |
2274 #endif | |
2275 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2276 static int swapchars(int op_type, pos_T *pos, int length); |
1525 | 2277 |
7 | 2278 /* |
2279 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
2280 */ | |
2281 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2282 op_tilde(oparg_T *oap) |
7 | 2283 { |
2284 pos_T pos; | |
2285 struct block_def bd; | |
1528 | 2286 int did_change = FALSE; |
7 | 2287 |
2288 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2289 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2290 return; | |
2291 | |
2292 pos = oap->start; | |
2293 if (oap->block_mode) /* Visual block mode */ | |
2294 { | |
2295 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
2296 { | |
1766 | 2297 int one_change; |
2298 | |
7 | 2299 block_prep(oap, &bd, pos.lnum, FALSE); |
2300 pos.col = bd.textcol; | |
1766 | 2301 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
2302 did_change |= one_change; | |
1525 | 2303 |
5735 | 2304 #ifdef FEAT_NETBEANS_INTG |
2210 | 2305 if (netbeans_active() && one_change) |
7 | 2306 { |
2307 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2308 | |
33 | 2309 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
2310 (long)bd.textlen); | |
7 | 2311 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
2210 | 2312 &ptr[bd.textcol], bd.textlen); |
7 | 2313 } |
5735 | 2314 #endif |
7 | 2315 } |
2316 if (did_change) | |
2317 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
2318 } | |
2319 else /* not block mode */ | |
2320 { | |
2321 if (oap->motion_type == MLINE) | |
2322 { | |
2323 oap->start.col = 0; | |
2324 pos.col = 0; | |
2325 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2326 if (oap->end.col) | |
2327 --oap->end.col; | |
2328 } | |
2329 else if (!oap->inclusive) | |
2330 dec(&(oap->end)); | |
2331 | |
1528 | 2332 if (pos.lnum == oap->end.lnum) |
2333 did_change = swapchars(oap->op_type, &pos, | |
2334 oap->end.col - pos.col + 1); | |
2335 else | |
2336 for (;;) | |
2337 { | |
2338 did_change |= swapchars(oap->op_type, &pos, | |
2339 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
2340 (int)STRLEN(ml_get_pos(&pos))); | |
2341 if (ltoreq(oap->end, pos) || inc(&pos) == -1) | |
2342 break; | |
2343 } | |
7 | 2344 if (did_change) |
2345 { | |
2346 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
2347 0L); | |
2348 #ifdef FEAT_NETBEANS_INTG | |
2210 | 2349 if (netbeans_active() && did_change) |
7 | 2350 { |
2351 char_u *ptr; | |
2352 int count; | |
2353 | |
2354 pos = oap->start; | |
2355 while (pos.lnum < oap->end.lnum) | |
2356 { | |
2357 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
835 | 2358 count = (int)STRLEN(ptr) - pos.col; |
33 | 2359 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2360 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2361 &ptr[pos.col], count); |
7 | 2362 pos.col = 0; |
2363 pos.lnum++; | |
2364 } | |
2365 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2366 count = oap->end.col - pos.col + 1; | |
33 | 2367 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2368 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2369 &ptr[pos.col], count); |
7 | 2370 } |
2371 #endif | |
2372 } | |
2373 } | |
2374 | |
2375 if (!did_change && oap->is_VIsual) | |
2376 /* No change: need to remove the Visual selection */ | |
2377 redraw_curbuf_later(INVERTED); | |
2378 | |
2379 /* | |
2380 * Set '[ and '] marks. | |
2381 */ | |
2382 curbuf->b_op_start = oap->start; | |
2383 curbuf->b_op_end = oap->end; | |
2384 | |
2385 if (oap->line_count > p_report) | |
2386 { | |
2387 if (oap->line_count == 1) | |
2388 MSG(_("1 line changed")); | |
2389 else | |
2390 smsg((char_u *)_("%ld lines changed"), oap->line_count); | |
2391 } | |
2392 } | |
2393 | |
2394 /* | |
1525 | 2395 * Invoke swapchar() on "length" bytes at position "pos". |
2396 * "pos" is advanced to just after the changed characters. | |
2397 * "length" is rounded up to include the whole last multi-byte character. | |
2398 * Also works correctly when the number of bytes changes. | |
2399 * Returns TRUE if some character was changed. | |
2400 */ | |
2401 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2402 swapchars(int op_type, pos_T *pos, int length) |
1525 | 2403 { |
2404 int todo; | |
2405 int did_change = 0; | |
2406 | |
2407 for (todo = length; todo > 0; --todo) | |
2408 { | |
2409 # ifdef FEAT_MBYTE | |
2410 if (has_mbyte) | |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2411 { |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2412 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2413 |
1525 | 2414 /* we're counting bytes, not characters */ |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2415 if (len > 0) |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2416 todo -= len - 1; |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2417 } |
1525 | 2418 # endif |
2419 did_change |= swapchar(op_type, pos); | |
2420 if (inc(pos) == -1) /* at end of file */ | |
2421 break; | |
2422 } | |
2423 return did_change; | |
2424 } | |
2425 | |
2426 /* | |
7 | 2427 * If op_type == OP_UPPER: make uppercase, |
2428 * if op_type == OP_LOWER: make lowercase, | |
2429 * if op_type == OP_ROT13: do rot13 encoding, | |
2430 * else swap case of character at 'pos' | |
2431 * returns TRUE when something actually changed. | |
2432 */ | |
2433 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2434 swapchar(int op_type, pos_T *pos) |
7 | 2435 { |
2436 int c; | |
2437 int nc; | |
2438 | |
2439 c = gchar_pos(pos); | |
2440 | |
2441 /* Only do rot13 encoding for ASCII characters. */ | |
2442 if (c >= 0x80 && op_type == OP_ROT13) | |
2443 return FALSE; | |
2444 | |
2445 #ifdef FEAT_MBYTE | |
1525 | 2446 if (op_type == OP_UPPER && c == 0xdf |
2447 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
493 | 2448 { |
2449 pos_T sp = curwin->w_cursor; | |
2450 | |
2451 /* Special handling of German sharp s: change to "SS". */ | |
2452 curwin->w_cursor = *pos; | |
2453 del_char(FALSE); | |
2454 ins_char('S'); | |
2455 ins_char('S'); | |
2456 curwin->w_cursor = sp; | |
2457 inc(pos); | |
2458 } | |
2459 | |
7 | 2460 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
2461 return FALSE; | |
2462 #endif | |
2463 nc = c; | |
2464 if (MB_ISLOWER(c)) | |
2465 { | |
2466 if (op_type == OP_ROT13) | |
2467 nc = ROT13(c, 'a'); | |
2468 else if (op_type != OP_LOWER) | |
2469 nc = MB_TOUPPER(c); | |
2470 } | |
2471 else if (MB_ISUPPER(c)) | |
2472 { | |
2473 if (op_type == OP_ROT13) | |
2474 nc = ROT13(c, 'A'); | |
2475 else if (op_type != OP_UPPER) | |
2476 nc = MB_TOLOWER(c); | |
2477 } | |
2478 if (nc != c) | |
2479 { | |
2480 #ifdef FEAT_MBYTE | |
2481 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
2482 { | |
2483 pos_T sp = curwin->w_cursor; | |
2484 | |
2485 curwin->w_cursor = *pos; | |
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2486 /* don't use del_char(), it also removes composing chars */ |
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2487 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
7 | 2488 ins_char(nc); |
2489 curwin->w_cursor = sp; | |
2490 } | |
2491 else | |
2492 #endif | |
2493 pchar(*pos, nc); | |
2494 return TRUE; | |
2495 } | |
2496 return FALSE; | |
2497 } | |
2498 | |
2499 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
2500 /* | |
2501 * op_insert - Insert and append operators for Visual mode. | |
2502 */ | |
2503 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2504 op_insert(oparg_T *oap, long count1) |
7 | 2505 { |
2506 long ins_len, pre_textlen = 0; | |
2507 char_u *firstline, *ins_text; | |
2508 struct block_def bd; | |
2509 int i; | |
6579 | 2510 pos_T t1; |
7 | 2511 |
2512 /* edit() changes this - record it for OP_APPEND */ | |
2513 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2514 | |
2515 /* vis block is still marked. Get rid of it now. */ | |
2516 curwin->w_cursor.lnum = oap->start.lnum; | |
2517 update_screen(INVERTED); | |
2518 | |
2519 if (oap->block_mode) | |
2520 { | |
2521 #ifdef FEAT_VIRTUALEDIT | |
2522 /* When 'virtualedit' is used, need to insert the extra spaces before | |
2523 * doing block_prep(). When only "block" is used, virtual edit is | |
2524 * already disabled, but still need it when calling | |
2525 * coladvance_force(). */ | |
2526 if (curwin->w_cursor.coladd > 0) | |
2527 { | |
2528 int old_ve_flags = ve_flags; | |
2529 | |
2530 ve_flags = VE_ALL; | |
2531 if (u_save_cursor() == FAIL) | |
2532 return; | |
2533 coladvance_force(oap->op_type == OP_APPEND | |
2534 ? oap->end_vcol + 1 : getviscol()); | |
2535 if (oap->op_type == OP_APPEND) | |
2536 --curwin->w_cursor.col; | |
2537 ve_flags = old_ve_flags; | |
2538 } | |
2539 #endif | |
2540 /* Get the info about the block before entering the text */ | |
2541 block_prep(oap, &bd, oap->start.lnum, TRUE); | |
2542 firstline = ml_get(oap->start.lnum) + bd.textcol; | |
2543 if (oap->op_type == OP_APPEND) | |
2544 firstline += bd.textlen; | |
2545 pre_textlen = (long)STRLEN(firstline); | |
2546 } | |
2547 | |
2548 if (oap->op_type == OP_APPEND) | |
2549 { | |
2550 if (oap->block_mode | |
2551 #ifdef FEAT_VIRTUALEDIT | |
2552 && curwin->w_cursor.coladd == 0 | |
2553 #endif | |
2554 ) | |
2555 { | |
2556 /* Move the cursor to the character right of the block. */ | |
2557 curwin->w_set_curswant = TRUE; | |
2558 while (*ml_get_cursor() != NUL | |
2559 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
2560 ++curwin->w_cursor.col; | |
2561 if (bd.is_short && !bd.is_MAX) | |
2562 { | |
2563 /* First line was too short, make it longer and adjust the | |
2564 * values in "bd". */ | |
2565 if (u_save_cursor() == FAIL) | |
2566 return; | |
2567 for (i = 0; i < bd.endspaces; ++i) | |
2568 ins_char(' '); | |
2569 bd.textlen += bd.endspaces; | |
2570 } | |
2571 } | |
2572 else | |
2573 { | |
2574 curwin->w_cursor = oap->end; | |
893 | 2575 check_cursor_col(); |
7 | 2576 |
2577 /* Works just like an 'i'nsert on the next character. */ | |
2578 if (!lineempty(curwin->w_cursor.lnum) | |
2579 && oap->start_vcol != oap->end_vcol) | |
2580 inc_cursor(); | |
2581 } | |
2582 } | |
2583 | |
6579 | 2584 t1 = oap->start; |
10803
065da86ca6d2
patch 8.0.0291: Visual block insertion does not insert in all lines
Christian Brabandt <cb@256bit.org>
parents:
10785
diff
changeset
|
2585 (void)edit(NUL, FALSE, (linenr_T)count1); |
7 | 2586 |
6579 | 2587 /* When a tab was inserted, and the characters in front of the tab |
2588 * have been converted to a tab as well, the column of the cursor | |
2589 * might have actually been reduced, so need to adjust here. */ | |
2590 if (t1.lnum == curbuf->b_op_start_orig.lnum | |
2591 && lt(curbuf->b_op_start_orig, t1)) | |
2592 oap->start = curbuf->b_op_start_orig; | |
2593 | |
1477 | 2594 /* If user has moved off this line, we don't know what to do, so do |
2595 * nothing. | |
2596 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
2597 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
7 | 2598 return; |
2599 | |
2600 if (oap->block_mode) | |
2601 { | |
2602 struct block_def bd2; | |
2603 | |
5471 | 2604 /* The user may have moved the cursor before inserting something, try |
2605 * to adjust the block for that. */ | |
5680 | 2606 if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX) |
5471 | 2607 { |
2608 if (oap->op_type == OP_INSERT | |
5730 | 2609 && oap->start.col |
2610 #ifdef FEAT_VIRTUALEDIT | |
2611 + oap->start.coladd | |
2612 #endif | |
2613 != curbuf->b_op_start_orig.col | |
2614 #ifdef FEAT_VIRTUALEDIT | |
2615 + curbuf->b_op_start_orig.coladd | |
2616 #endif | |
2617 ) | |
5471 | 2618 { |
6579 | 2619 int t = getviscol2(curbuf->b_op_start_orig.col, |
2620 curbuf->b_op_start_orig.coladd); | |
5680 | 2621 oap->start.col = curbuf->b_op_start_orig.col; |
6579 | 2622 pre_textlen -= t - oap->start_vcol; |
2623 oap->start_vcol = t; | |
5471 | 2624 } |
2625 else if (oap->op_type == OP_APPEND | |
5730 | 2626 && oap->end.col |
2627 #ifdef FEAT_VIRTUALEDIT | |
2628 + oap->end.coladd | |
2629 #endif | |
2630 >= curbuf->b_op_start_orig.col | |
2631 #ifdef FEAT_VIRTUALEDIT | |
2632 + curbuf->b_op_start_orig.coladd | |
2633 #endif | |
2634 ) | |
5471 | 2635 { |
6579 | 2636 int t = getviscol2(curbuf->b_op_start_orig.col, |
2637 curbuf->b_op_start_orig.coladd); | |
5680 | 2638 oap->start.col = curbuf->b_op_start_orig.col; |
5471 | 2639 /* reset pre_textlen to the value of OP_INSERT */ |
2640 pre_textlen += bd.textlen; | |
6579 | 2641 pre_textlen -= t - oap->start_vcol; |
2642 oap->start_vcol = t; | |
5471 | 2643 oap->op_type = OP_INSERT; |
2644 } | |
2645 } | |
2646 | |
7 | 2647 /* |
2648 * Spaces and tabs in the indent may have changed to other spaces and | |
1392 | 2649 * tabs. Get the starting column again and correct the length. |
7 | 2650 * Don't do this when "$" used, end-of-line will have changed. |
2651 */ | |
2652 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
2653 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
2654 { | |
2655 if (oap->op_type == OP_APPEND) | |
2656 { | |
2657 pre_textlen += bd2.textlen - bd.textlen; | |
2658 if (bd2.endspaces) | |
2659 --bd2.textlen; | |
2660 } | |
2661 bd.textcol = bd2.textcol; | |
2662 bd.textlen = bd2.textlen; | |
2663 } | |
2664 | |
2665 /* | |
2666 * Subsequent calls to ml_get() flush the firstline data - take a | |
2667 * copy of the required string. | |
2668 */ | |
2669 firstline = ml_get(oap->start.lnum) + bd.textcol; | |
2670 if (oap->op_type == OP_APPEND) | |
2671 firstline += bd.textlen; | |
3421 | 2672 if (pre_textlen >= 0 |
2673 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
7 | 2674 { |
2675 ins_text = vim_strnsave(firstline, (int)ins_len); | |
2676 if (ins_text != NULL) | |
2677 { | |
2678 /* block handled here */ | |
2679 if (u_save(oap->start.lnum, | |
2680 (linenr_T)(oap->end.lnum + 1)) == OK) | |
2681 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
2682 &bd); | |
2683 | |
2684 curwin->w_cursor.col = oap->start.col; | |
2685 check_cursor(); | |
2686 vim_free(ins_text); | |
2687 } | |
2688 } | |
2689 } | |
2690 } | |
2691 #endif | |
2692 | |
2693 /* | |
2694 * op_change - handle a change operation | |
2695 * | |
2696 * return TRUE if edit() returns because of a CTRL-O command | |
2697 */ | |
2698 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2699 op_change(oparg_T *oap) |
7 | 2700 { |
2701 colnr_T l; | |
2702 int retval; | |
2703 #ifdef FEAT_VISUALEXTRA | |
2704 long offset; | |
2705 linenr_T linenr; | |
1392 | 2706 long ins_len; |
2707 long pre_textlen = 0; | |
2708 long pre_indent = 0; | |
7 | 2709 char_u *firstline; |
2710 char_u *ins_text, *newp, *oldp; | |
2711 struct block_def bd; | |
2712 #endif | |
2713 | |
2714 l = oap->start.col; | |
2715 if (oap->motion_type == MLINE) | |
2716 { | |
2717 l = 0; | |
2718 #ifdef FEAT_SMARTINDENT | |
2719 if (!p_paste && curbuf->b_p_si | |
2720 # ifdef FEAT_CINDENT | |
2721 && !curbuf->b_p_cin | |
2722 # endif | |
2723 ) | |
2724 can_si = TRUE; /* It's like opening a new line, do si */ | |
2725 #endif | |
2726 } | |
2727 | |
2728 /* First delete the text in the region. In an empty buffer only need to | |
2729 * save for undo */ | |
2730 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
2731 { | |
2732 if (u_save_cursor() == FAIL) | |
2733 return FALSE; | |
2734 } | |
2735 else if (op_delete(oap) == FAIL) | |
2736 return FALSE; | |
2737 | |
2738 if ((l > curwin->w_cursor.col) && !lineempty(curwin->w_cursor.lnum) | |
2739 && !virtual_op) | |
2740 inc_cursor(); | |
2741 | |
2742 #ifdef FEAT_VISUALEXTRA | |
2743 /* check for still on same line (<CR> in inserted text meaningless) */ | |
2744 /* skip blank lines too */ | |
2745 if (oap->block_mode) | |
2746 { | |
2747 # ifdef FEAT_VIRTUALEDIT | |
2748 /* Add spaces before getting the current line length. */ | |
2749 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
2750 || gchar_cursor() == NUL)) | |
2751 coladvance_force(getviscol()); | |
2752 # endif | |
1392 | 2753 firstline = ml_get(oap->start.lnum); |
2754 pre_textlen = (long)STRLEN(firstline); | |
2755 pre_indent = (long)(skipwhite(firstline) - firstline); | |
7 | 2756 bd.textcol = curwin->w_cursor.col; |
2757 } | |
2758 #endif | |
2759 | |
2760 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
2761 if (oap->motion_type == MLINE) | |
2762 fix_indent(); | |
2763 #endif | |
2764 | |
2765 retval = edit(NUL, FALSE, (linenr_T)1); | |
2766 | |
2767 #ifdef FEAT_VISUALEXTRA | |
2768 /* | |
39 | 2769 * In Visual block mode, handle copying the new text to all lines of the |
7 | 2770 * block. |
1477 | 2771 * Don't repeat the insert when Insert mode ended with CTRL-C. |
7 | 2772 */ |
1477 | 2773 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
7 | 2774 { |
1392 | 2775 /* Auto-indenting may have changed the indent. If the cursor was past |
2776 * the indent, exclude that indent change from the inserted text. */ | |
7 | 2777 firstline = ml_get(oap->start.lnum); |
1403 | 2778 if (bd.textcol > (colnr_T)pre_indent) |
7 | 2779 { |
1392 | 2780 long new_indent = (long)(skipwhite(firstline) - firstline); |
2781 | |
2782 pre_textlen += new_indent - pre_indent; | |
2783 bd.textcol += new_indent - pre_indent; | |
2784 } | |
2785 | |
2786 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
2787 if (ins_len > 0) | |
2788 { | |
2789 /* Subsequent calls to ml_get() flush the firstline data - take a | |
2790 * copy of the inserted text. */ | |
7 | 2791 if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL) |
2792 { | |
419 | 2793 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
7 | 2794 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
2795 linenr++) | |
2796 { | |
2797 block_prep(oap, &bd, linenr, TRUE); | |
2798 if (!bd.is_short || virtual_op) | |
2799 { | |
2800 # ifdef FEAT_VIRTUALEDIT | |
2801 pos_T vpos; | |
2802 | |
2803 /* If the block starts in virtual space, count the | |
2804 * initial coladd offset as part of "startspaces" */ | |
2805 if (bd.is_short) | |
2806 { | |
1982 | 2807 vpos.lnum = linenr; |
7 | 2808 (void)getvpos(&vpos, oap->start_vcol); |
2809 } | |
2810 else | |
2811 vpos.coladd = 0; | |
2812 # endif | |
2813 oldp = ml_get(linenr); | |
2814 newp = alloc_check((unsigned)(STRLEN(oldp) | |
2815 # ifdef FEAT_VIRTUALEDIT | |
2816 + vpos.coladd | |
2817 # endif | |
2818 + ins_len + 1)); | |
2819 if (newp == NULL) | |
2820 continue; | |
2821 /* copy up to block start */ | |
2822 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2823 offset = bd.textcol; | |
2824 # ifdef FEAT_VIRTUALEDIT | |
6929 | 2825 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
7 | 2826 offset += vpos.coladd; |
2827 # endif | |
2828 mch_memmove(newp + offset, ins_text, (size_t)ins_len); | |
2829 offset += ins_len; | |
2830 oldp += bd.textcol; | |
1622 | 2831 STRMOVE(newp + offset, oldp); |
7 | 2832 ml_replace(linenr, newp, FALSE); |
2833 } | |
2834 } | |
2835 check_cursor(); | |
2836 | |
2837 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
2838 } | |
2839 vim_free(ins_text); | |
2840 } | |
2841 } | |
2842 #endif | |
2843 | |
2844 return retval; | |
2845 } | |
2846 | |
2847 /* | |
2848 * set all the yank registers to empty (called from main()) | |
2849 */ | |
2850 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2851 init_yank(void) |
7 | 2852 { |
2853 int i; | |
2854 | |
2855 for (i = 0; i < NUM_REGISTERS; ++i) | |
2856 y_regs[i].y_array = NULL; | |
2857 } | |
2858 | |
356 | 2859 #if defined(EXITFREE) || defined(PROTO) |
2860 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2861 clear_registers(void) |
356 | 2862 { |
2863 int i; | |
2864 | |
2865 for (i = 0; i < NUM_REGISTERS; ++i) | |
2866 { | |
2867 y_current = &y_regs[i]; | |
2868 if (y_current->y_array != NULL) | |
2869 free_yank_all(); | |
2870 } | |
2871 } | |
2872 #endif | |
2873 | |
7 | 2874 /* |
2875 * Free "n" lines from the current yank register. | |
2876 * Called for normal freeing and in case of error. | |
2877 */ | |
2878 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2879 free_yank(long n) |
7 | 2880 { |
2881 if (y_current->y_array != NULL) | |
2882 { | |
2883 long i; | |
2884 | |
2885 for (i = n; --i >= 0; ) | |
2886 { | |
2887 #ifdef AMIGA /* only for very slow machines */ | |
2888 if ((i & 1023) == 1023) /* this may take a while */ | |
2889 { | |
2890 /* | |
2891 * This message should never cause a hit-return message. | |
2892 * Overwrite this message with any next message. | |
2893 */ | |
2894 ++no_wait_return; | |
2895 smsg((char_u *)_("freeing %ld lines"), i + 1); | |
2896 --no_wait_return; | |
2897 msg_didout = FALSE; | |
2898 msg_col = 0; | |
2899 } | |
2900 #endif | |
2901 vim_free(y_current->y_array[i]); | |
2902 } | |
2903 vim_free(y_current->y_array); | |
2904 y_current->y_array = NULL; | |
2905 #ifdef AMIGA | |
2906 if (n >= 1000) | |
2907 MSG(""); | |
2908 #endif | |
2909 } | |
2910 } | |
2911 | |
2912 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2913 free_yank_all(void) |
7 | 2914 { |
2915 free_yank(y_current->y_size); | |
2916 } | |
2917 | |
2918 /* | |
2919 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
2920 * If we are to append (uppercase register), we first yank into a new yank | |
2921 * register and then concatenate the old and the new one (so we keep the old | |
2922 * one in case of out-of-memory). | |
2923 * | |
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
2924 * Return FAIL for failure, OK otherwise. |
7 | 2925 */ |
2926 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2927 op_yank(oparg_T *oap, int deleting, int mess) |
7 | 2928 { |
2929 long y_idx; /* index in y_array[] */ | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
2930 yankreg_T *curr; /* copy of y_current */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
2931 yankreg_T newreg; /* new yank register when appending */ |
7 | 2932 char_u **new_ptr; |
2933 linenr_T lnum; /* current line number */ | |
2934 long j; | |
2935 int yanktype = oap->motion_type; | |
2936 long yanklines = oap->line_count; | |
2937 linenr_T yankendlnum = oap->end.lnum; | |
2938 char_u *p; | |
2939 char_u *pnew; | |
2940 struct block_def bd; | |
2658 | 2941 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
2654 | 2942 int did_star = FALSE; |
2658 | 2943 #endif |
7 | 2944 |
2945 /* check for read-only register */ | |
2946 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
2947 { | |
2948 beep_flush(); | |
2949 return FAIL; | |
2950 } | |
2951 if (oap->regname == '_') /* black hole: nothing to do */ | |
2952 return OK; | |
2953 | |
2954 #ifdef FEAT_CLIPBOARD | |
2955 if (!clip_star.available && oap->regname == '*') | |
2956 oap->regname = 0; | |
2957 else if (!clip_plus.available && oap->regname == '+') | |
2958 oap->regname = 0; | |
2959 #endif | |
2960 | |
2961 if (!deleting) /* op_delete() already set y_current */ | |
2962 get_yank_register(oap->regname, TRUE); | |
2963 | |
2964 curr = y_current; | |
2965 /* append to existing contents */ | |
2966 if (y_append && y_current->y_array != NULL) | |
2967 y_current = &newreg; | |
2968 else | |
2969 free_yank_all(); /* free previously yanked lines */ | |
2970 | |
593 | 2971 /* |
2972 * If the cursor was in column 1 before and after the movement, and the | |
2973 * operator is not inclusive, the yank is always linewise. | |
2974 */ | |
7 | 2975 if ( oap->motion_type == MCHAR |
2976 && oap->start.col == 0 | |
2977 && !oap->inclusive | |
2978 && (!oap->is_VIsual || *p_sel == 'o') | |
50 | 2979 && !oap->block_mode |
7 | 2980 && oap->end.col == 0 |
2981 && yanklines > 1) | |
2982 { | |
2983 yanktype = MLINE; | |
2984 --yankendlnum; | |
2985 --yanklines; | |
2986 } | |
2987 | |
2988 y_current->y_size = yanklines; | |
2989 y_current->y_type = yanktype; /* set the yank register type */ | |
2990 y_current->y_width = 0; | |
2991 y_current->y_array = (char_u **)lalloc_clear((long_u)(sizeof(char_u *) * | |
2992 yanklines), TRUE); | |
2993 if (y_current->y_array == NULL) | |
2994 { | |
2995 y_current = curr; | |
2996 return FAIL; | |
2997 } | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
2998 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
2999 y_current->y_time_set = vim_time(); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3000 #endif |
7 | 3001 |
3002 y_idx = 0; | |
3003 lnum = oap->start.lnum; | |
3004 | |
3005 if (oap->block_mode) | |
3006 { | |
3007 /* Visual block mode */ | |
3008 y_current->y_type = MBLOCK; /* set the yank register type */ | |
3009 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
3010 | |
3011 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
3012 y_current->y_width--; | |
3013 } | |
3014 | |
3015 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
3016 { | |
3017 switch (y_current->y_type) | |
3018 { | |
3019 case MBLOCK: | |
3020 block_prep(oap, &bd, lnum, FALSE); | |
3021 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3022 goto fail; | |
3023 break; | |
3024 | |
3025 case MLINE: | |
3026 if ((y_current->y_array[y_idx] = | |
3027 vim_strsave(ml_get(lnum))) == NULL) | |
3028 goto fail; | |
3029 break; | |
3030 | |
3031 case MCHAR: | |
3032 { | |
3033 colnr_T startcol = 0, endcol = MAXCOL; | |
3034 #ifdef FEAT_VIRTUALEDIT | |
3035 int is_oneChar = FALSE; | |
3036 colnr_T cs, ce; | |
3037 #endif | |
3038 p = ml_get(lnum); | |
3039 bd.startspaces = 0; | |
3040 bd.endspaces = 0; | |
3041 | |
3042 if (lnum == oap->start.lnum) | |
3043 { | |
3044 startcol = oap->start.col; | |
3045 #ifdef FEAT_VIRTUALEDIT | |
3046 if (virtual_op) | |
3047 { | |
3048 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
3049 if (ce != cs && oap->start.coladd > 0) | |
3050 { | |
3051 /* Part of a tab selected -- but don't | |
3052 * double-count it. */ | |
3053 bd.startspaces = (ce - cs + 1) | |
3054 - oap->start.coladd; | |
3055 startcol++; | |
3056 } | |
3057 } | |
3058 #endif | |
3059 } | |
3060 | |
3061 if (lnum == oap->end.lnum) | |
3062 { | |
3063 endcol = oap->end.col; | |
3064 #ifdef FEAT_VIRTUALEDIT | |
3065 if (virtual_op) | |
3066 { | |
3067 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
3068 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
3069 # ifdef FEAT_MBYTE | |
3070 /* Don't add space for double-wide | |
3071 * char; endcol will be on last byte | |
3072 * of multi-byte char. */ | |
3073 && (*mb_head_off)(p, p + endcol) == 0 | |
3074 # endif | |
3075 )) | |
3076 { | |
3077 if (oap->start.lnum == oap->end.lnum | |
3078 && oap->start.col == oap->end.col) | |
3079 { | |
3080 /* Special case: inside a single char */ | |
3081 is_oneChar = TRUE; | |
3082 bd.startspaces = oap->end.coladd | |
3083 - oap->start.coladd + oap->inclusive; | |
3084 endcol = startcol; | |
3085 } | |
3086 else | |
3087 { | |
3088 bd.endspaces = oap->end.coladd | |
3089 + oap->inclusive; | |
3090 endcol -= oap->inclusive; | |
3091 } | |
3092 } | |
3093 } | |
3094 #endif | |
3095 } | |
3510 | 3096 if (endcol == MAXCOL) |
3097 endcol = (colnr_T)STRLEN(p); | |
7 | 3098 if (startcol > endcol |
3099 #ifdef FEAT_VIRTUALEDIT | |
3100 || is_oneChar | |
3101 #endif | |
3102 ) | |
3103 bd.textlen = 0; | |
3104 else | |
3105 { | |
3106 bd.textlen = endcol - startcol + oap->inclusive; | |
3107 } | |
3108 bd.textstart = p + startcol; | |
3109 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3110 goto fail; | |
3111 break; | |
3112 } | |
3113 /* NOTREACHED */ | |
3114 } | |
3115 } | |
3116 | |
3117 if (curr != y_current) /* append the new block to the old block */ | |
3118 { | |
3119 new_ptr = (char_u **)lalloc((long_u)(sizeof(char_u *) * | |
3120 (curr->y_size + y_current->y_size)), TRUE); | |
3121 if (new_ptr == NULL) | |
3122 goto fail; | |
3123 for (j = 0; j < curr->y_size; ++j) | |
3124 new_ptr[j] = curr->y_array[j]; | |
3125 vim_free(curr->y_array); | |
3126 curr->y_array = new_ptr; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3127 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3128 curr->y_time_set = vim_time(); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3129 #endif |
7 | 3130 |
3131 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
3132 curr->y_type = MLINE; | |
3133 | |
164 | 3134 /* Concatenate the last line of the old block with the first line of |
3135 * the new block, unless being Vi compatible. */ | |
3136 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
7 | 3137 { |
3138 pnew = lalloc((long_u)(STRLEN(curr->y_array[curr->y_size - 1]) | |
3139 + STRLEN(y_current->y_array[0]) + 1), TRUE); | |
3140 if (pnew == NULL) | |
3141 { | |
3142 y_idx = y_current->y_size - 1; | |
3143 goto fail; | |
3144 } | |
3145 STRCPY(pnew, curr->y_array[--j]); | |
3146 STRCAT(pnew, y_current->y_array[0]); | |
3147 vim_free(curr->y_array[j]); | |
3148 vim_free(y_current->y_array[0]); | |
3149 curr->y_array[j++] = pnew; | |
3150 y_idx = 1; | |
3151 } | |
3152 else | |
3153 y_idx = 0; | |
3154 while (y_idx < y_current->y_size) | |
3155 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
3156 curr->y_size = j; | |
3157 vim_free(y_current->y_array); | |
3158 y_current = curr; | |
3159 } | |
5981 | 3160 if (curwin->w_p_rnu) |
3161 redraw_later(SOME_VALID); /* cursor moved to start */ | |
7 | 3162 if (mess) /* Display message about yank? */ |
3163 { | |
3164 if (yanktype == MCHAR | |
3165 && !oap->block_mode | |
3166 && yanklines == 1) | |
3167 yanklines = 0; | |
3168 /* Some versions of Vi use ">=" here, some don't... */ | |
3169 if (yanklines > p_report) | |
3170 { | |
3171 /* redisplay now, so message is not deleted */ | |
3172 update_topline_redraw(); | |
3173 if (yanklines == 1) | |
205 | 3174 { |
3175 if (oap->block_mode) | |
3176 MSG(_("block of 1 line yanked")); | |
3177 else | |
3178 MSG(_("1 line yanked")); | |
3179 } | |
3180 else if (oap->block_mode) | |
3181 smsg((char_u *)_("block of %ld lines yanked"), yanklines); | |
7 | 3182 else |
3183 smsg((char_u *)_("%ld lines yanked"), yanklines); | |
3184 } | |
3185 } | |
3186 | |
3187 /* | |
3188 * Set "'[" and "']" marks. | |
3189 */ | |
3190 curbuf->b_op_start = oap->start; | |
3191 curbuf->b_op_end = oap->end; | |
5735 | 3192 if (yanktype == MLINE && !oap->block_mode) |
36 | 3193 { |
3194 curbuf->b_op_start.col = 0; | |
3195 curbuf->b_op_end.col = MAXCOL; | |
3196 } | |
7 | 3197 |
3198 #ifdef FEAT_CLIPBOARD | |
3199 /* | |
3200 * If we were yanking to the '*' register, send result to clipboard. | |
3201 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
3202 * to the '*' register. | |
3203 */ | |
3204 if (clip_star.available | |
3205 && (curr == &(y_regs[STAR_REGISTER]) | |
2654 | 3206 || (!deleting && oap->regname == 0 |
6116 | 3207 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
7 | 3208 { |
3209 if (curr != &(y_regs[STAR_REGISTER])) | |
3210 /* Copy the text from register 0 to the clipboard register. */ | |
3211 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3212 | |
3213 clip_own_selection(&clip_star); | |
3214 clip_gen_set_selection(&clip_star); | |
2658 | 3215 # ifdef FEAT_X11 |
2654 | 3216 did_star = TRUE; |
2658 | 3217 # endif |
7 | 3218 } |
3219 | |
3220 # ifdef FEAT_X11 | |
3221 /* | |
3222 * If we were yanking to the '+' register, send result to selection. | |
3223 * Also copy to the '*' register, in case auto-select is off. | |
3224 */ | |
2654 | 3225 if (clip_plus.available |
3226 && (curr == &(y_regs[PLUS_REGISTER]) | |
3227 || (!deleting && oap->regname == 0 | |
6116 | 3228 && ((clip_unnamed | clip_unnamed_saved) & |
3229 CLIP_UNNAMED_PLUS)))) | |
7 | 3230 { |
2654 | 3231 if (curr != &(y_regs[PLUS_REGISTER])) |
3232 /* Copy the text from register 0 to the clipboard register. */ | |
3233 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
3234 | |
7 | 3235 clip_own_selection(&clip_plus); |
3236 clip_gen_set_selection(&clip_plus); | |
3674 | 3237 if (!clip_isautosel_star() && !did_star |
3238 && curr == &(y_regs[PLUS_REGISTER])) | |
7 | 3239 { |
3240 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3241 clip_own_selection(&clip_star); | |
3242 clip_gen_set_selection(&clip_star); | |
3243 } | |
3244 } | |
3245 # endif | |
3246 #endif | |
3247 | |
3248 return OK; | |
3249 | |
3250 fail: /* free the allocated lines */ | |
3251 free_yank(y_idx + 1); | |
3252 y_current = curr; | |
3253 return FAIL; | |
3254 } | |
3255 | |
3256 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3257 yank_copy_line(struct block_def *bd, long y_idx) |
7 | 3258 { |
3259 char_u *pnew; | |
3260 | |
3261 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
3262 == NULL) | |
3263 return FAIL; | |
3264 y_current->y_array[y_idx] = pnew; | |
6929 | 3265 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
7 | 3266 pnew += bd->startspaces; |
3267 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
3268 pnew += bd->textlen; | |
6929 | 3269 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
7 | 3270 pnew += bd->endspaces; |
3271 *pnew = NUL; | |
3272 return OK; | |
3273 } | |
3274 | |
3275 #ifdef FEAT_CLIPBOARD | |
3276 /* | |
3277 * Make a copy of the y_current register to register "reg". | |
3278 */ | |
3279 static void | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3280 copy_yank_reg(yankreg_T *reg) |
7 | 3281 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3282 yankreg_T *curr = y_current; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3283 long j; |
7 | 3284 |
3285 y_current = reg; | |
3286 free_yank_all(); | |
3287 *y_current = *curr; | |
3288 y_current->y_array = (char_u **)lalloc_clear( | |
3289 (long_u)(sizeof(char_u *) * y_current->y_size), TRUE); | |
3290 if (y_current->y_array == NULL) | |
3291 y_current->y_size = 0; | |
3292 else | |
3293 for (j = 0; j < y_current->y_size; ++j) | |
3294 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
3295 { | |
3296 free_yank(j); | |
3297 y_current->y_size = 0; | |
3298 break; | |
3299 } | |
3300 y_current = curr; | |
3301 } | |
3302 #endif | |
3303 | |
3304 /* | |
140 | 3305 * Put contents of register "regname" into the text. |
3306 * Caller must check "regname" to be valid! | |
3307 * "flags": PUT_FIXINDENT make indent look nice | |
3308 * PUT_CURSEND leave cursor after end of new text | |
3309 * PUT_LINE force linewise put (":put") | |
7 | 3310 */ |
3311 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3312 do_put( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3313 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3314 int dir, /* BACKWARD for 'P', FORWARD for 'p' */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3315 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3316 int flags) |
7 | 3317 { |
3318 char_u *ptr; | |
3319 char_u *newp, *oldp; | |
3320 int yanklen; | |
3321 int totlen = 0; /* init for gcc */ | |
3322 linenr_T lnum; | |
3323 colnr_T col; | |
3324 long i; /* index in y_array[] */ | |
3325 int y_type; | |
3326 long y_size; | |
3327 int oldlen; | |
3328 long y_width = 0; | |
3329 colnr_T vcol; | |
3330 int delcount; | |
3331 int incr = 0; | |
3332 long j; | |
3333 struct block_def bd; | |
3334 char_u **y_array = NULL; | |
3335 long nr_lines = 0; | |
3336 pos_T new_cursor; | |
3337 int indent; | |
3338 int orig_indent = 0; /* init for gcc */ | |
3339 int indent_diff = 0; /* init for gcc */ | |
3340 int first_indent = TRUE; | |
3341 int lendiff = 0; | |
3342 pos_T old_pos; | |
3343 char_u *insert_string = NULL; | |
3344 int allocated = FALSE; | |
3345 long cnt; | |
3346 | |
3347 #ifdef FEAT_CLIPBOARD | |
3348 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
3349 adjust_clip_reg(®name); | |
3350 (void)may_get_selection(regname); | |
3351 #endif | |
3352 | |
3353 if (flags & PUT_FIXINDENT) | |
3354 orig_indent = get_indent(); | |
3355 | |
3356 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3357 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3358 | |
3359 /* | |
3360 * Using inserted text works differently, because the register includes | |
3361 * special characters (newlines, etc.). | |
3362 */ | |
3363 if (regname == '.') | |
3364 { | |
10494
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3365 if (VIsual_active) |
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3366 stuffcharReadbuff(VIsual_mode); |
7 | 3367 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : |
3368 (count == -1 ? 'O' : 'i')), count, FALSE); | |
3369 /* Putting the text is done later, so can't really move the cursor to | |
3370 * the next character. Use "l" to simulate it. */ | |
3371 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
3372 stuffcharReadbuff('l'); | |
3373 return; | |
3374 } | |
3375 | |
3376 /* | |
3377 * For special registers '%' (file name), '#' (alternate file name) and | |
3378 * ':' (last command line), etc. we have to create a fake yank register. | |
3379 */ | |
3380 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
3381 { | |
3382 if (insert_string == NULL) | |
3383 return; | |
3384 } | |
3385 | |
4005 | 3386 #ifdef FEAT_AUTOCMD |
3387 /* Autocommands may be executed when saving lines for undo, which may make | |
3388 * y_array invalid. Start undo now to avoid that. */ | |
3389 u_save(curwin->w_cursor.lnum, curwin->w_cursor.lnum + 1); | |
3390 #endif | |
3391 | |
7 | 3392 if (insert_string != NULL) |
3393 { | |
3394 y_type = MCHAR; | |
3395 #ifdef FEAT_EVAL | |
3396 if (regname == '=') | |
3397 { | |
3398 /* For the = register we need to split the string at NL | |
3093 | 3399 * characters. |
3400 * Loop twice: count the number of lines and save them. */ | |
7 | 3401 for (;;) |
3402 { | |
3403 y_size = 0; | |
3404 ptr = insert_string; | |
3405 while (ptr != NULL) | |
3406 { | |
3407 if (y_array != NULL) | |
3408 y_array[y_size] = ptr; | |
3409 ++y_size; | |
3410 ptr = vim_strchr(ptr, '\n'); | |
3411 if (ptr != NULL) | |
3412 { | |
3413 if (y_array != NULL) | |
3414 *ptr = NUL; | |
3415 ++ptr; | |
3093 | 3416 /* A trailing '\n' makes the register linewise. */ |
7 | 3417 if (*ptr == NUL) |
3418 { | |
3419 y_type = MLINE; | |
3420 break; | |
3421 } | |
3422 } | |
3423 } | |
3424 if (y_array != NULL) | |
3425 break; | |
3426 y_array = (char_u **)alloc((unsigned) | |
3427 (y_size * sizeof(char_u *))); | |
3428 if (y_array == NULL) | |
3429 goto end; | |
3430 } | |
3431 } | |
3432 else | |
3433 #endif | |
3434 { | |
3435 y_size = 1; /* use fake one-line yank register */ | |
3436 y_array = &insert_string; | |
3437 } | |
3438 } | |
3439 else | |
3440 { | |
3441 get_yank_register(regname, FALSE); | |
3442 | |
3443 y_type = y_current->y_type; | |
3444 y_width = y_current->y_width; | |
3445 y_size = y_current->y_size; | |
3446 y_array = y_current->y_array; | |
3447 } | |
3448 | |
3449 if (y_type == MLINE) | |
3450 { | |
3451 if (flags & PUT_LINE_SPLIT) | |
3452 { | |
6845 | 3453 char_u *p; |
3454 | |
7 | 3455 /* "p" or "P" in Visual mode: split the lines to put the text in |
3456 * between. */ | |
3457 if (u_save_cursor() == FAIL) | |
3458 goto end; | |
6845 | 3459 p = ml_get_cursor(); |
3460 if (dir == FORWARD && *p != NUL) | |
3461 mb_ptr_adv(p); | |
3462 ptr = vim_strsave(p); | |
7 | 3463 if (ptr == NULL) |
3464 goto end; | |
3465 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
3466 vim_free(ptr); | |
3467 | |
6845 | 3468 oldp = ml_get_curline(); |
3469 p = oldp + curwin->w_cursor.col; | |
3470 if (dir == FORWARD && *p != NUL) | |
3471 mb_ptr_adv(p); | |
3472 ptr = vim_strnsave(oldp, p - oldp); | |
7 | 3473 if (ptr == NULL) |
3474 goto end; | |
3475 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
3476 ++nr_lines; | |
3477 dir = FORWARD; | |
3478 } | |
3479 if (flags & PUT_LINE_FORWARD) | |
3480 { | |
3481 /* Must be "p" for a Visual block, put lines below the block. */ | |
692 | 3482 curwin->w_cursor = curbuf->b_visual.vi_end; |
7 | 3483 dir = FORWARD; |
3484 } | |
3485 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3486 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3487 } | |
3488 | |
3489 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
3490 y_type = MLINE; | |
3491 | |
3492 if (y_size == 0 || y_array == NULL) | |
3493 { | |
3494 EMSG2(_("E353: Nothing in register %s"), | |
3495 regname == 0 ? (char_u *)"\"" : transchar(regname)); | |
3496 goto end; | |
3497 } | |
3498 | |
3499 if (y_type == MBLOCK) | |
3500 { | |
3501 lnum = curwin->w_cursor.lnum + y_size + 1; | |
3502 if (lnum > curbuf->b_ml.ml_line_count) | |
3503 lnum = curbuf->b_ml.ml_line_count + 1; | |
3504 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
3505 goto end; | |
3506 } | |
5735 | 3507 else if (y_type == MLINE) |
7 | 3508 { |
3509 lnum = curwin->w_cursor.lnum; | |
3510 #ifdef FEAT_FOLDING | |
3511 /* Correct line number for closed fold. Don't move the cursor yet, | |
3512 * u_save() uses it. */ | |
3513 if (dir == BACKWARD) | |
3514 (void)hasFolding(lnum, &lnum, NULL); | |
3515 else | |
3516 (void)hasFolding(lnum, NULL, &lnum); | |
3517 #endif | |
3518 if (dir == FORWARD) | |
3519 ++lnum; | |
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3520 /* In an empty buffer the empty line is going to be replaced, include |
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3521 * it in the saved lines. */ |
5100
18b43970fb7a
updated for version 7.3.1293
Bram Moolenaar <bram@vim.org>
parents:
5053
diff
changeset
|
3522 if ((bufempty() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
7 | 3523 goto end; |
3524 #ifdef FEAT_FOLDING | |
3525 if (dir == FORWARD) | |
3526 curwin->w_cursor.lnum = lnum - 1; | |
3527 else | |
3528 curwin->w_cursor.lnum = lnum; | |
3529 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
3530 #endif | |
3531 } | |
3532 else if (u_save_cursor() == FAIL) | |
3533 goto end; | |
3534 | |
3535 yanklen = (int)STRLEN(y_array[0]); | |
3536 | |
3537 #ifdef FEAT_VIRTUALEDIT | |
3538 if (ve_flags == VE_ALL && y_type == MCHAR) | |
3539 { | |
3540 if (gchar_cursor() == TAB) | |
3541 { | |
3542 /* Don't need to insert spaces when "p" on the last position of a | |
3543 * tab or "P" on the first position. */ | |
3544 if (dir == FORWARD | |
3545 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
3546 : curwin->w_cursor.coladd > 0) | |
3547 coladvance_force(getviscol()); | |
3548 else | |
3549 curwin->w_cursor.coladd = 0; | |
3550 } | |
3551 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
3552 coladvance_force(getviscol() + (dir == FORWARD)); | |
3553 } | |
3554 #endif | |
3555 | |
3556 lnum = curwin->w_cursor.lnum; | |
3557 col = curwin->w_cursor.col; | |
3558 | |
3559 /* | |
3560 * Block mode | |
3561 */ | |
3562 if (y_type == MBLOCK) | |
3563 { | |
10664
94db9c08e206
patch 8.0.0222: blockwise put on multi-byte character misplaced
Christian Brabandt <cb@256bit.org>
parents:
10494
diff
changeset
|
3564 int c = gchar_cursor(); |
7 | 3565 colnr_T endcol2 = 0; |
3566 | |
3567 if (dir == FORWARD && c != NUL) | |
3568 { | |
3569 #ifdef FEAT_VIRTUALEDIT | |
3570 if (ve_flags == VE_ALL) | |
3571 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3572 else | |
3573 #endif | |
3574 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
3575 | |
3576 #ifdef FEAT_MBYTE | |
3577 if (has_mbyte) | |
3578 /* move to start of next multi-byte character */ | |
474 | 3579 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
7 | 3580 else |
3581 #endif | |
3582 #ifdef FEAT_VIRTUALEDIT | |
3583 if (c != TAB || ve_flags != VE_ALL) | |
3584 #endif | |
3585 ++curwin->w_cursor.col; | |
3586 ++col; | |
3587 } | |
3588 else | |
3589 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3590 | |
3591 #ifdef FEAT_VIRTUALEDIT | |
3592 col += curwin->w_cursor.coladd; | |
1304 | 3593 if (ve_flags == VE_ALL |
3594 && (curwin->w_cursor.coladd > 0 | |
3595 || endcol2 == curwin->w_cursor.col)) | |
7 | 3596 { |
3597 if (dir == FORWARD && c == NUL) | |
3598 ++col; | |
3599 if (dir != FORWARD && c != NUL) | |
3600 ++curwin->w_cursor.col; | |
3601 if (c == TAB) | |
3602 { | |
3603 if (dir == BACKWARD && curwin->w_cursor.col) | |
3604 curwin->w_cursor.col--; | |
3605 if (dir == FORWARD && col - 1 == endcol2) | |
3606 curwin->w_cursor.col++; | |
3607 } | |
3608 } | |
3609 curwin->w_cursor.coladd = 0; | |
3610 #endif | |
699 | 3611 bd.textcol = 0; |
7 | 3612 for (i = 0; i < y_size; ++i) |
3613 { | |
3614 int spaces; | |
3615 char shortline; | |
3616 | |
3617 bd.startspaces = 0; | |
3618 bd.endspaces = 0; | |
3619 vcol = 0; | |
3620 delcount = 0; | |
3621 | |
3622 /* add a new line */ | |
3623 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
3624 { | |
3625 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
3626 (colnr_T)1, FALSE) == FAIL) | |
3627 break; | |
3628 ++nr_lines; | |
3629 } | |
3630 /* get the old line and advance to the position to insert at */ | |
3631 oldp = ml_get_curline(); | |
3632 oldlen = (int)STRLEN(oldp); | |
3633 for (ptr = oldp; vcol < col && *ptr; ) | |
3634 { | |
3635 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 3636 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
7 | 3637 vcol += incr; |
3638 } | |
3639 bd.textcol = (colnr_T)(ptr - oldp); | |
3640 | |
3641 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
3642 | |
3643 if (vcol < col) /* line too short, padd with spaces */ | |
3644 bd.startspaces = col - vcol; | |
3645 else if (vcol > col) | |
3646 { | |
3647 bd.endspaces = vcol - col; | |
3648 bd.startspaces = incr - bd.endspaces; | |
3649 --bd.textcol; | |
3650 delcount = 1; | |
3651 #ifdef FEAT_MBYTE | |
3652 if (has_mbyte) | |
3653 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
3654 #endif | |
3655 if (oldp[bd.textcol] != TAB) | |
3656 { | |
3657 /* Only a Tab can be split into spaces. Other | |
3658 * characters will have to be moved to after the | |
3659 * block, causing misalignment. */ | |
3660 delcount = 0; | |
3661 bd.endspaces = 0; | |
3662 } | |
3663 } | |
3664 | |
3665 yanklen = (int)STRLEN(y_array[i]); | |
3666 | |
3667 /* calculate number of spaces required to fill right side of block*/ | |
3668 spaces = y_width + 1; | |
3669 for (j = 0; j < yanklen; j++) | |
5995 | 3670 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
7 | 3671 if (spaces < 0) |
3672 spaces = 0; | |
3673 | |
3674 /* insert the new text */ | |
3675 totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces; | |
3676 newp = alloc_check((unsigned)totlen + oldlen + 1); | |
3677 if (newp == NULL) | |
3678 break; | |
3679 /* copy part up to cursor to new line */ | |
3680 ptr = newp; | |
3681 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
3682 ptr += bd.textcol; | |
3683 /* may insert some spaces before the new text */ | |
6929 | 3684 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
7 | 3685 ptr += bd.startspaces; |
3686 /* insert the new text */ | |
3687 for (j = 0; j < count; ++j) | |
3688 { | |
3689 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
3690 ptr += yanklen; | |
3691 | |
3692 /* insert block's trailing spaces only if there's text behind */ | |
3693 if ((j < count - 1 || !shortline) && spaces) | |
3694 { | |
6929 | 3695 vim_memset(ptr, ' ', (size_t)spaces); |
7 | 3696 ptr += spaces; |
3697 } | |
3698 } | |
3699 /* may insert some spaces after the new text */ | |
6929 | 3700 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
7 | 3701 ptr += bd.endspaces; |
3702 /* move the text after the cursor to the end of the line. */ | |
3703 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
3704 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
3705 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
3706 | |
3707 ++curwin->w_cursor.lnum; | |
3708 if (i == 0) | |
3709 curwin->w_cursor.col += bd.startspaces; | |
3710 } | |
3711 | |
3712 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
3713 | |
3714 /* Set '[ mark. */ | |
3715 curbuf->b_op_start = curwin->w_cursor; | |
3716 curbuf->b_op_start.lnum = lnum; | |
3717 | |
3718 /* adjust '] mark */ | |
3719 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
3720 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
237 | 3721 # ifdef FEAT_VIRTUALEDIT |
7 | 3722 curbuf->b_op_end.coladd = 0; |
237 | 3723 # endif |
7 | 3724 if (flags & PUT_CURSEND) |
3725 { | |
916 | 3726 colnr_T len; |
3727 | |
7 | 3728 curwin->w_cursor = curbuf->b_op_end; |
3729 curwin->w_cursor.col++; | |
916 | 3730 |
3731 /* in Insert mode we might be after the NUL, correct for that */ | |
3732 len = (colnr_T)STRLEN(ml_get_curline()); | |
3733 if (curwin->w_cursor.col > len) | |
3734 curwin->w_cursor.col = len; | |
7 | 3735 } |
3736 else | |
3737 curwin->w_cursor.lnum = lnum; | |
3738 } | |
3739 else | |
3740 { | |
3741 /* | |
3742 * Character or Line mode | |
3743 */ | |
3744 if (y_type == MCHAR) | |
3745 { | |
3746 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
3747 * char */ | |
3748 if (dir == FORWARD && gchar_cursor() != NUL) | |
3749 { | |
3750 #ifdef FEAT_MBYTE | |
3751 if (has_mbyte) | |
3752 { | |
474 | 3753 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
7 | 3754 |
3755 /* put it on the next of the multi-byte character. */ | |
3756 col += bytelen; | |
3757 if (yanklen) | |
3758 { | |
3759 curwin->w_cursor.col += bytelen; | |
3760 curbuf->b_op_end.col += bytelen; | |
3761 } | |
3762 } | |
3763 else | |
3764 #endif | |
3765 { | |
3766 ++col; | |
3767 if (yanklen) | |
3768 { | |
3769 ++curwin->w_cursor.col; | |
3770 ++curbuf->b_op_end.col; | |
3771 } | |
3772 } | |
3773 } | |
3774 curbuf->b_op_start = curwin->w_cursor; | |
3775 } | |
3776 /* | |
3777 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
3778 */ | |
3779 else if (dir == BACKWARD) | |
3780 --lnum; | |
699 | 3781 new_cursor = curwin->w_cursor; |
7 | 3782 |
3783 /* | |
3784 * simple case: insert into current line | |
3785 */ | |
3786 if (y_type == MCHAR && y_size == 1) | |
3787 { | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3788 linenr_T end_lnum = 0; /* init for gcc */ |
10688
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3789 |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3790 if (VIsual_active) |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3791 { |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3792 end_lnum = curbuf->b_visual.vi_end.lnum; |
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3793 if (end_lnum < curbuf->b_visual.vi_start.lnum) |
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3794 end_lnum = curbuf->b_visual.vi_start.lnum; |
10688
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3795 } |
10670
bce3eccea39a
patch 8.0.0225: put in Visual block mode terminates early
Christian Brabandt <cb@256bit.org>
parents:
10664
diff
changeset
|
3796 |
5365 | 3797 do { |
3798 totlen = count * yanklen; | |
3799 if (totlen > 0) | |
7 | 3800 { |
5365 | 3801 oldp = ml_get(lnum); |
10688
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3802 if (VIsual_active && col > (int)STRLEN(oldp)) |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3803 { |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3804 lnum++; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3805 continue; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3806 } |
5365 | 3807 newp = alloc_check((unsigned)(STRLEN(oldp) + totlen + 1)); |
3808 if (newp == NULL) | |
3809 goto end; /* alloc() gave an error message */ | |
3810 mch_memmove(newp, oldp, (size_t)col); | |
3811 ptr = newp + col; | |
3812 for (i = 0; i < count; ++i) | |
3813 { | |
3814 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
3815 ptr += yanklen; | |
3816 } | |
3817 STRMOVE(ptr, oldp + col); | |
3818 ml_replace(lnum, newp, FALSE); | |
3819 /* Place cursor on last putted char. */ | |
3820 if (lnum == curwin->w_cursor.lnum) | |
5496 | 3821 { |
3822 /* make sure curwin->w_virtcol is updated */ | |
3823 changed_cline_bef_curs(); | |
5365 | 3824 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
5496 | 3825 } |
7 | 3826 } |
5365 | 3827 if (VIsual_active) |
3828 lnum++; | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3829 } while (VIsual_active && lnum <= end_lnum); |
5365 | 3830 |
6379 | 3831 if (VIsual_active) /* reset lnum to the last visual line */ |
3832 lnum--; | |
3833 | |
7 | 3834 curbuf->b_op_end = curwin->w_cursor; |
3835 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
3836 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
3837 ++curwin->w_cursor.col; | |
3838 changed_bytes(lnum, col); | |
3839 } | |
3840 else | |
3841 { | |
3842 /* | |
3843 * Insert at least one line. When y_type is MCHAR, break the first | |
3844 * line in two. | |
3845 */ | |
3846 for (cnt = 1; cnt <= count; ++cnt) | |
3847 { | |
3848 i = 0; | |
3849 if (y_type == MCHAR) | |
3850 { | |
3851 /* | |
3852 * Split the current line in two at the insert position. | |
3853 * First insert y_array[size - 1] in front of second line. | |
3854 * Then append y_array[0] to first line. | |
3855 */ | |
3856 lnum = new_cursor.lnum; | |
3857 ptr = ml_get(lnum) + col; | |
3858 totlen = (int)STRLEN(y_array[y_size - 1]); | |
3859 newp = alloc_check((unsigned)(STRLEN(ptr) + totlen + 1)); | |
3860 if (newp == NULL) | |
3861 goto error; | |
3862 STRCPY(newp, y_array[y_size - 1]); | |
3863 STRCAT(newp, ptr); | |
3864 /* insert second line */ | |
3865 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
3866 vim_free(newp); | |
3867 | |
3868 oldp = ml_get(lnum); | |
3869 newp = alloc_check((unsigned)(col + yanklen + 1)); | |
3870 if (newp == NULL) | |
3871 goto error; | |
3872 /* copy first part of line */ | |
3873 mch_memmove(newp, oldp, (size_t)col); | |
3874 /* append to first line */ | |
3875 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
3876 ml_replace(lnum, newp, FALSE); | |
3877 | |
3878 curwin->w_cursor.lnum = lnum; | |
3879 i = 1; | |
3880 } | |
3881 | |
3882 for (; i < y_size; ++i) | |
3883 { | |
3884 if ((y_type != MCHAR || i < y_size - 1) | |
3885 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
3886 == FAIL) | |
3887 goto error; | |
3888 lnum++; | |
3889 ++nr_lines; | |
3890 if (flags & PUT_FIXINDENT) | |
3891 { | |
3892 old_pos = curwin->w_cursor; | |
3893 curwin->w_cursor.lnum = lnum; | |
3894 ptr = ml_get(lnum); | |
3895 if (cnt == count && i == y_size - 1) | |
3896 lendiff = (int)STRLEN(ptr); | |
3897 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
3898 if (*ptr == '#' && preprocs_left()) | |
3899 indent = 0; /* Leave # lines at start */ | |
3900 else | |
3901 #endif | |
3902 if (*ptr == NUL) | |
3903 indent = 0; /* Ignore empty lines */ | |
3904 else if (first_indent) | |
3905 { | |
3906 indent_diff = orig_indent - get_indent(); | |
3907 indent = orig_indent; | |
3908 first_indent = FALSE; | |
3909 } | |
3910 else if ((indent = get_indent() + indent_diff) < 0) | |
3911 indent = 0; | |
3912 (void)set_indent(indent, 0); | |
3913 curwin->w_cursor = old_pos; | |
3914 /* remember how many chars were removed */ | |
3915 if (cnt == count && i == y_size - 1) | |
3916 lendiff -= (int)STRLEN(ml_get(lnum)); | |
3917 } | |
3918 } | |
3919 } | |
3920 | |
3921 error: | |
3922 /* Adjust marks. */ | |
3923 if (y_type == MLINE) | |
3924 { | |
3925 curbuf->b_op_start.col = 0; | |
3926 if (dir == FORWARD) | |
3927 curbuf->b_op_start.lnum++; | |
3928 } | |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3929 /* Skip mark_adjust when adding lines after the last one, there |
11065
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
3930 * can't be marks there. But still needed in diff mode. */ |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3931 if (curbuf->b_op_start.lnum + (y_type == MCHAR) - 1 + nr_lines |
11065
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
3932 < curbuf->b_ml.ml_line_count |
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
3933 #ifdef FEAT_DIFF |
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
3934 || curwin->w_p_diff |
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
3935 #endif |
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
3936 ) |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3937 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
7 | 3938 (linenr_T)MAXLNUM, nr_lines, 0L); |
3939 | |
3940 /* note changed text for displaying and folding */ | |
3941 if (y_type == MCHAR) | |
3942 changed_lines(curwin->w_cursor.lnum, col, | |
3943 curwin->w_cursor.lnum + 1, nr_lines); | |
3944 else | |
3945 changed_lines(curbuf->b_op_start.lnum, 0, | |
3946 curbuf->b_op_start.lnum, nr_lines); | |
3947 | |
3948 /* put '] mark at last inserted character */ | |
3949 curbuf->b_op_end.lnum = lnum; | |
3950 /* correct length for change in indent */ | |
3951 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
3952 if (col > 1) | |
3953 curbuf->b_op_end.col = col - 1; | |
3954 else | |
3955 curbuf->b_op_end.col = 0; | |
3956 | |
168 | 3957 if (flags & PUT_CURSLINE) |
3958 { | |
237 | 3959 /* ":put": put cursor on last inserted line */ |
168 | 3960 curwin->w_cursor.lnum = lnum; |
3961 beginline(BL_WHITE | BL_FIX); | |
3962 } | |
3963 else if (flags & PUT_CURSEND) | |
7 | 3964 { |
3965 /* put cursor after inserted text */ | |
3966 if (y_type == MLINE) | |
3967 { | |
3968 if (lnum >= curbuf->b_ml.ml_line_count) | |
3969 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
3970 else | |
3971 curwin->w_cursor.lnum = lnum + 1; | |
3972 curwin->w_cursor.col = 0; | |
3973 } | |
3974 else | |
3975 { | |
3976 curwin->w_cursor.lnum = lnum; | |
3977 curwin->w_cursor.col = col; | |
3978 } | |
3979 } | |
3980 else if (y_type == MLINE) | |
3981 { | |
168 | 3982 /* put cursor on first non-blank in first inserted line */ |
7 | 3983 curwin->w_cursor.col = 0; |
3984 if (dir == FORWARD) | |
3985 ++curwin->w_cursor.lnum; | |
3986 beginline(BL_WHITE | BL_FIX); | |
3987 } | |
3988 else /* put cursor on first inserted character */ | |
3989 curwin->w_cursor = new_cursor; | |
3990 } | |
3991 } | |
3992 | |
3993 msgmore(nr_lines); | |
3994 curwin->w_set_curswant = TRUE; | |
3995 | |
3996 end: | |
3997 if (allocated) | |
3998 vim_free(insert_string); | |
840 | 3999 if (regname == '=') |
4000 vim_free(y_array); | |
4001 | |
5380 | 4002 VIsual_active = FALSE; |
4003 | |
140 | 4004 /* If the cursor is past the end of the line put it at the end. */ |
844 | 4005 adjust_cursor_eol(); |
4006 } | |
4007 | |
4008 /* | |
4009 * When the cursor is on the NUL past the end of the line and it should not be | |
4010 * there move it left. | |
4011 */ | |
4012 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4013 adjust_cursor_eol(void) |
844 | 4014 { |
4015 if (curwin->w_cursor.col > 0 | |
4016 && gchar_cursor() == NUL | |
773 | 4017 #ifdef FEAT_VIRTUALEDIT |
4018 && (ve_flags & VE_ONEMORE) == 0 | |
4019 #endif | |
7 | 4020 && !(restart_edit || (State & INSERT))) |
4021 { | |
557 | 4022 /* Put the cursor on the last character in the line. */ |
555 | 4023 dec_cursor(); |
844 | 4024 |
7 | 4025 #ifdef FEAT_VIRTUALEDIT |
4026 if (ve_flags == VE_ALL) | |
557 | 4027 { |
4028 colnr_T scol, ecol; | |
4029 | |
4030 /* Coladd is set to the width of the last character. */ | |
4031 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
4032 curwin->w_cursor.coladd = ecol - scol + 1; | |
4033 } | |
7 | 4034 #endif |
4035 } | |
4036 } | |
4037 | |
4038 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
4039 /* | |
4040 * Return TRUE if lines starting with '#' should be left aligned. | |
4041 */ | |
4042 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4043 preprocs_left(void) |
7 | 4044 { |
4045 return | |
4046 # ifdef FEAT_SMARTINDENT | |
4047 # ifdef FEAT_CINDENT | |
4048 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
4049 # else | |
4050 curbuf->b_p_si | |
4051 # endif | |
4052 # endif | |
4053 # ifdef FEAT_CINDENT | |
5438 | 4054 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
4055 && curbuf->b_ind_hash_comment == 0) | |
7 | 4056 # endif |
4057 ; | |
4058 } | |
4059 #endif | |
4060 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4061 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4062 * Return the character name of the register with the given number. |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4063 */ |
7 | 4064 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4065 get_register_name(int num) |
7 | 4066 { |
4067 if (num == -1) | |
4068 return '"'; | |
4069 else if (num < 10) | |
4070 return num + '0'; | |
4071 else if (num == DELETION_REGISTER) | |
4072 return '-'; | |
4073 #ifdef FEAT_CLIPBOARD | |
4074 else if (num == STAR_REGISTER) | |
4075 return '*'; | |
4076 else if (num == PLUS_REGISTER) | |
4077 return '+'; | |
4078 #endif | |
4079 else | |
4080 { | |
4081 #ifdef EBCDIC | |
4082 int i; | |
4083 | |
4084 /* EBCDIC is really braindead ... */ | |
4085 i = 'a' + (num - 10); | |
4086 if (i > 'i') | |
4087 i += 7; | |
4088 if (i > 'r') | |
4089 i += 8; | |
4090 return i; | |
4091 #else | |
4092 return num + 'a' - 10; | |
4093 #endif | |
4094 } | |
4095 } | |
4096 | |
4097 /* | |
4098 * ":dis" and ":registers": Display the contents of the yank registers. | |
4099 */ | |
4100 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4101 ex_display(exarg_T *eap) |
7 | 4102 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4103 int i, n; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4104 long j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4105 char_u *p; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4106 yankreg_T *yb; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4107 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4108 int attr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4109 char_u *arg = eap->arg; |
22 | 4110 #ifdef FEAT_MBYTE |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4111 int clen; |
22 | 4112 #else |
4113 # define clen 1 | |
4114 #endif | |
7 | 4115 |
4116 if (arg != NULL && *arg == NUL) | |
4117 arg = NULL; | |
4118 attr = hl_attr(HLF_8); | |
4119 | |
4120 /* Highlight title */ | |
4121 MSG_PUTS_TITLE(_("\n--- Registers ---")); | |
4122 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) | |
4123 { | |
4124 name = get_register_name(i); | |
2644 | 4125 if (arg != NULL && vim_strchr(arg, name) == NULL |
4126 #ifdef ONE_CLIPBOARD | |
4127 /* Star register and plus register contain the same thing. */ | |
4128 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
4129 #endif | |
4130 ) | |
7 | 4131 continue; /* did not ask for this register */ |
4132 | |
4133 #ifdef FEAT_CLIPBOARD | |
4134 /* Adjust register name for "unnamed" in 'clipboard'. | |
4135 * When it's a clipboard register, fill it with the current contents | |
4136 * of the clipboard. */ | |
4137 adjust_clip_reg(&name); | |
4138 (void)may_get_selection(name); | |
4139 #endif | |
4140 | |
4141 if (i == -1) | |
4142 { | |
4143 if (y_previous != NULL) | |
4144 yb = y_previous; | |
4145 else | |
4146 yb = &(y_regs[0]); | |
4147 } | |
4148 else | |
4149 yb = &(y_regs[i]); | |
2000 | 4150 |
4151 #ifdef FEAT_EVAL | |
4152 if (name == MB_TOLOWER(redir_reg) | |
4153 || (redir_reg == '"' && yb == y_previous)) | |
4154 continue; /* do not list register being written to, the | |
4155 * pointer can be freed */ | |
4156 #endif | |
4157 | |
7 | 4158 if (yb->y_array != NULL) |
4159 { | |
4160 msg_putchar('\n'); | |
4161 msg_putchar('"'); | |
4162 msg_putchar(name); | |
4163 MSG_PUTS(" "); | |
4164 | |
4165 n = (int)Columns - 6; | |
4166 for (j = 0; j < yb->y_size && n > 1; ++j) | |
4167 { | |
4168 if (j) | |
4169 { | |
4170 MSG_PUTS_ATTR("^J", attr); | |
4171 n -= 2; | |
4172 } | |
4173 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
4174 { | |
4175 #ifdef FEAT_MBYTE | |
474 | 4176 clen = (*mb_ptr2len)(p); |
22 | 4177 #endif |
4178 msg_outtrans_len(p, clen); | |
4179 #ifdef FEAT_MBYTE | |
4180 p += clen - 1; | |
7 | 4181 #endif |
4182 } | |
4183 } | |
4184 if (n > 1 && yb->y_type == MLINE) | |
4185 MSG_PUTS_ATTR("^J", attr); | |
4186 out_flush(); /* show one line at a time */ | |
4187 } | |
4188 ui_breakcheck(); | |
4189 } | |
4190 | |
4191 /* | |
4192 * display last inserted text | |
4193 */ | |
4194 if ((p = get_last_insert()) != NULL | |
4195 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
4196 { | |
4197 MSG_PUTS("\n\". "); | |
4198 dis_msg(p, TRUE); | |
4199 } | |
4200 | |
4201 /* | |
4202 * display last command line | |
4203 */ | |
4204 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
4205 && !got_int) | |
4206 { | |
4207 MSG_PUTS("\n\": "); | |
4208 dis_msg(last_cmdline, FALSE); | |
4209 } | |
4210 | |
4211 /* | |
4212 * display current file name | |
4213 */ | |
4214 if (curbuf->b_fname != NULL | |
4215 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4216 { | |
4217 MSG_PUTS("\n\"% "); | |
4218 dis_msg(curbuf->b_fname, FALSE); | |
4219 } | |
4220 | |
4221 /* | |
4222 * display alternate file name | |
4223 */ | |
4224 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4225 { | |
4226 char_u *fname; | |
4227 linenr_T dummy; | |
4228 | |
4229 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
4230 { | |
4231 MSG_PUTS("\n\"# "); | |
4232 dis_msg(fname, FALSE); | |
4233 } | |
4234 } | |
4235 | |
4236 /* | |
4237 * display last search pattern | |
4238 */ | |
4239 if (last_search_pat() != NULL | |
4240 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
4241 { | |
4242 MSG_PUTS("\n\"/ "); | |
4243 dis_msg(last_search_pat(), FALSE); | |
4244 } | |
4245 | |
4246 #ifdef FEAT_EVAL | |
4247 /* | |
4248 * display last used expression | |
4249 */ | |
4250 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
4251 && !got_int) | |
4252 { | |
4253 MSG_PUTS("\n\"= "); | |
4254 dis_msg(expr_line, FALSE); | |
4255 } | |
4256 #endif | |
4257 } | |
4258 | |
4259 /* | |
4260 * display a string for do_dis() | |
4261 * truncate at end of screen line | |
4262 */ | |
4263 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4264 dis_msg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4265 char_u *p, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4266 int skip_esc) /* if TRUE, ignore trailing ESC */ |
7 | 4267 { |
4268 int n; | |
4269 #ifdef FEAT_MBYTE | |
4270 int l; | |
4271 #endif | |
4272 | |
4273 n = (int)Columns - 6; | |
4274 while (*p != NUL | |
4275 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
4276 && (n -= ptr2cells(p)) >= 0) | |
4277 { | |
4278 #ifdef FEAT_MBYTE | |
474 | 4279 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
7 | 4280 { |
4281 msg_outtrans_len(p, l); | |
4282 p += l; | |
4283 } | |
4284 else | |
4285 #endif | |
4286 msg_outtrans_len(p++, 1); | |
4287 } | |
4288 ui_breakcheck(); | |
4289 } | |
4290 | |
3562 | 4291 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4292 /* | |
4293 * If "process" is TRUE and the line begins with a comment leader (possibly | |
4294 * after some white space), return a pointer to the text after it. Put a boolean | |
4295 * value indicating whether the line ends with an unclosed comment in | |
4296 * "is_comment". | |
4297 * line - line to be processed, | |
4298 * process - if FALSE, will only check whether the line ends with an unclosed | |
3584 | 4299 * comment, |
3562 | 4300 * include_space - whether to also skip space following the comment leader, |
4301 * is_comment - will indicate whether the current line ends with an unclosed | |
3584 | 4302 * comment. |
3562 | 4303 */ |
4304 static char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4305 skip_comment( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4306 char_u *line, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4307 int process, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4308 int include_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4309 int *is_comment) |
3562 | 4310 { |
4311 char_u *comment_flags = NULL; | |
4312 int lead_len; | |
4313 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
4314 | |
4315 *is_comment = FALSE; | |
4316 if (leader_offset != -1) | |
4317 { | |
4318 /* Let's check whether the line ends with an unclosed comment. | |
4319 * If the last comment leader has COM_END in flags, there's no comment. | |
4320 */ | |
4321 while (*comment_flags) | |
4322 { | |
4323 if (*comment_flags == COM_END | |
4324 || *comment_flags == ':') | |
4325 break; | |
4326 ++comment_flags; | |
4327 } | |
4328 if (*comment_flags != COM_END) | |
4329 *is_comment = TRUE; | |
4330 } | |
4331 | |
4332 if (process == FALSE) | |
4333 return line; | |
4334 | |
4335 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
4336 | |
4337 if (lead_len == 0) | |
4338 return line; | |
4339 | |
4340 /* Find: | |
4341 * - COM_END, | |
4342 * - colon, | |
4343 * whichever comes first. | |
4344 */ | |
4345 while (*comment_flags) | |
4346 { | |
3580 | 4347 if (*comment_flags == COM_END |
3562 | 4348 || *comment_flags == ':') |
4349 { | |
4350 break; | |
4351 } | |
4352 ++comment_flags; | |
4353 } | |
4354 | |
4355 /* If we found a colon, it means that we are not processing a line | |
3580 | 4356 * starting with a closing part of a three-part comment. That's good, |
4357 * because we don't want to remove those as this would be annoying. | |
3562 | 4358 */ |
4359 if (*comment_flags == ':' || *comment_flags == NUL) | |
4360 line += lead_len; | |
4361 | |
4362 return line; | |
4363 } | |
4364 #endif | |
4365 | |
7 | 4366 /* |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4367 * Join 'count' lines (minimal 2) at cursor position. |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4368 * When "save_undo" is TRUE save lines for undo first. |
5848 | 4369 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
4370 * leaders should not be removed. | |
4371 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
4372 * to set those marks. | |
7 | 4373 * |
1217 | 4374 * return FAIL for failure, OK otherwise |
7 | 4375 */ |
4376 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4377 do_join( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4378 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4379 int insert_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4380 int save_undo, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4381 int use_formatoptions UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4382 int setmark) |
7 | 4383 { |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4384 char_u *curr = NULL; |
2597 | 4385 char_u *curr_start = NULL; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4386 char_u *cend; |
7 | 4387 char_u *newp; |
2597 | 4388 char_u *spaces; /* number of spaces inserted before a line */ |
2310
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4389 int endcurr1 = NUL; |
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4390 int endcurr2 = NUL; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4391 int currsize = 0; /* size of the current line */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4392 int sumsize = 0; /* size of the long new line */ |
7 | 4393 linenr_T t; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4394 colnr_T col = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4395 int ret = OK; |
3562 | 4396 #if defined(FEAT_COMMENTS) || defined(PROTO) |
3574 | 4397 int *comments = NULL; |
3562 | 4398 int remove_comments = (use_formatoptions == TRUE) |
4399 && has_format_option(FO_REMOVE_COMS); | |
4400 int prev_was_comment; | |
4401 #endif | |
4402 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4403 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4404 if (save_undo && u_save((linenr_T)(curwin->w_cursor.lnum - 1), |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4405 (linenr_T)(curwin->w_cursor.lnum + count)) == FAIL) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4406 return FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4407 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4408 /* Allocate an array to store the number of spaces inserted before each |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4409 * line. We will use it to pre-compute the length of the new line and the |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4410 * proper placement of each original line in the new one. */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4411 spaces = lalloc_clear((long_u)count, TRUE); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4412 if (spaces == NULL) |
7 | 4413 return FAIL; |
3562 | 4414 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4415 if (remove_comments) | |
4416 { | |
4417 comments = (int *)lalloc_clear((long_u)count * sizeof(int), TRUE); | |
4418 if (comments == NULL) | |
4419 { | |
4420 vim_free(spaces); | |
4421 return FAIL; | |
4422 } | |
4423 } | |
4424 #endif | |
7 | 4425 |
4426 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4427 * Don't move anything, just compute the final line length |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4428 * and setup the array of space strings lengths |
7 | 4429 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4430 for (t = 0; t < count; ++t) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4431 { |
2597 | 4432 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
5848 | 4433 if (t == 0 && setmark) |
5664 | 4434 { |
4435 /* Set the '[ mark. */ | |
4436 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
4437 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
4438 } | |
3562 | 4439 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4440 if (remove_comments) | |
4441 { | |
4442 /* We don't want to remove the comment leader if the | |
4443 * previous line is not a comment. */ | |
4444 if (t > 0 && prev_was_comment) | |
4445 { | |
4446 | |
4447 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
4448 &prev_was_comment); | |
3576 | 4449 comments[t] = (int)(new_curr - curr); |
3562 | 4450 curr = new_curr; |
4451 } | |
4452 else | |
4453 curr = skip_comment(curr, FALSE, insert_space, | |
4454 &prev_was_comment); | |
4455 } | |
4456 #endif | |
4457 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4458 if (insert_space && t > 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4459 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4460 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4461 if (*curr != ')' && currsize != 0 && endcurr1 != TAB |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4462 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4463 && (!has_format_option(FO_MBYTE_JOIN) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4464 || (mb_ptr2char(curr) < 0x100 && endcurr1 < 0x100)) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4465 && (!has_format_option(FO_MBYTE_JOIN2) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4466 || mb_ptr2char(curr) < 0x100 || endcurr1 < 0x100) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4467 #endif |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4468 ) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4469 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4470 /* don't add a space if the line is ending in a space */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4471 if (endcurr1 == ' ') |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4472 endcurr1 = endcurr2; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4473 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4474 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4475 /* extra space when 'joinspaces' set and line ends in '.' */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4476 if ( p_js |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4477 && (endcurr1 == '.' |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4478 || (vim_strchr(p_cpo, CPO_JOINSP) == NULL |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4479 && (endcurr1 == '?' || endcurr1 == '!')))) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4480 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4481 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4482 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4483 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4484 sumsize += currsize + spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4485 endcurr1 = endcurr2 = NUL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4486 if (insert_space && currsize > 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4487 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4488 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4489 if (has_mbyte) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4490 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4491 cend = curr + currsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4492 mb_ptr_back(curr, cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4493 endcurr1 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4494 if (cend > curr) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4495 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4496 mb_ptr_back(curr, cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4497 endcurr2 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4498 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4499 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4500 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4501 #endif |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4502 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4503 endcurr1 = *(curr + currsize - 1); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4504 if (currsize > 1) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4505 endcurr2 = *(curr + currsize - 2); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4506 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4507 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4508 line_breakcheck(); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4509 if (got_int) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4510 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4511 ret = FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4512 goto theend; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4513 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4514 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4515 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4516 /* store the column position before last line */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4517 col = sumsize - currsize - spaces[count - 1]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4518 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4519 /* allocate the space for the new line */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4520 newp = alloc_check((unsigned)(sumsize + 1)); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4521 cend = newp + sumsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4522 *cend = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4523 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4524 /* |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4525 * Move affected lines to the new long one. |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4526 * |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4527 * Move marks from each deleted line to the joined line, adjusting the |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4528 * column. This is not Vi compatible, but Vi deletes the marks, thus that |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4529 * should not really be a problem. |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4530 */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4531 for (t = count - 1; ; --t) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4532 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4533 cend -= currsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4534 mch_memmove(cend, curr, (size_t)currsize); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4535 if (spaces[t] > 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4536 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4537 cend -= spaces[t]; |
6929 | 4538 vim_memset(cend, ' ', (size_t)(spaces[t])); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4539 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4540 mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t, |
2597 | 4541 (long)(cend - newp + spaces[t] - (curr - curr_start))); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4542 if (t == 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4543 break; |
2597 | 4544 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1)); |
3562 | 4545 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4546 if (remove_comments) | |
4547 curr += comments[t - 1]; | |
4548 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4549 if (insert_space && t > 1) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4550 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4551 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4552 } |
7 | 4553 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
4554 | |
5848 | 4555 if (setmark) |
4556 { | |
4557 /* Set the '] mark. */ | |
4558 curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; | |
4559 curwin->w_buffer->b_op_end.col = (colnr_T)STRLEN(newp); | |
4560 } | |
5664 | 4561 |
7 | 4562 /* Only report the change in the first line here, del_lines() will report |
4563 * the deleted line. */ | |
4564 changed_lines(curwin->w_cursor.lnum, currsize, | |
4565 curwin->w_cursor.lnum + 1, 0L); | |
4566 | |
4567 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4568 * Delete following lines. To do this we move the cursor there |
7 | 4569 * briefly, and then move it back. After del_lines() the cursor may |
4570 * have moved up (last line deleted), so the current lnum is kept in t. | |
4571 */ | |
4572 t = curwin->w_cursor.lnum; | |
4573 ++curwin->w_cursor.lnum; | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4574 del_lines(count - 1, FALSE); |
7 | 4575 curwin->w_cursor.lnum = t; |
4576 | |
4577 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4578 * Set the cursor column: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4579 * Vi compatible: use the column of the first join |
2311
ccda151dde4e
Support completion for ":find". (Nazri Ramliy)
Bram Moolenaar <bram@vim.org>
parents:
2310
diff
changeset
|
4580 * vim: use the column of the last join |
7 | 4581 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4582 curwin->w_cursor.col = |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4583 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
7 | 4584 check_cursor_col(); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4585 |
7 | 4586 #ifdef FEAT_VIRTUALEDIT |
4587 curwin->w_cursor.coladd = 0; | |
4588 #endif | |
4589 curwin->w_set_curswant = TRUE; | |
4590 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4591 theend: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4592 vim_free(spaces); |
3562 | 4593 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4594 if (remove_comments) | |
4595 vim_free(comments); | |
4596 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4597 return ret; |
7 | 4598 } |
4599 | |
4600 #ifdef FEAT_COMMENTS | |
4601 /* | |
4602 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
4603 * the first line. White-space is ignored. Note that the whole of | |
4604 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
4605 */ | |
4606 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4607 same_leader( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4608 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4609 int leader1_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4610 char_u *leader1_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4611 int leader2_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4612 char_u *leader2_flags) |
7 | 4613 { |
4614 int idx1 = 0, idx2 = 0; | |
4615 char_u *p; | |
4616 char_u *line1; | |
4617 char_u *line2; | |
4618 | |
4619 if (leader1_len == 0) | |
4620 return (leader2_len == 0); | |
4621 | |
4622 /* | |
4623 * If first leader has 'f' flag, the lines can be joined only if the | |
4624 * second line does not have a leader. | |
4625 * If first leader has 'e' flag, the lines can never be joined. | |
4626 * If fist leader has 's' flag, the lines can only be joined if there is | |
4627 * some text after it and the second line has the 'm' flag. | |
4628 */ | |
4629 if (leader1_flags != NULL) | |
4630 { | |
4631 for (p = leader1_flags; *p && *p != ':'; ++p) | |
4632 { | |
4633 if (*p == COM_FIRST) | |
4634 return (leader2_len == 0); | |
4635 if (*p == COM_END) | |
4636 return FALSE; | |
4637 if (*p == COM_START) | |
4638 { | |
4639 if (*(ml_get(lnum) + leader1_len) == NUL) | |
4640 return FALSE; | |
4641 if (leader2_flags == NULL || leader2_len == 0) | |
4642 return FALSE; | |
4643 for (p = leader2_flags; *p && *p != ':'; ++p) | |
4644 if (*p == COM_MIDDLE) | |
4645 return TRUE; | |
4646 return FALSE; | |
4647 } | |
4648 } | |
4649 } | |
4650 | |
4651 /* | |
4652 * Get current line and next line, compare the leaders. | |
4653 * The first line has to be saved, only one line can be locked at a time. | |
4654 */ | |
4655 line1 = vim_strsave(ml_get(lnum)); | |
4656 if (line1 != NULL) | |
4657 { | |
4658 for (idx1 = 0; vim_iswhite(line1[idx1]); ++idx1) | |
4659 ; | |
4660 line2 = ml_get(lnum + 1); | |
4661 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
4662 { | |
4663 if (!vim_iswhite(line2[idx2])) | |
4664 { | |
4665 if (line1[idx1++] != line2[idx2]) | |
4666 break; | |
4667 } | |
4668 else | |
4669 while (vim_iswhite(line1[idx1])) | |
4670 ++idx1; | |
4671 } | |
4672 vim_free(line1); | |
4673 } | |
4674 return (idx2 == leader2_len && idx1 == leader1_len); | |
4675 } | |
4676 #endif | |
4677 | |
4678 /* | |
3252 | 4679 * Implementation of the format operator 'gq'. |
7 | 4680 */ |
4681 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4682 op_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4683 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4684 int keep_cursor) /* keep cursor on same text char */ |
7 | 4685 { |
4686 long old_line_count = curbuf->b_ml.ml_line_count; | |
4687 | |
4688 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
4689 * can put it back there. */ | |
4690 curwin->w_cursor = oap->cursor_start; | |
4691 | |
4692 if (u_save((linenr_T)(oap->start.lnum - 1), | |
4693 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
4694 return; | |
4695 curwin->w_cursor = oap->start; | |
4696 | |
4697 if (oap->is_VIsual) | |
4698 /* When there is no change: need to remove the Visual selection */ | |
4699 redraw_curbuf_later(INVERTED); | |
4700 | |
4701 /* Set '[ mark at the start of the formatted area */ | |
4702 curbuf->b_op_start = oap->start; | |
4703 | |
4704 /* For "gw" remember the cursor position and put it back below (adjusted | |
4705 * for joined and split lines). */ | |
4706 if (keep_cursor) | |
4707 saved_cursor = oap->cursor_start; | |
4708 | |
1563 | 4709 format_lines(oap->line_count, keep_cursor); |
7 | 4710 |
4711 /* | |
4712 * Leave the cursor at the first non-blank of the last formatted line. | |
4713 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
4714 * line, so "." will do the next lines. | |
4715 */ | |
4716 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
4717 ++curwin->w_cursor.lnum; | |
4718 beginline(BL_WHITE | BL_FIX); | |
4719 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
4720 msgmore(old_line_count); | |
4721 | |
4722 /* put '] mark on the end of the formatted area */ | |
4723 curbuf->b_op_end = curwin->w_cursor; | |
4724 | |
4725 if (keep_cursor) | |
4726 { | |
4727 curwin->w_cursor = saved_cursor; | |
4728 saved_cursor.lnum = 0; | |
4729 } | |
4730 | |
4731 if (oap->is_VIsual) | |
4732 { | |
4733 win_T *wp; | |
4734 | |
4735 FOR_ALL_WINDOWS(wp) | |
4736 { | |
4737 if (wp->w_old_cursor_lnum != 0) | |
4738 { | |
4739 /* When lines have been inserted or deleted, adjust the end of | |
4740 * the Visual area to be redrawn. */ | |
4741 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
4742 wp->w_old_cursor_lnum += old_line_count; | |
4743 else | |
4744 wp->w_old_visual_lnum += old_line_count; | |
4745 } | |
4746 } | |
4747 } | |
4748 } | |
4749 | |
667 | 4750 #if defined(FEAT_EVAL) || defined(PROTO) |
4751 /* | |
4752 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
4753 */ | |
4754 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4755 op_formatexpr(oparg_T *oap) |
667 | 4756 { |
4757 if (oap->is_VIsual) | |
4758 /* When there is no change: need to remove the Visual selection */ | |
4759 redraw_curbuf_later(INVERTED); | |
4760 | |
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4761 if (fex_format(oap->start.lnum, oap->line_count, NUL) != 0) |
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4762 /* As documented: when 'formatexpr' returns non-zero fall back to |
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4763 * internal formatting. */ |
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4764 op_format(oap, FALSE); |
667 | 4765 } |
4766 | |
4767 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4768 fex_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4769 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4770 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4771 int c) /* character to be inserted */ |
667 | 4772 { |
681 | 4773 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
4774 OPT_LOCAL); | |
667 | 4775 int r; |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4776 char_u *fex; |
667 | 4777 |
4778 /* | |
4779 * Set v:lnum to the first line number and v:count to the number of lines. | |
844 | 4780 * Set v:char to the character to be inserted (can be NUL). |
667 | 4781 */ |
4782 set_vim_var_nr(VV_LNUM, lnum); | |
4783 set_vim_var_nr(VV_COUNT, count); | |
1969 | 4784 set_vim_var_char(c); |
844 | 4785 |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4786 /* Make a copy, the option could be changed while calling it. */ |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4787 fex = vim_strsave(curbuf->b_p_fex); |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4788 if (fex == NULL) |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4789 return 0; |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4790 |
667 | 4791 /* |
4792 * Evaluate the function. | |
4793 */ | |
4794 if (use_sandbox) | |
4795 ++sandbox; | |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4796 r = (int)eval_to_number(fex); |
667 | 4797 if (use_sandbox) |
4798 --sandbox; | |
844 | 4799 |
4800 set_vim_var_string(VV_CHAR, NULL, -1); | |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4801 vim_free(fex); |
844 | 4802 |
667 | 4803 return r; |
4804 } | |
4805 #endif | |
4806 | |
7 | 4807 /* |
4808 * Format "line_count" lines, starting at the cursor position. | |
4809 * When "line_count" is negative, format until the end of the paragraph. | |
4810 * Lines after the cursor line are saved for undo, caller must have saved the | |
4811 * first line. | |
4812 */ | |
4813 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4814 format_lines( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4815 linenr_T line_count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4816 int avoid_fex) /* don't use 'formatexpr' */ |
7 | 4817 { |
4818 int max_len; | |
4819 int is_not_par; /* current line not part of parag. */ | |
4820 int next_is_not_par; /* next line not part of paragraph */ | |
4821 int is_end_par; /* at end of paragraph */ | |
4822 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
4823 int next_is_start_par = FALSE; | |
4824 #ifdef FEAT_COMMENTS | |
4825 int leader_len = 0; /* leader len of current line */ | |
4826 int next_leader_len; /* leader len of next line */ | |
4827 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
4828 char_u *next_leader_flags; /* flags for leader of next line */ | |
4829 int do_comments; /* format comments */ | |
3584 | 4830 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
7 | 4831 #endif |
4832 int advance = TRUE; | |
3584 | 4833 int second_indent = -1; /* indent for second line (comment |
4834 * aware) */ | |
7 | 4835 int do_second_indent; |
4836 int do_number_indent; | |
4837 int do_trail_white; | |
4838 int first_par_line = TRUE; | |
4839 int smd_save; | |
4840 long count; | |
4841 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
4842 int force_format = FALSE; | |
4843 int old_State = State; | |
4844 | |
4845 /* length of a line to force formatting: 3 * 'tw' */ | |
4846 max_len = comp_textwidth(TRUE) * 3; | |
4847 | |
4848 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
4849 #ifdef FEAT_COMMENTS | |
4850 do_comments = has_format_option(FO_Q_COMS); | |
4851 #endif | |
4852 do_second_indent = has_format_option(FO_Q_SECOND); | |
4853 do_number_indent = has_format_option(FO_Q_NUMBER); | |
4854 do_trail_white = has_format_option(FO_WHITE_PAR); | |
4855 | |
4856 /* | |
4857 * Get info about the previous and current line. | |
4858 */ | |
4859 if (curwin->w_cursor.lnum > 1) | |
4860 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
4861 #ifdef FEAT_COMMENTS | |
4862 , &leader_len, &leader_flags, do_comments | |
4863 #endif | |
4864 ); | |
4865 else | |
4866 is_not_par = TRUE; | |
4867 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
4868 #ifdef FEAT_COMMENTS | |
4869 , &next_leader_len, &next_leader_flags, do_comments | |
4870 #endif | |
4871 ); | |
4872 is_end_par = (is_not_par || next_is_not_par); | |
4873 if (!is_end_par && do_trail_white) | |
4874 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
4875 | |
4876 curwin->w_cursor.lnum--; | |
4877 for (count = line_count; count != 0 && !got_int; --count) | |
4878 { | |
4879 /* | |
4880 * Advance to next paragraph. | |
4881 */ | |
4882 if (advance) | |
4883 { | |
4884 curwin->w_cursor.lnum++; | |
4885 prev_is_end_par = is_end_par; | |
4886 is_not_par = next_is_not_par; | |
4887 #ifdef FEAT_COMMENTS | |
4888 leader_len = next_leader_len; | |
4889 leader_flags = next_leader_flags; | |
4890 #endif | |
4891 } | |
4892 | |
4893 /* | |
4894 * The last line to be formatted. | |
4895 */ | |
4896 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
4897 { | |
4898 next_is_not_par = TRUE; | |
4899 #ifdef FEAT_COMMENTS | |
4900 next_leader_len = 0; | |
4901 next_leader_flags = NULL; | |
4902 #endif | |
4903 } | |
4904 else | |
4905 { | |
4906 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
4907 #ifdef FEAT_COMMENTS | |
4908 , &next_leader_len, &next_leader_flags, do_comments | |
4909 #endif | |
4910 ); | |
4911 if (do_number_indent) | |
4912 next_is_start_par = | |
4913 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
4914 } | |
4915 advance = TRUE; | |
4916 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
4917 if (!is_end_par && do_trail_white) | |
4918 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
4919 | |
4920 /* | |
4921 * Skip lines that are not in a paragraph. | |
4922 */ | |
4923 if (is_not_par) | |
4924 { | |
4925 if (line_count < 0) | |
4926 break; | |
4927 } | |
4928 else | |
4929 { | |
4930 /* | |
4931 * For the first line of a paragraph, check indent of second line. | |
4932 * Don't do this for comments and empty lines. | |
4933 */ | |
4934 if (first_par_line | |
4935 && (do_second_indent || do_number_indent) | |
4936 && prev_is_end_par | |
3584 | 4937 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
4938 { | |
4939 if (do_second_indent && !lineempty(curwin->w_cursor.lnum + 1)) | |
4940 { | |
4941 #ifdef FEAT_COMMENTS | |
4942 if (leader_len == 0 && next_leader_len == 0) | |
4943 { | |
4944 /* no comment found */ | |
4945 #endif | |
4946 second_indent = | |
4947 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
7 | 4948 #ifdef FEAT_COMMENTS |
3584 | 4949 } |
4950 else | |
4951 { | |
4952 second_indent = next_leader_len; | |
4953 do_comments_list = 1; | |
4954 } | |
4955 #endif | |
4956 } | |
7 | 4957 else if (do_number_indent) |
3584 | 4958 { |
4959 #ifdef FEAT_COMMENTS | |
4960 if (leader_len == 0 && next_leader_len == 0) | |
4961 { | |
4962 /* no comment found */ | |
4963 #endif | |
4964 second_indent = | |
4965 get_number_indent(curwin->w_cursor.lnum); | |
4966 #ifdef FEAT_COMMENTS | |
4967 } | |
4968 else | |
4969 { | |
4970 /* get_number_indent() is now "comment aware"... */ | |
4971 second_indent = | |
4972 get_number_indent(curwin->w_cursor.lnum); | |
4973 do_comments_list = 1; | |
4974 } | |
4975 #endif | |
4976 } | |
7 | 4977 } |
4978 | |
4979 /* | |
4980 * When the comment leader changes, it's the end of the paragraph. | |
4981 */ | |
4982 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
4983 #ifdef FEAT_COMMENTS | |
4984 || !same_leader(curwin->w_cursor.lnum, | |
4985 leader_len, leader_flags, | |
4986 next_leader_len, next_leader_flags) | |
4987 #endif | |
4988 ) | |
4989 is_end_par = TRUE; | |
4990 | |
4991 /* | |
4992 * If we have got to the end of a paragraph, or the line is | |
4993 * getting long, format it. | |
4994 */ | |
4995 if (is_end_par || force_format) | |
4996 { | |
4997 if (need_set_indent) | |
4998 /* replace indent in first line with minimal number of | |
4999 * tabs and spaces, according to current options */ | |
5000 (void)set_indent(get_indent(), SIN_CHANGED); | |
5001 | |
5002 /* put cursor on last non-space */ | |
5003 State = NORMAL; /* don't go past end-of-line */ | |
5004 coladvance((colnr_T)MAXCOL); | |
5005 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
5006 dec_cursor(); | |
5007 | |
5008 /* do the formatting, without 'showmode' */ | |
5009 State = INSERT; /* for open_line() */ | |
5010 smd_save = p_smd; | |
5011 p_smd = FALSE; | |
5012 insertchar(NUL, INSCHAR_FORMAT | |
5013 #ifdef FEAT_COMMENTS | |
5014 + (do_comments ? INSCHAR_DO_COM : 0) | |
3584 | 5015 + (do_comments && do_comments_list |
5016 ? INSCHAR_COM_LIST : 0) | |
7 | 5017 #endif |
1563 | 5018 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
7 | 5019 State = old_State; |
5020 p_smd = smd_save; | |
5021 second_indent = -1; | |
5022 /* at end of par.: need to set indent of next par. */ | |
5023 need_set_indent = is_end_par; | |
5024 if (is_end_par) | |
5025 { | |
5026 /* When called with a negative line count, break at the | |
5027 * end of the paragraph. */ | |
5028 if (line_count < 0) | |
5029 break; | |
5030 first_par_line = TRUE; | |
5031 } | |
5032 force_format = FALSE; | |
5033 } | |
5034 | |
5035 /* | |
5036 * When still in same paragraph, join the lines together. But | |
5403 | 5037 * first delete the leader from the second line. |
7 | 5038 */ |
5039 if (!is_end_par) | |
5040 { | |
5041 advance = FALSE; | |
5042 curwin->w_cursor.lnum++; | |
5043 curwin->w_cursor.col = 0; | |
5044 if (line_count < 0 && u_save_cursor() == FAIL) | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
5045 break; |
7 | 5046 #ifdef FEAT_COMMENTS |
5047 if (next_leader_len > 0) | |
5403 | 5048 { |
5049 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
7 | 5050 mark_col_adjust(curwin->w_cursor.lnum, (colnr_T)0, 0L, |
5051 (long)-next_leader_len); | |
5403 | 5052 } else |
5053 #endif | |
5054 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
5055 { | |
5056 char_u *p = ml_get_curline(); | |
5415 | 5057 int indent = (int)(skipwhite(p) - p); |
5403 | 5058 |
5059 if (indent > 0) | |
5060 { | |
5061 (void)del_bytes(indent, FALSE, FALSE); | |
5062 mark_col_adjust(curwin->w_cursor.lnum, | |
5063 (colnr_T)0, 0L, (long)-indent); | |
5415 | 5064 } |
5403 | 5065 } |
7 | 5066 curwin->w_cursor.lnum--; |
5848 | 5067 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
7 | 5068 { |
5069 beep_flush(); | |
5070 break; | |
5071 } | |
5072 first_par_line = FALSE; | |
5073 /* If the line is getting long, format it next time */ | |
5074 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
5075 force_format = TRUE; | |
5076 else | |
5077 force_format = FALSE; | |
5078 } | |
5079 } | |
5080 line_breakcheck(); | |
5081 } | |
5082 } | |
5083 | |
5084 /* | |
5085 * Return TRUE if line "lnum" ends in a white character. | |
5086 */ | |
5087 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5088 ends_in_white(linenr_T lnum) |
7 | 5089 { |
5090 char_u *s = ml_get(lnum); | |
5091 size_t l; | |
5092 | |
5093 if (*s == NUL) | |
5094 return FALSE; | |
5095 /* Don't use STRLEN() inside vim_iswhite(), SAS/C complains: "macro | |
5096 * invocation may call function multiple times". */ | |
5097 l = STRLEN(s) - 1; | |
5098 return vim_iswhite(s[l]); | |
5099 } | |
5100 | |
5101 /* | |
5102 * Blank lines, and lines containing only the comment leader, are left | |
5103 * untouched by the formatting. The function returns TRUE in this | |
5104 * case. It also returns TRUE when a line starts with the end of a comment | |
5105 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
5106 * previous line. A new paragraph starts after a blank line, or when the | |
5107 * comment leader changes -- webb. | |
5108 */ | |
5109 #ifdef FEAT_COMMENTS | |
5110 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5111 fmt_check_par( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5112 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5113 int *leader_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5114 char_u **leader_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5115 int do_comments) |
7 | 5116 { |
5117 char_u *flags = NULL; /* init for GCC */ | |
5118 char_u *ptr; | |
5119 | |
5120 ptr = ml_get(lnum); | |
5121 if (do_comments) | |
3562 | 5122 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
7 | 5123 else |
5124 *leader_len = 0; | |
5125 | |
5126 if (*leader_len > 0) | |
5127 { | |
5128 /* | |
5129 * Search for 'e' flag in comment leader flags. | |
5130 */ | |
5131 flags = *leader_flags; | |
5132 while (*flags && *flags != ':' && *flags != COM_END) | |
5133 ++flags; | |
5134 } | |
5135 | |
5136 return (*skipwhite(ptr + *leader_len) == NUL | |
5137 || (*leader_len > 0 && *flags == COM_END) | |
5138 || startPS(lnum, NUL, FALSE)); | |
5139 } | |
5140 #else | |
5141 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5142 fmt_check_par(linenr_T lnum) |
7 | 5143 { |
5144 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
5145 } | |
5146 #endif | |
5147 | |
5148 /* | |
5149 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
5150 * previous line is in the same paragraph. Used for auto-formatting. | |
5151 */ | |
5152 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5153 paragraph_start(linenr_T lnum) |
7 | 5154 { |
5155 char_u *p; | |
5156 #ifdef FEAT_COMMENTS | |
5157 int leader_len = 0; /* leader len of current line */ | |
5158 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
5159 int next_leader_len; /* leader len of next line */ | |
5160 char_u *next_leader_flags; /* flags for leader of next line */ | |
5161 int do_comments; /* format comments */ | |
5162 #endif | |
5163 | |
5164 if (lnum <= 1) | |
5165 return TRUE; /* start of the file */ | |
5166 | |
5167 p = ml_get(lnum - 1); | |
5168 if (*p == NUL) | |
5169 return TRUE; /* after empty line */ | |
5170 | |
5171 #ifdef FEAT_COMMENTS | |
5172 do_comments = has_format_option(FO_Q_COMS); | |
5173 #endif | |
5174 if (fmt_check_par(lnum - 1 | |
5175 #ifdef FEAT_COMMENTS | |
5176 , &leader_len, &leader_flags, do_comments | |
5177 #endif | |
5178 )) | |
5179 return TRUE; /* after non-paragraph line */ | |
5180 | |
5181 if (fmt_check_par(lnum | |
5182 #ifdef FEAT_COMMENTS | |
5183 , &next_leader_len, &next_leader_flags, do_comments | |
5184 #endif | |
5185 )) | |
5186 return TRUE; /* "lnum" is not a paragraph line */ | |
5187 | |
5188 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
5189 return TRUE; /* missing trailing space in previous line. */ | |
5190 | |
5191 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
5192 return TRUE; /* numbered item starts in "lnum". */ | |
5193 | |
5194 #ifdef FEAT_COMMENTS | |
5195 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
5196 next_leader_len, next_leader_flags)) | |
5197 return TRUE; /* change of comment leader. */ | |
5198 #endif | |
5199 | |
5200 return FALSE; | |
5201 } | |
5202 | |
5203 /* | |
5204 * prepare a few things for block mode yank/delete/tilde | |
5205 * | |
5206 * for delete: | |
5207 * - textlen includes the first/last char to be (partly) deleted | |
5208 * - start/endspaces is the number of columns that are taken by the | |
5209 * first/last deleted char minus the number of columns that have to be | |
1839 | 5210 * deleted. |
5211 * for yank and tilde: | |
7 | 5212 * - textlen includes the first/last char to be wholly yanked |
5213 * - start/endspaces is the number of columns of the first/last yanked char | |
5214 * that are to be yanked. | |
5215 */ | |
5216 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5217 block_prep( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5218 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5219 struct block_def *bdp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5220 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5221 int is_del) |
7 | 5222 { |
5223 int incr = 0; | |
5224 char_u *pend; | |
5225 char_u *pstart; | |
5226 char_u *line; | |
5227 char_u *prev_pstart; | |
5228 char_u *prev_pend; | |
5229 | |
5230 bdp->startspaces = 0; | |
5231 bdp->endspaces = 0; | |
5232 bdp->textlen = 0; | |
5233 bdp->start_vcol = 0; | |
5234 bdp->end_vcol = 0; | |
5235 #ifdef FEAT_VISUALEXTRA | |
5236 bdp->is_short = FALSE; | |
5237 bdp->is_oneChar = FALSE; | |
5238 bdp->pre_whitesp = 0; | |
5239 bdp->pre_whitesp_c = 0; | |
5240 bdp->end_char_vcols = 0; | |
5241 #endif | |
5242 bdp->start_char_vcols = 0; | |
5243 | |
5244 line = ml_get(lnum); | |
5245 pstart = line; | |
5246 prev_pstart = line; | |
5247 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
5248 { | |
5249 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 5250 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
7 | 5251 bdp->start_vcol += incr; |
5252 #ifdef FEAT_VISUALEXTRA | |
5253 if (vim_iswhite(*pstart)) | |
5254 { | |
5255 bdp->pre_whitesp += incr; | |
5256 bdp->pre_whitesp_c++; | |
5257 } | |
5258 else | |
5259 { | |
5260 bdp->pre_whitesp = 0; | |
5261 bdp->pre_whitesp_c = 0; | |
5262 } | |
5263 #endif | |
5264 prev_pstart = pstart; | |
39 | 5265 mb_ptr_adv(pstart); |
7 | 5266 } |
5267 bdp->start_char_vcols = incr; | |
5268 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
5269 { | |
5270 bdp->end_vcol = bdp->start_vcol; | |
5271 #ifdef FEAT_VISUALEXTRA | |
5272 bdp->is_short = TRUE; | |
5273 #endif | |
5274 if (!is_del || oap->op_type == OP_APPEND) | |
5275 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
5276 } | |
5277 else | |
5278 { | |
5279 /* notice: this converts partly selected Multibyte characters to | |
5280 * spaces, too. */ | |
5281 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
5282 if (is_del && bdp->startspaces) | |
5283 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
5284 pend = pstart; | |
5285 bdp->end_vcol = bdp->start_vcol; | |
5286 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
5287 { | |
5288 #ifdef FEAT_VISUALEXTRA | |
5289 bdp->is_oneChar = TRUE; | |
5290 #endif | |
5291 if (oap->op_type == OP_INSERT) | |
5292 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5293 else if (oap->op_type == OP_APPEND) | |
5294 { | |
5295 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
5296 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5297 } | |
5298 else | |
5299 { | |
5300 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
5301 if (is_del && oap->op_type != OP_LSHIFT) | |
5302 { | |
5303 /* just putting the sum of those two into | |
5304 * bdp->startspaces doesn't work for Visual replace, | |
5305 * so we have to split the tab in two */ | |
5306 bdp->startspaces = bdp->start_char_vcols | |
5307 - (bdp->start_vcol - oap->start_vcol); | |
5308 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5309 } | |
5310 } | |
5311 } | |
5312 else | |
5313 { | |
5314 prev_pend = pend; | |
5315 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
5316 { | |
5317 /* Count a tab for what it's worth (if list mode not on) */ | |
5318 prev_pend = pend; | |
6535 | 5319 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
7 | 5320 bdp->end_vcol += incr; |
5321 } | |
5322 if (bdp->end_vcol <= oap->end_vcol | |
5323 && (!is_del | |
5324 || oap->op_type == OP_APPEND | |
5325 || oap->op_type == OP_REPLACE)) /* line too short */ | |
5326 { | |
5327 #ifdef FEAT_VISUALEXTRA | |
5328 bdp->is_short = TRUE; | |
5329 #endif | |
5330 /* Alternative: include spaces to fill up the block. | |
5331 * Disadvantage: can lead to trailing spaces when the line is | |
5332 * short where the text is put */ | |
5333 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
5334 if (oap->op_type == OP_APPEND || virtual_op) | |
5335 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
593 | 5336 + oap->inclusive; |
7 | 5337 else |
5338 bdp->endspaces = 0; /* replace doesn't add characters */ | |
5339 } | |
5340 else if (bdp->end_vcol > oap->end_vcol) | |
5341 { | |
5342 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5343 if (!is_del && bdp->endspaces) | |
5344 { | |
5345 bdp->endspaces = incr - bdp->endspaces; | |
5346 if (pend != pstart) | |
5347 pend = prev_pend; | |
5348 } | |
5349 } | |
5350 } | |
5351 #ifdef FEAT_VISUALEXTRA | |
5352 bdp->end_char_vcols = incr; | |
5353 #endif | |
5354 if (is_del && bdp->startspaces) | |
5355 pstart = prev_pstart; | |
5356 bdp->textlen = (int)(pend - pstart); | |
5357 } | |
5358 bdp->textcol = (colnr_T) (pstart - line); | |
5359 bdp->textstart = pstart; | |
5360 } | |
5361 | |
5362 /* | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5363 * Handle the add/subtract operator. |
7 | 5364 */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5365 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5366 op_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5367 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5368 linenr_T Prenum1, /* Amount of add/subtract */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5369 int g_cmd) /* was g<c-a>/g<c-x> */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5370 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5371 pos_T pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5372 struct block_def bd; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5373 int change_cnt = 0; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5374 linenr_T amount = Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5375 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5376 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5377 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5378 pos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5379 if (u_save_cursor() == FAIL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5380 return; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5381 change_cnt = do_addsub(oap->op_type, &pos, 0, amount); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5382 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5383 changed_lines(pos.lnum, 0, pos.lnum + 1, 0L); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5384 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5385 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5386 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5387 int one_change; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5388 int length; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5389 pos_T startpos; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5390 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5391 if (u_save((linenr_T)(oap->start.lnum - 1), |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5392 (linenr_T)(oap->end.lnum + 1)) == FAIL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5393 return; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5394 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5395 pos = oap->start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5396 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5397 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5398 if (oap->block_mode) /* Visual block mode */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5399 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5400 block_prep(oap, &bd, pos.lnum, FALSE); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5401 pos.col = bd.textcol; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5402 length = bd.textlen; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5403 } |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5404 else if (oap->motion_type == MLINE) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5405 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5406 curwin->w_cursor.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5407 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5408 length = (colnr_T)STRLEN(ml_get(pos.lnum)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5409 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5410 else /* oap->motion_type == MCHAR */ |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5411 { |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5412 if (!oap->inclusive) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5413 dec(&(oap->end)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5414 length = (colnr_T)STRLEN(ml_get(pos.lnum)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5415 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5416 if (pos.lnum == oap->start.lnum) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5417 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5418 pos.col += oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5419 length -= oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5420 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5421 if (pos.lnum == oap->end.lnum) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5422 { |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5423 length = (int)STRLEN(ml_get(oap->end.lnum)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5424 if (oap->end.col >= length) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5425 oap->end.col = length - 1; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5426 length = oap->end.col - pos.col + 1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5427 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5428 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5429 one_change = do_addsub(oap->op_type, &pos, length, amount); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5430 if (one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5431 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5432 /* Remember the start position of the first change. */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5433 if (change_cnt == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5434 startpos = curbuf->b_op_start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5435 ++change_cnt; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5436 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5437 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5438 #ifdef FEAT_NETBEANS_INTG |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5439 if (netbeans_active() && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5440 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5441 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5442 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5443 netbeans_removed(curbuf, pos.lnum, pos.col, (long)length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5444 netbeans_inserted(curbuf, pos.lnum, pos.col, |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5445 &ptr[pos.col], length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5446 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5447 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5448 if (g_cmd && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5449 amount += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5450 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5451 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5452 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5453 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5454 if (!change_cnt && oap->is_VIsual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5455 /* No change: need to remove the Visual selection */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5456 redraw_curbuf_later(INVERTED); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5457 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5458 /* Set '[ mark if something changed. Keep the last end |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5459 * position from do_addsub(). */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5460 if (change_cnt > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5461 curbuf->b_op_start = startpos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5462 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5463 if (change_cnt > p_report) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5464 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5465 if (change_cnt == 1) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5466 MSG(_("1 line changed")); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5467 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5468 smsg((char_u *)_("%ld lines changed"), change_cnt); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5469 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5470 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5471 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5472 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5473 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5474 * Add or subtract 'Prenum1' from a number in a line |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5475 * op_type is OP_NR_ADD or OP_NR_SUB |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5476 * |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5477 * Returns TRUE if some character was changed. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5478 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5479 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5480 do_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5481 int op_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5482 pos_T *pos, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5483 int length, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5484 linenr_T Prenum1) |
7 | 5485 { |
5486 int col; | |
5487 char_u *buf1; | |
5488 char_u buf2[NUMBUFLEN]; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5489 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
7 | 5490 static int hexupper = FALSE; /* 0xABC */ |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5491 uvarnumber_T n; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5492 uvarnumber_T oldn; |
7 | 5493 char_u *ptr; |
5494 int c; | |
5495 int todel; | |
5496 int dohex; | |
5497 int dooct; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5498 int dobin; |
7 | 5499 int doalp; |
5500 int firstdigit; | |
5501 int subtract; | |
6868 | 5502 int negative = FALSE; |
6891 | 5503 int was_positive = TRUE; |
6868 | 5504 int visual = VIsual_active; |
6921 | 5505 int did_change = FALSE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5506 pos_T save_cursor = curwin->w_cursor; |
6927 | 5507 int maxlen = 0; |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5508 pos_T startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5509 pos_T endpos; |
7 | 5510 |
5511 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
5512 dooct = (vim_strchr(curbuf->b_p_nf, 'o') != NULL); /* "Octal" */ | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5513 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
7 | 5514 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
5515 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5516 curwin->w_cursor = *pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5517 ptr = ml_get(pos->lnum); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5518 col = pos->col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5519 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5520 if (*ptr == NUL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5521 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5522 |
7 | 5523 /* |
5524 * First check if we are on a hexadecimal number, after the "0x". | |
5525 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5526 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5527 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5528 if (dobin) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5529 while (col > 0 && vim_isbdigit(ptr[col])) |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5530 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5531 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5532 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5533 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5534 col -= (*mb_head_off)(ptr, ptr + col); |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5535 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5536 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5537 |
6868 | 5538 if (dohex) |
5539 while (col > 0 && vim_isxdigit(ptr[col])) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5540 { |
6868 | 5541 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5542 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5543 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5544 col -= (*mb_head_off)(ptr, ptr + col); |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5545 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5546 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5547 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5548 if ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5549 && dohex |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5550 && ! ((col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5551 && (ptr[col] == 'X' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5552 || ptr[col] == 'x') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5553 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5554 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5555 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5556 !(*mb_head_off)(ptr, ptr + col - 1)) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5557 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5558 && vim_isxdigit(ptr[col + 1])))) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5559 { |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5560 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5561 /* In case of binary/hexadecimal pattern overlap match, rescan */ |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5562 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5563 col = pos->col; |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5564 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5565 while (col > 0 && vim_isdigit(ptr[col])) |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5566 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5567 col--; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5568 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5569 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5570 col -= (*mb_head_off)(ptr, ptr + col); |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5571 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5572 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5573 } |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5574 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5575 if (( dohex |
6868 | 5576 && col > 0 |
5577 && (ptr[col] == 'X' | |
5578 || ptr[col] == 'x') | |
5579 && ptr[col - 1] == '0' | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5580 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5581 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5582 !(*mb_head_off)(ptr, ptr + col - 1)) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5583 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5584 && vim_isxdigit(ptr[col + 1])) || |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5585 ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5586 && col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5587 && (ptr[col] == 'B' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5588 || ptr[col] == 'b') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5589 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5590 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5591 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5592 !(*mb_head_off)(ptr, ptr + col - 1)) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5593 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5594 && vim_isbdigit(ptr[col + 1]))) |
6868 | 5595 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5596 /* Found hexadecimal or binary number, move to its start. */ |
7 | 5597 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5598 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5599 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5600 col -= (*mb_head_off)(ptr, ptr + col); |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5601 #endif |
6868 | 5602 } |
5603 else | |
7 | 5604 { |
6868 | 5605 /* |
5606 * Search forward and then backward to find the start of number. | |
5607 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5608 col = pos->col; |
6868 | 5609 |
5610 while (ptr[col] != NUL | |
5611 && !vim_isdigit(ptr[col]) | |
5612 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5613 col += MB_PTR2LEN(ptr + col); |
6868 | 5614 |
5615 while (col > 0 | |
5616 && vim_isdigit(ptr[col - 1]) | |
5617 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5618 { |
6868 | 5619 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5620 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5621 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5622 col -= (*mb_head_off)(ptr, ptr + col); |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5623 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5624 } |
6868 | 5625 } |
5626 } | |
5627 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5628 if (visual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5629 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5630 while (ptr[col] != NUL && length > 0 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5631 && !vim_isdigit(ptr[col]) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5632 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5633 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5634 int mb_len = MB_PTR2LEN(ptr + col); |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5635 |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5636 col += mb_len; |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5637 length -= mb_len; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5638 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5639 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5640 if (length == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5641 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5642 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5643 if (col > pos->col && ptr[col - 1] == '-' |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5644 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5645 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5646 !(*mb_head_off)(ptr, ptr + col - 1)) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5647 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5648 ) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5649 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5650 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5651 was_positive = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5652 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5653 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5654 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5655 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5656 * If a number was found, and saving for undo works, replace the number. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5657 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5658 firstdigit = ptr[col]; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5659 if (!VIM_ISDIGIT(firstdigit) && !(doalp && ASCII_ISALPHA(firstdigit))) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5660 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5661 beep_flush(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5662 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5663 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5664 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5665 if (doalp && ASCII_ISALPHA(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5666 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5667 /* decrement or increment alphabetic character */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5668 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5669 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5670 if (CharOrd(firstdigit) < Prenum1) |
6927 | 5671 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5672 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5673 firstdigit = 'A'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5674 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5675 firstdigit = 'a'; |
6927 | 5676 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5677 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5678 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5679 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5680 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5681 firstdigit -= Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5682 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5683 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5684 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5685 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5686 if (26 - CharOrd(firstdigit) - 1 < Prenum1) |
6927 | 5687 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5688 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5689 firstdigit = 'Z'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5690 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5691 firstdigit = 'z'; |
6927 | 5692 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5693 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5694 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5695 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5696 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5697 firstdigit += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5698 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5699 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5700 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5701 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5702 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5703 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5704 (void)del_char(FALSE); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5705 ins_char(firstdigit); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5706 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5707 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5708 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5709 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5710 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5711 if (col > 0 && ptr[col - 1] == '-' |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5712 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5713 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5714 !(*mb_head_off)(ptr, ptr + col - 1)) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5715 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5716 && !visual) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5717 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5718 /* negative number */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5719 --col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5720 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5721 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5722 /* get the number value (unsigned) */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5723 if (visual && VIsual_mode != 'V') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5724 maxlen = (curbuf->b_visual.vi_curswant == MAXCOL |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5725 ? (int)STRLEN(ptr) - col |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5726 : length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5727 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5728 vim_str2nr(ptr + col, &pre, &length, |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5729 0 + (dobin ? STR2NR_BIN : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5730 + (dooct ? STR2NR_OCT : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5731 + (dohex ? STR2NR_HEX : 0), |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5732 NULL, &n, maxlen); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5733 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5734 /* ignore leading '-' for hex and octal and bin numbers */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5735 if (pre && negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5736 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5737 ++col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5738 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5739 negative = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5740 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5741 /* add or subtract */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5742 subtract = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5743 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5744 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5745 if (negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5746 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5747 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5748 oldn = n; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5749 if (subtract) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5750 n -= (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5751 else |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5752 n += (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5753 /* handle wraparound for decimal numbers */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5754 if (!pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5755 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5756 if (subtract) |
6927 | 5757 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5758 if (n > oldn) |
6868 | 5759 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5760 n = 1 + (n ^ (uvarnumber_T)-1); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5761 negative ^= TRUE; |
6868 | 5762 } |
7 | 5763 } |
5764 else | |
6868 | 5765 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5766 /* add */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5767 if (n < oldn) |
6868 | 5768 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5769 n = (n ^ (uvarnumber_T)-1); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5770 negative ^= TRUE; |
6868 | 5771 } |
6927 | 5772 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5773 if (n == 0) |
6868 | 5774 negative = FALSE; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5775 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5776 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5777 if (visual && !was_positive && !negative && col > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5778 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5779 /* need to remove the '-' */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5780 col--; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5781 length++; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5782 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5783 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5784 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5785 * Delete the old number. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5786 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5787 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5788 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5789 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5790 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5791 todel = length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5792 c = gchar_cursor(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5793 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5794 * Don't include the '-' in the length, only the length of the |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5795 * part after it is kept the same. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5796 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5797 if (c == '-') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5798 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5799 while (todel-- > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5800 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5801 if (c < 0x100 && isalpha(c)) |
6868 | 5802 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5803 if (isupper(c)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5804 hexupper = TRUE; |
6868 | 5805 else |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5806 hexupper = FALSE; |
6891 | 5807 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5808 /* del_char() will mark line needing displaying */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5809 (void)del_char(FALSE); |
6868 | 5810 c = gchar_cursor(); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5811 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5812 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5813 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5814 * Prepare the leading characters in buf1[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5815 * When there are many leading zeros it could be very long. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5816 * Allocate a bit too much. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5817 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5818 buf1 = alloc((unsigned)length + NUMBUFLEN); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5819 if (buf1 == NULL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5820 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5821 ptr = buf1; |
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
5822 if (negative && (!visual || was_positive)) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5823 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5824 *ptr++ = '-'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5825 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5826 if (pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5827 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5828 *ptr++ = '0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5829 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5830 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5831 if (pre == 'b' || pre == 'B' || |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5832 pre == 'x' || pre == 'X') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5833 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5834 *ptr++ = pre; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5835 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5836 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5837 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5838 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5839 * Put the number characters in buf2[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5840 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5841 if (pre == 'b' || pre == 'B') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5842 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5843 int i; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5844 int bit = 0; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5845 int bits = sizeof(uvarnumber_T) * 8; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5846 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5847 /* leading zeros */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5848 for (bit = bits; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5849 if ((n >> (bit - 1)) & 0x1) break; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5850 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5851 for (i = 0; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5852 buf2[i++] = ((n >> (bit - 1)) & 0x1) ? '1' : '0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5853 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5854 buf2[i] = '\0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5855 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5856 else if (pre == 0) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5857 vim_snprintf((char *)buf2, NUMBUFLEN, "%llu", n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5858 else if (pre == '0') |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5859 vim_snprintf((char *)buf2, NUMBUFLEN, "%llo", n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5860 else if (pre && hexupper) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5861 vim_snprintf((char *)buf2, NUMBUFLEN, "%llX", n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5862 else |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5863 vim_snprintf((char *)buf2, NUMBUFLEN, "%llx", n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5864 length -= (int)STRLEN(buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5865 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5866 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5867 * Adjust number of zeros to the new number of digits, so the |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5868 * total length of the number remains the same. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5869 * Don't do this when |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5870 * the result may look like an octal number. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5871 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5872 if (firstdigit == '0' && !(dooct && pre == 0)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5873 while (length-- > 0) |
6868 | 5874 *ptr++ = '0'; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5875 *ptr = NUL; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5876 STRCAT(buf1, buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5877 ins_str(buf1); /* insert the new number */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5878 vim_free(buf1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5879 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5880 if (did_change && curwin->w_cursor.col) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5881 --curwin->w_cursor.col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5882 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5883 |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5884 if (did_change) |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5885 { |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5886 /* set the '[ and '] marks */ |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5887 curbuf->b_op_start = startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5888 curbuf->b_op_end = endpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5889 if (curbuf->b_op_end.col > 0) |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5890 --curbuf->b_op_end.col; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5891 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5892 |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5893 theend: |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5894 if (visual) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5895 curwin->w_cursor = save_cursor; |
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5896 else if (did_change) |
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5897 curwin->w_set_curswant = TRUE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5898 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5899 return did_change; |
7 | 5900 } |
5901 | |
5902 #ifdef FEAT_VIMINFO | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5903 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5904 static yankreg_T *y_read_regs = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5905 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5906 #define REG_PREVIOUS 1 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5907 #define REG_EXEC 2 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5908 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5909 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5910 * Prepare for reading viminfo registers when writing viminfo later. |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5911 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5912 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5913 prepare_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5914 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5915 y_read_regs = (yankreg_T *)alloc_clear(NUM_REGISTERS |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5916 * (int)sizeof(yankreg_T)); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5917 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5918 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5919 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5920 finish_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5921 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5922 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5923 int j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5924 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5925 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5926 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5927 for (i = 0; i < NUM_REGISTERS; ++i) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5928 if (y_read_regs[i].y_array != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5929 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5930 for (j = 0; j < y_read_regs[i].y_size; j++) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5931 vim_free(y_read_regs[i].y_array[j]); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5932 vim_free(y_read_regs[i].y_array); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5933 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5934 vim_free(y_read_regs); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5935 y_read_regs = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5936 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5937 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5938 |
7 | 5939 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5940 read_viminfo_register(vir_T *virp, int force) |
7 | 5941 { |
5942 int eof; | |
5943 int do_it = TRUE; | |
5944 int size; | |
5945 int limit; | |
5946 int i; | |
5947 int set_prev = FALSE; | |
5948 char_u *str; | |
5949 char_u **array = NULL; | |
6508 | 5950 int new_type = MCHAR; /* init to shut up compiler */ |
5951 colnr_T new_width = 0; /* init to shut up compiler */ | |
7 | 5952 |
5953 /* We only get here (hopefully) if line[0] == '"' */ | |
5954 str = virp->vir_line + 1; | |
1893 | 5955 |
5956 /* If the line starts with "" this is the y_previous register. */ | |
7 | 5957 if (*str == '"') |
5958 { | |
5959 set_prev = TRUE; | |
5960 str++; | |
5961 } | |
1893 | 5962 |
7 | 5963 if (!ASCII_ISALNUM(*str) && *str != '-') |
5964 { | |
5965 if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line)) | |
5966 return TRUE; /* too many errors, pretend end-of-file */ | |
5967 do_it = FALSE; | |
5968 } | |
5969 get_yank_register(*str++, FALSE); | |
5970 if (!force && y_current->y_array != NULL) | |
5971 do_it = FALSE; | |
1893 | 5972 |
5973 if (*str == '@') | |
5974 { | |
5975 /* "x@: register x used for @@ */ | |
5976 if (force || execreg_lastc == NUL) | |
5977 execreg_lastc = str[-1]; | |
5978 } | |
5979 | |
7 | 5980 size = 0; |
5981 limit = 100; /* Optimized for registers containing <= 100 lines */ | |
5982 if (do_it) | |
5983 { | |
6462 | 5984 /* |
5985 * Build the new register in array[]. | |
5986 * y_array is kept as-is until done. | |
5987 * The "do_it" flag is reset when something is wrong, in which case | |
5988 * array[] needs to be freed. | |
5989 */ | |
7 | 5990 if (set_prev) |
5991 y_previous = y_current; | |
6462 | 5992 array = (char_u **)alloc((unsigned)(limit * sizeof(char_u *))); |
1893 | 5993 str = skipwhite(skiptowhite(str)); |
7 | 5994 if (STRNCMP(str, "CHAR", 4) == 0) |
6462 | 5995 new_type = MCHAR; |
7 | 5996 else if (STRNCMP(str, "BLOCK", 5) == 0) |
6462 | 5997 new_type = MBLOCK; |
7 | 5998 else |
6462 | 5999 new_type = MLINE; |
7 | 6000 /* get the block width; if it's missing we get a zero, which is OK */ |
6001 str = skipwhite(skiptowhite(str)); | |
6462 | 6002 new_width = getdigits(&str); |
7 | 6003 } |
6004 | |
6005 while (!(eof = viminfo_readline(virp)) | |
6006 && (virp->vir_line[0] == TAB || virp->vir_line[0] == '<')) | |
6007 { | |
6008 if (do_it) | |
6009 { | |
6462 | 6010 if (size == limit) |
7 | 6011 { |
6462 | 6012 char_u **new_array = (char_u **) |
7 | 6013 alloc((unsigned)(limit * 2 * sizeof(char_u *))); |
6462 | 6014 |
6015 if (new_array == NULL) | |
6016 { | |
6017 do_it = FALSE; | |
6018 break; | |
6019 } | |
7 | 6020 for (i = 0; i < limit; i++) |
6462 | 6021 new_array[i] = array[i]; |
7 | 6022 vim_free(array); |
6462 | 6023 array = new_array; |
7 | 6024 limit *= 2; |
6025 } | |
6026 str = viminfo_readstring(virp, 1, TRUE); | |
6027 if (str != NULL) | |
6028 array[size++] = str; | |
6029 else | |
6462 | 6030 /* error, don't store the result */ |
7 | 6031 do_it = FALSE; |
6032 } | |
6033 } | |
6508 | 6034 |
7 | 6035 if (do_it) |
6036 { | |
6462 | 6037 /* free y_array[] */ |
6038 for (i = 0; i < y_current->y_size; i++) | |
6039 vim_free(y_current->y_array[i]); | |
6040 vim_free(y_current->y_array); | |
6041 | |
6042 y_current->y_type = new_type; | |
6043 y_current->y_width = new_width; | |
6044 y_current->y_size = size; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6045 y_current->y_time_set = 0; |
7 | 6046 if (size == 0) |
6047 { | |
6048 y_current->y_array = NULL; | |
6049 } | |
6462 | 6050 else |
7 | 6051 { |
6462 | 6052 /* Move the lines from array[] to y_array[]. */ |
7 | 6053 y_current->y_array = |
6054 (char_u **)alloc((unsigned)(size * sizeof(char_u *))); | |
6055 for (i = 0; i < size; i++) | |
6462 | 6056 { |
6057 if (y_current->y_array == NULL) | |
6058 vim_free(array[i]); | |
6059 else | |
6060 y_current->y_array[i] = array[i]; | |
6061 } | |
7 | 6062 } |
6462 | 6063 } |
6064 else | |
6065 { | |
6066 /* Free array[] if it was filled. */ | |
6067 for (i = 0; i < size; i++) | |
6068 vim_free(array[i]); | |
6069 } | |
6070 vim_free(array); | |
6071 | |
7 | 6072 return eof; |
6073 } | |
6074 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6075 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6076 * Accept a new style register line from the viminfo, store it when it's new. |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6077 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6078 void |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6079 handle_viminfo_register(garray_T *values, int force) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6080 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6081 bval_T *vp = (bval_T *)values->ga_data; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6082 int flags; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6083 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6084 int type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6085 int linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6086 int width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6087 time_t timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6088 yankreg_T *y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6089 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6090 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6091 /* Check the format: |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6092 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6093 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6094 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6095 if (values->ga_len < 6 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6096 || vp[0].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6097 || vp[1].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6098 || vp[2].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6099 || vp[3].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6100 || vp[4].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6101 || vp[5].bv_type != BVAL_NR) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6102 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6103 flags = vp[0].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6104 name = vp[1].bv_nr; |
9307
eb52a2670c96
commit https://github.com/vim/vim/commit/67e3720a9ddd8a9d2e8344358c28fa1f4196db0d
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
6105 if (name < 0 || name >= NUM_REGISTERS) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6106 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6107 type = vp[2].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6108 if (type != MCHAR && type != MLINE && type != MBLOCK) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6109 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6110 linecount = vp[3].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6111 if (values->ga_len < 6 + linecount) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6112 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6113 width = vp[4].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6114 if (width < 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6115 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6116 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6117 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6118 /* Reading viminfo for merging and writing. Store the register |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6119 * content, don't update the current registers. */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6120 y_ptr = &y_read_regs[name]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6121 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6122 y_ptr = &y_regs[name]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6123 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6124 /* Do not overwrite unless forced or the timestamp is newer. */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6125 timestamp = (time_t)vp[5].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6126 if (y_ptr->y_array != NULL && !force |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6127 && (timestamp == 0 || y_ptr->y_time_set > timestamp)) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6128 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6129 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6130 if (y_ptr->y_array != NULL) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6131 for (i = 0; i < y_ptr->y_size; i++) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6132 vim_free(y_ptr->y_array[i]); |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6133 vim_free(y_ptr->y_array); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6134 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6135 if (y_read_regs == NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6136 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6137 if (flags & REG_PREVIOUS) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6138 y_previous = y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6139 if ((flags & REG_EXEC) && (force || execreg_lastc == NUL)) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6140 execreg_lastc = get_register_name(name); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6141 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6142 y_ptr->y_type = type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6143 y_ptr->y_width = width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6144 y_ptr->y_size = linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6145 y_ptr->y_time_set = timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6146 if (linecount == 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6147 y_ptr->y_array = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6148 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6149 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6150 y_ptr->y_array = |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6151 (char_u **)alloc((unsigned)(linecount * sizeof(char_u *))); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6152 for (i = 0; i < linecount; i++) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6153 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6154 if (vp[i + 6].bv_allocated) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6155 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6156 y_ptr->y_array[i] = vp[i + 6].bv_string; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6157 vp[i + 6].bv_string = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6158 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6159 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6160 y_ptr->y_array[i] = vim_strsave(vp[i + 6].bv_string); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6161 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6162 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6163 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6164 |
7 | 6165 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6166 write_viminfo_registers(FILE *fp) |
7 | 6167 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6168 int i, j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6169 char_u *type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6170 char_u c; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6171 int num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6172 int max_num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6173 int max_kbyte; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6174 long len; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6175 yankreg_T *y_ptr; |
7 | 6176 |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
6177 fputs(_("\n# Registers:\n"), fp); |
7 | 6178 |
6179 /* Get '<' value, use old '"' value if '<' is not found. */ | |
6180 max_num_lines = get_viminfo_parameter('<'); | |
6181 if (max_num_lines < 0) | |
6182 max_num_lines = get_viminfo_parameter('"'); | |
6183 if (max_num_lines == 0) | |
6184 return; | |
6185 max_kbyte = get_viminfo_parameter('s'); | |
6186 if (max_kbyte == 0) | |
6187 return; | |
1893 | 6188 |
7 | 6189 for (i = 0; i < NUM_REGISTERS; i++) |
6190 { | |
6191 #ifdef FEAT_CLIPBOARD | |
6192 /* Skip '*'/'+' register, we don't want them back next time */ | |
6193 if (i == STAR_REGISTER || i == PLUS_REGISTER) | |
6194 continue; | |
6195 #endif | |
6196 #ifdef FEAT_DND | |
6197 /* Neither do we want the '~' register */ | |
6198 if (i == TILDE_REGISTER) | |
6199 continue; | |
6200 #endif | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6201 /* When reading viminfo for merging and writing: Use the register from |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6202 * viminfo if it's newer. */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6203 if (y_read_regs != NULL |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6204 && y_read_regs[i].y_array != NULL |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6205 && (y_regs[i].y_array == NULL || |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6206 y_read_regs[i].y_time_set > y_regs[i].y_time_set)) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6207 y_ptr = &y_read_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6208 else if (y_regs[i].y_array == NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6209 continue; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6210 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6211 y_ptr = &y_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6212 |
55 | 6213 /* Skip empty registers. */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6214 num_lines = y_ptr->y_size; |
55 | 6215 if (num_lines == 0 |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6216 || (num_lines == 1 && y_ptr->y_type == MCHAR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6217 && *y_ptr->y_array[0] == NUL)) |
55 | 6218 continue; |
6219 | |
7 | 6220 if (max_kbyte > 0) |
6221 { | |
6222 /* Skip register if there is more text than the maximum size. */ | |
6223 len = 0; | |
6224 for (j = 0; j < num_lines; j++) | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6225 len += (long)STRLEN(y_ptr->y_array[j]) + 1L; |
7 | 6226 if (len > (long)max_kbyte * 1024L) |
6227 continue; | |
6228 } | |
6229 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6230 switch (y_ptr->y_type) |
7 | 6231 { |
6232 case MLINE: | |
6233 type = (char_u *)"LINE"; | |
6234 break; | |
6235 case MCHAR: | |
6236 type = (char_u *)"CHAR"; | |
6237 break; | |
6238 case MBLOCK: | |
6239 type = (char_u *)"BLOCK"; | |
6240 break; | |
6241 default: | |
6242 sprintf((char *)IObuff, _("E574: Unknown register type %d"), | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6243 y_ptr->y_type); |
7 | 6244 emsg(IObuff); |
6245 type = (char_u *)"LINE"; | |
6246 break; | |
6247 } | |
6248 if (y_previous == &y_regs[i]) | |
6249 fprintf(fp, "\""); | |
6250 c = get_register_name(i); | |
1893 | 6251 fprintf(fp, "\"%c", c); |
6252 if (c == execreg_lastc) | |
6253 fprintf(fp, "@"); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6254 fprintf(fp, "\t%s\t%d\n", type, (int)y_ptr->y_width); |
7 | 6255 |
6256 /* If max_num_lines < 0, then we save ALL the lines in the register */ | |
6257 if (max_num_lines > 0 && num_lines > max_num_lines) | |
6258 num_lines = max_num_lines; | |
6259 for (j = 0; j < num_lines; j++) | |
6260 { | |
6261 putc('\t', fp); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6262 viminfo_writestring(fp, y_ptr->y_array[j]); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6263 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6264 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6265 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6266 int flags = 0; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6267 int remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6268 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6269 /* New style with a bar line. Format: |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6270 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6271 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6272 * flags: REG_PREVIOUS - register is y_previous |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6273 * REG_EXEC - used for @@ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6274 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6275 if (y_previous == &y_regs[i]) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6276 flags |= REG_PREVIOUS; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6277 if (c == execreg_lastc) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6278 flags |= REG_EXEC; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6279 fprintf(fp, "|%d,%d,%d,%d,%d,%d,%ld", BARTYPE_REGISTER, flags, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6280 i, y_ptr->y_type, num_lines, (int)y_ptr->y_width, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6281 (long)y_ptr->y_time_set); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6282 /* 11 chars for type/flags/name/type, 3 * 20 for numbers */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6283 remaining = LSIZE - 71; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6284 for (j = 0; j < num_lines; j++) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6285 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6286 putc(',', fp); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6287 --remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6288 remaining = barline_writestring(fp, y_ptr->y_array[j], |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6289 remaining); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6290 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6291 putc('\n', fp); |
7 | 6292 } |
6293 } | |
6294 } | |
6295 #endif /* FEAT_VIMINFO */ | |
6296 | |
6297 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
6298 /* | |
6299 * SELECTION / PRIMARY ('*') | |
6300 * | |
6301 * Text selection stuff that uses the GUI selection register '*'. When using a | |
6302 * GUI this may be text from another window, otherwise it is the last text we | |
6303 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
6304 * button performs the paste, otherwise you will need to do <"*p>. " | |
6305 * If not under X, it is synonymous with the clipboard register '+'. | |
6306 * | |
6307 * X CLIPBOARD ('+') | |
6308 * | |
6309 * Text selection stuff that uses the GUI clipboard register '+'. | |
6310 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
6311 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
6312 * otherwise you will need to do <"+p>. " | |
6313 * If not under X, it is synonymous with the selection register '*'. | |
6314 */ | |
6315 | |
6316 /* | |
6317 * Routine to export any final X selection we had to the environment | |
11065
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
6318 * so that the text is still available after Vim has exited. X selections |
7 | 6319 * only exist while the owning application exists, so we write to the |
6320 * permanent (while X runs) store CUT_BUFFER0. | |
6321 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
6322 * 'permanent' of the two), otherwise the PRIMARY one. | |
6323 * For now, use a hard-coded sanity limit of 1Mb of data. | |
6324 */ | |
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
6325 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
7 | 6326 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6327 x11_export_final_selection(void) |
7 | 6328 { |
6329 Display *dpy; | |
6330 char_u *str = NULL; | |
6331 long_u len = 0; | |
6332 int motion_type = -1; | |
6333 | |
6334 # ifdef FEAT_GUI | |
6335 if (gui.in_use) | |
6336 dpy = X_DISPLAY; | |
6337 else | |
6338 # endif | |
6339 # ifdef FEAT_XCLIPBOARD | |
6340 dpy = xterm_dpy; | |
6341 # else | |
6342 return; | |
6343 # endif | |
6344 | |
6345 /* Get selection to export */ | |
6346 if (clip_plus.owned) | |
6347 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
6348 else if (clip_star.owned) | |
6349 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
6350 | |
6351 /* Check it's OK */ | |
6352 if (dpy != NULL && str != NULL && motion_type >= 0 | |
6353 && len < 1024*1024 && len > 0) | |
6354 { | |
1924 | 6355 #ifdef FEAT_MBYTE |
4201 | 6356 int ok = TRUE; |
6357 | |
1924 | 6358 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
6359 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
6360 * encoding conversion usually doesn't work, so keep the text as-is. | |
6361 */ | |
6362 if (has_mbyte) | |
6363 { | |
6364 vimconv_T vc; | |
6365 | |
6366 vc.vc_type = CONV_NONE; | |
6367 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
6368 { | |
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6369 int intlen = len; |
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6370 char_u *conv_str; |
2007 | 6371 |
4201 | 6372 vc.vc_fail = TRUE; |
2007 | 6373 conv_str = string_convert(&vc, str, &intlen); |
6374 len = intlen; | |
1924 | 6375 if (conv_str != NULL) |
6376 { | |
6377 vim_free(str); | |
6378 str = conv_str; | |
6379 } | |
4201 | 6380 else |
6381 { | |
6382 ok = FALSE; | |
6383 } | |
1924 | 6384 convert_setup(&vc, NULL, NULL); |
6385 } | |
4201 | 6386 else |
6387 { | |
6388 ok = FALSE; | |
6389 } | |
1924 | 6390 } |
4201 | 6391 |
6392 /* Do not store the string if conversion failed. Better to use any | |
6393 * other selection than garbled text. */ | |
6394 if (ok) | |
6395 #endif | |
6396 { | |
6397 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
6398 XFlush(dpy); | |
6399 } | |
7 | 6400 } |
6401 | |
6402 vim_free(str); | |
6403 } | |
6404 #endif | |
6405 | |
6406 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6407 clip_free_selection(VimClipboard *cbd) |
7 | 6408 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6409 yankreg_T *y_ptr = y_current; |
7 | 6410 |
6411 if (cbd == &clip_plus) | |
6412 y_current = &y_regs[PLUS_REGISTER]; | |
6413 else | |
6414 y_current = &y_regs[STAR_REGISTER]; | |
6415 free_yank_all(); | |
6416 y_current->y_size = 0; | |
6417 y_current = y_ptr; | |
6418 } | |
6419 | |
6420 /* | |
6421 * Get the selected text and put it in the gui selection register '*' or '+'. | |
6422 */ | |
6423 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6424 clip_get_selection(VimClipboard *cbd) |
7 | 6425 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6426 yankreg_T *old_y_previous, *old_y_current; |
7 | 6427 pos_T old_cursor; |
6428 pos_T old_visual; | |
6429 int old_visual_mode; | |
6430 colnr_T old_curswant; | |
6431 int old_set_curswant; | |
6432 pos_T old_op_start, old_op_end; | |
6433 oparg_T oa; | |
6434 cmdarg_T ca; | |
6435 | |
6436 if (cbd->owned) | |
6437 { | |
6438 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
6439 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
6440 return; | |
6441 | |
6442 /* Get the text between clip_star.start & clip_star.end */ | |
6443 old_y_previous = y_previous; | |
6444 old_y_current = y_current; | |
6445 old_cursor = curwin->w_cursor; | |
6446 old_curswant = curwin->w_curswant; | |
6447 old_set_curswant = curwin->w_set_curswant; | |
6448 old_op_start = curbuf->b_op_start; | |
6449 old_op_end = curbuf->b_op_end; | |
6450 old_visual = VIsual; | |
6451 old_visual_mode = VIsual_mode; | |
6452 clear_oparg(&oa); | |
6453 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
6454 oa.op_type = OP_YANK; | |
6455 vim_memset(&ca, 0, sizeof(ca)); | |
6456 ca.oap = &oa; | |
6457 ca.cmdchar = 'y'; | |
6458 ca.count1 = 1; | |
6459 ca.retval = CA_NO_ADJ_OP_END; | |
6460 do_pending_operator(&ca, 0, TRUE); | |
6461 y_previous = old_y_previous; | |
6462 y_current = old_y_current; | |
6463 curwin->w_cursor = old_cursor; | |
688 | 6464 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
7 | 6465 curwin->w_curswant = old_curswant; |
6466 curwin->w_set_curswant = old_set_curswant; | |
6467 curbuf->b_op_start = old_op_start; | |
6468 curbuf->b_op_end = old_op_end; | |
6469 VIsual = old_visual; | |
6470 VIsual_mode = old_visual_mode; | |
6471 } | |
6472 else | |
6473 { | |
6474 clip_free_selection(cbd); | |
6475 | |
6476 /* Try to get selected text from another window */ | |
6477 clip_gen_request_selection(cbd); | |
6478 } | |
6479 } | |
6480 | |
2896 | 6481 /* |
6482 * Convert from the GUI selection string into the '*'/'+' register. | |
6483 */ | |
7 | 6484 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6485 clip_yank_selection( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6486 int type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6487 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6488 long len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6489 VimClipboard *cbd) |
7 | 6490 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6491 yankreg_T *y_ptr; |
7 | 6492 |
6493 if (cbd == &clip_plus) | |
6494 y_ptr = &y_regs[PLUS_REGISTER]; | |
6495 else | |
6496 y_ptr = &y_regs[STAR_REGISTER]; | |
6497 | |
6498 clip_free_selection(cbd); | |
6499 | |
5798 | 6500 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
7 | 6501 } |
6502 | |
6503 /* | |
6504 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
6505 * with length *len. | |
6506 * Returns the motion type, or -1 for failure. | |
6507 */ | |
6508 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6509 clip_convert_selection(char_u **str, long_u *len, VimClipboard *cbd) |
7 | 6510 { |
6511 char_u *p; | |
6512 int lnum; | |
6513 int i, j; | |
6514 int_u eolsize; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6515 yankreg_T *y_ptr; |
7 | 6516 |
6517 if (cbd == &clip_plus) | |
6518 y_ptr = &y_regs[PLUS_REGISTER]; | |
6519 else | |
6520 y_ptr = &y_regs[STAR_REGISTER]; | |
6521 | |
6522 #ifdef USE_CRNL | |
6523 eolsize = 2; | |
6524 #else | |
6525 eolsize = 1; | |
6526 #endif | |
6527 | |
6528 *str = NULL; | |
6529 *len = 0; | |
6530 if (y_ptr->y_array == NULL) | |
6531 return -1; | |
6532 | |
6533 for (i = 0; i < y_ptr->y_size; i++) | |
6534 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
6535 | |
6536 /* | |
6537 * Don't want newline character at end of last line if we're in MCHAR mode. | |
6538 */ | |
6539 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
6540 *len -= eolsize; | |
6541 | |
6542 p = *str = lalloc(*len + 1, TRUE); /* add one to avoid zero */ | |
6543 if (p == NULL) | |
6544 return -1; | |
6545 lnum = 0; | |
6546 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
6547 { | |
6548 if (y_ptr->y_array[lnum][j] == '\n') | |
6549 p[i] = NUL; | |
6550 else if (y_ptr->y_array[lnum][j] == NUL) | |
6551 { | |
6552 #ifdef USE_CRNL | |
6553 p[i++] = '\r'; | |
6554 #endif | |
6555 #ifdef USE_CR | |
6556 p[i] = '\r'; | |
6557 #else | |
6558 p[i] = '\n'; | |
6559 #endif | |
6560 lnum++; | |
6561 j = -1; | |
6562 } | |
6563 else | |
6564 p[i] = y_ptr->y_array[lnum][j]; | |
6565 } | |
6566 return y_ptr->y_type; | |
6567 } | |
6568 | |
6569 | |
6570 /* | |
6571 * If we have written to a clipboard register, send the text to the clipboard. | |
6572 */ | |
6573 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6574 may_set_selection(void) |
7 | 6575 { |
6576 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
6577 { | |
6578 clip_own_selection(&clip_star); | |
6579 clip_gen_set_selection(&clip_star); | |
6580 } | |
6581 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
6582 { | |
6583 clip_own_selection(&clip_plus); | |
6584 clip_gen_set_selection(&clip_plus); | |
6585 } | |
6586 } | |
6587 | |
6588 #endif /* FEAT_CLIPBOARD || PROTO */ | |
6589 | |
6590 | |
6591 #if defined(FEAT_DND) || defined(PROTO) | |
6592 /* | |
6593 * Replace the contents of the '~' register with str. | |
6594 */ | |
6595 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6596 dnd_yank_drag_data(char_u *str, long len) |
7 | 6597 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6598 yankreg_T *curr; |
7 | 6599 |
6600 curr = y_current; | |
6601 y_current = &y_regs[TILDE_REGISTER]; | |
6602 free_yank_all(); | |
5798 | 6603 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
7 | 6604 y_current = curr; |
6605 } | |
6606 #endif | |
6607 | |
6608 | |
6609 #if defined(FEAT_EVAL) || defined(PROTO) | |
6610 /* | |
6611 * Return the type of a register. | |
6612 * Used for getregtype() | |
6613 * Returns MAUTO for error. | |
6614 */ | |
6615 char_u | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6616 get_reg_type(int regname, long *reglen) |
7 | 6617 { |
6618 switch (regname) | |
6619 { | |
6620 case '%': /* file name */ | |
6621 case '#': /* alternate file name */ | |
6622 case '=': /* expression */ | |
6623 case ':': /* last command line */ | |
6624 case '/': /* last search-pattern */ | |
6625 case '.': /* last inserted text */ | |
6626 #ifdef FEAT_SEARCHPATH | |
6627 case Ctrl_F: /* Filename under cursor */ | |
6628 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
6629 #endif | |
6630 case Ctrl_W: /* word under cursor */ | |
6631 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
6632 case '_': /* black hole: always empty */ | |
6633 return MCHAR; | |
6634 } | |
6635 | |
6636 #ifdef FEAT_CLIPBOARD | |
6637 regname = may_get_selection(regname); | |
6638 #endif | |
6639 | |
5596 | 6640 if (regname != NUL && !valid_yank_reg(regname, FALSE)) |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
6641 return MAUTO; |
5596 | 6642 |
7 | 6643 get_yank_register(regname, FALSE); |
6644 | |
6645 if (y_current->y_array != NULL) | |
6646 { | |
6647 if (reglen != NULL && y_current->y_type == MBLOCK) | |
6648 *reglen = y_current->y_width; | |
6649 return y_current->y_type; | |
6650 } | |
6651 return MAUTO; | |
6652 } | |
6653 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
6654 static char_u *getreg_wrap_one_line(char_u *s, int flags); |
5796 | 6655 |
6656 /* | |
6657 * When "flags" has GREG_LIST return a list with text "s". | |
6658 * Otherwise just return "s". | |
6659 */ | |
6660 static char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6661 getreg_wrap_one_line(char_u *s, int flags) |
5796 | 6662 { |
6663 if (flags & GREG_LIST) | |
6664 { | |
6665 list_T *list = list_alloc(); | |
6666 | |
6667 if (list != NULL) | |
6668 { | |
6669 if (list_append_string(list, NULL, -1) == FAIL) | |
6670 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6671 list_free(list); |
5796 | 6672 return NULL; |
6673 } | |
6674 list->lv_first->li_tv.vval.v_string = s; | |
6675 } | |
6676 return (char_u *)list; | |
6677 } | |
6678 return s; | |
6679 } | |
6680 | |
7 | 6681 /* |
6682 * Return the contents of a register as a single allocated string. | |
6683 * Used for "@r" in expressions and for getreg(). | |
6684 * Returns NULL for error. | |
5796 | 6685 * Flags: |
6686 * GREG_NO_EXPR Do not allow expression register | |
6687 * GREG_EXPR_SRC For the expression register: return expression itself, | |
6688 * not the result of its evaluation. | |
6689 * GREG_LIST Return a list of lines in place of a single string. | |
7 | 6690 */ |
6691 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6692 get_reg_contents(int regname, int flags) |
7 | 6693 { |
6694 long i; | |
6695 char_u *retval; | |
6696 int allocated; | |
6697 long len; | |
6698 | |
6699 /* Don't allow using an expression register inside an expression */ | |
6700 if (regname == '=') | |
6701 { | |
5796 | 6702 if (flags & GREG_NO_EXPR) |
6703 return NULL; | |
6704 if (flags & GREG_EXPR_SRC) | |
6705 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
6706 return getreg_wrap_one_line(get_expr_line(), flags); | |
7 | 6707 } |
6708 | |
6709 if (regname == '@') /* "@@" is used for unnamed register */ | |
6710 regname = '"'; | |
6711 | |
6712 /* check for valid regname */ | |
6713 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
6714 return NULL; | |
6715 | |
6716 #ifdef FEAT_CLIPBOARD | |
6717 regname = may_get_selection(regname); | |
6718 #endif | |
6719 | |
6720 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
6721 { | |
6722 if (retval == NULL) | |
6723 return NULL; | |
5796 | 6724 if (allocated) |
6725 return getreg_wrap_one_line(retval, flags); | |
6726 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
7 | 6727 } |
6728 | |
6729 get_yank_register(regname, FALSE); | |
6730 if (y_current->y_array == NULL) | |
6731 return NULL; | |
6732 | |
5796 | 6733 if (flags & GREG_LIST) |
6734 { | |
6735 list_T *list = list_alloc(); | |
6736 int error = FALSE; | |
6737 | |
6738 if (list == NULL) | |
6739 return NULL; | |
6740 for (i = 0; i < y_current->y_size; ++i) | |
6741 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
6742 error = TRUE; | |
6743 if (error) | |
6744 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6745 list_free(list); |
5796 | 6746 return NULL; |
6747 } | |
6748 return (char_u *)list; | |
6749 } | |
6750 | |
7 | 6751 /* |
6752 * Compute length of resulting string. | |
6753 */ | |
6754 len = 0; | |
6755 for (i = 0; i < y_current->y_size; ++i) | |
6756 { | |
6757 len += (long)STRLEN(y_current->y_array[i]); | |
6758 /* | |
6759 * Insert a newline between lines and after last line if | |
6760 * y_type is MLINE. | |
6761 */ | |
6762 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6763 ++len; | |
6764 } | |
6765 | |
6766 retval = lalloc(len + 1, TRUE); | |
6767 | |
6768 /* | |
6769 * Copy the lines of the yank register into the string. | |
6770 */ | |
6771 if (retval != NULL) | |
6772 { | |
6773 len = 0; | |
6774 for (i = 0; i < y_current->y_size; ++i) | |
6775 { | |
6776 STRCPY(retval + len, y_current->y_array[i]); | |
6777 len += (long)STRLEN(retval + len); | |
6778 | |
6779 /* | |
6780 * Insert a NL between lines and after the last line if y_type is | |
6781 * MLINE. | |
6782 */ | |
6783 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6784 retval[len++] = '\n'; | |
6785 } | |
6786 retval[len] = NUL; | |
6787 } | |
6788 | |
6789 return retval; | |
6790 } | |
6791 | |
5798 | 6792 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6793 init_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6794 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6795 yankreg_T **old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6796 yankreg_T **old_y_current, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6797 int must_append, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6798 int *yank_type UNUSED) |
5798 | 6799 { |
6800 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
6801 { | |
6802 emsg_invreg(name); | |
6803 return FAIL; | |
6804 } | |
6805 | |
6806 /* Don't want to change the current (unnamed) register */ | |
6807 *old_y_previous = y_previous; | |
6808 *old_y_current = y_current; | |
6809 | |
6810 get_yank_register(name, TRUE); | |
6811 if (!y_append && !must_append) | |
6812 free_yank_all(); | |
6813 return OK; | |
6814 } | |
6815 | |
6816 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6817 finish_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6818 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6819 yankreg_T *old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6820 yankreg_T *old_y_current) |
5798 | 6821 { |
6822 # ifdef FEAT_CLIPBOARD | |
6823 /* Send text of clipboard register to the clipboard. */ | |
6824 may_set_selection(); | |
6825 # endif | |
6826 | |
6827 /* ':let @" = "val"' should change the meaning of the "" register */ | |
6828 if (name != '"') | |
6829 y_previous = old_y_previous; | |
6830 y_current = old_y_current; | |
6831 } | |
6832 | |
7 | 6833 /* |
6834 * Store string "str" in register "name". | |
6835 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
6836 * If "must_append" is TRUE, always append to the register. Otherwise append | |
6837 * if "name" is an uppercase letter. | |
6838 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
6839 * Careful: 'str' is modified, you may have to use a copy! | |
6840 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
6841 */ | |
6842 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6843 write_reg_contents( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6844 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6845 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6846 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6847 int must_append) |
7 | 6848 { |
6849 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
6850 } | |
6851 | |
6852 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6853 write_reg_contents_lst( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6854 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6855 char_u **strings, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6856 int maxlen UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6857 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6858 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6859 long block_len) |
5798 | 6860 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6861 yankreg_T *old_y_previous, *old_y_current; |
5798 | 6862 |
6863 if (name == '/' | |
6864 #ifdef FEAT_EVAL | |
6865 || name == '=' | |
6866 #endif | |
6867 ) | |
6868 { | |
6869 char_u *s; | |
6870 | |
6871 if (strings[0] == NULL) | |
6872 s = (char_u *)""; | |
6873 else if (strings[1] != NULL) | |
6874 { | |
6875 EMSG(_("E883: search pattern and expression register may not " | |
6876 "contain two or more lines")); | |
6877 return; | |
6878 } | |
6879 else | |
6880 s = strings[0]; | |
6881 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
6882 return; | |
6883 } | |
6884 | |
6885 if (name == '_') /* black hole: nothing to do */ | |
6886 return; | |
6887 | |
6888 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
6889 &yank_type) == FAIL) | |
6890 return; | |
6891 | |
6892 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
6893 | |
6894 finish_write_reg(name, old_y_previous, old_y_current); | |
6895 } | |
6896 | |
6897 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6898 write_reg_contents_ex( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6899 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6900 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6901 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6902 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6903 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6904 long block_len) |
7 | 6905 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6906 yankreg_T *old_y_previous, *old_y_current; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6907 long len; |
7 | 6908 |
336 | 6909 if (maxlen >= 0) |
6910 len = maxlen; | |
6911 else | |
6912 len = (long)STRLEN(str); | |
6913 | |
7 | 6914 /* Special case: '/' search pattern */ |
6915 if (name == '/') | |
6916 { | |
6917 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
6918 return; | |
6919 } | |
6920 | |
6557 | 6921 if (name == '#') |
6922 { | |
6923 buf_T *buf; | |
6924 | |
6925 if (VIM_ISDIGIT(*str)) | |
6926 { | |
6927 int num = atoi((char *)str); | |
6928 | |
6929 buf = buflist_findnr(num); | |
6930 if (buf == NULL) | |
6931 EMSGN(_(e_nobufnr), (long)num); | |
6932 } | |
6933 else | |
6934 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
6935 TRUE, FALSE, FALSE)); | |
6936 if (buf == NULL) | |
6937 return; | |
6938 curwin->w_alt_fnum = buf->b_fnum; | |
6939 return; | |
6940 } | |
6941 | |
336 | 6942 #ifdef FEAT_EVAL |
6943 if (name == '=') | |
6944 { | |
6945 char_u *p, *s; | |
6946 | |
6947 p = vim_strnsave(str, (int)len); | |
6948 if (p == NULL) | |
6949 return; | |
6950 if (must_append) | |
6951 { | |
6952 s = concat_str(get_expr_line_src(), p); | |
6953 vim_free(p); | |
6954 p = s; | |
6955 } | |
6956 set_expr_line(p); | |
6957 return; | |
6958 } | |
6959 #endif | |
6960 | |
7 | 6961 if (name == '_') /* black hole: nothing to do */ |
6962 return; | |
6963 | |
5798 | 6964 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
6965 &yank_type) == FAIL) | |
6966 return; | |
6967 | |
6968 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
6969 | |
6970 finish_write_reg(name, old_y_previous, old_y_current); | |
7 | 6971 } |
6972 #endif /* FEAT_EVAL */ | |
6973 | |
6974 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
6975 /* | |
6976 * Put a string into a register. When the register is not empty, the string | |
6977 * is appended. | |
6978 */ | |
6979 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6980 str_to_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6981 yankreg_T *y_ptr, /* pointer to yank register */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6982 int yank_type, /* MCHAR, MLINE, MBLOCK, MAUTO */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6983 char_u *str, /* string to put in register */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6984 long len, /* length of string */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6985 long blocklen, /* width of Visual block */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6986 int str_list) /* TRUE if str is char_u ** */ |
7 | 6987 { |
2896 | 6988 int type; /* MCHAR, MLINE or MBLOCK */ |
7 | 6989 int lnum; |
6990 long start; | |
6991 long i; | |
6992 int extra; | |
6993 int newlines; /* number of lines added */ | |
6994 int extraline = 0; /* extra line at the end */ | |
6995 int append = FALSE; /* append to last line in register */ | |
6996 char_u *s; | |
5798 | 6997 char_u **ss; |
7 | 6998 char_u **pp; |
6999 long maxlen; | |
7000 | |
2000 | 7001 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
7 | 7002 y_ptr->y_size = 0; |
7003 | |
2896 | 7004 if (yank_type == MAUTO) |
5798 | 7005 type = ((str_list || (len > 0 && (str[len - 1] == NL |
7006 || str[len - 1] == CAR))) | |
2896 | 7007 ? MLINE : MCHAR); |
7008 else | |
7009 type = yank_type; | |
7010 | |
7 | 7011 /* |
7012 * Count the number of lines within the string | |
7013 */ | |
7014 newlines = 0; | |
5798 | 7015 if (str_list) |
7016 { | |
7017 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
7 | 7018 ++newlines; |
5798 | 7019 } |
7020 else | |
7021 { | |
7022 for (i = 0; i < len; i++) | |
7023 if (str[i] == '\n') | |
7024 ++newlines; | |
7025 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
7026 { | |
7027 extraline = 1; | |
7028 ++newlines; /* count extra newline at the end */ | |
7029 } | |
7030 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
7031 { | |
7032 append = TRUE; | |
7033 --newlines; /* uncount newline when appending first line */ | |
7034 } | |
7 | 7035 } |
7036 | |
6807 | 7037 /* Without any lines make the register empty. */ |
7038 if (y_ptr->y_size + newlines == 0) | |
7039 { | |
7040 vim_free(y_ptr->y_array); | |
7041 y_ptr->y_array = NULL; | |
7042 return; | |
7043 } | |
7044 | |
7 | 7045 /* |
7046 * Allocate an array to hold the pointers to the new register lines. | |
7047 * If the register was not empty, move the existing lines to the new array. | |
7048 */ | |
7049 pp = (char_u **)lalloc_clear((y_ptr->y_size + newlines) | |
7050 * sizeof(char_u *), TRUE); | |
7051 if (pp == NULL) /* out of memory */ | |
7052 return; | |
7053 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
7054 pp[lnum] = y_ptr->y_array[lnum]; | |
7055 vim_free(y_ptr->y_array); | |
7056 y_ptr->y_array = pp; | |
7057 maxlen = 0; | |
7058 | |
7059 /* | |
7060 * Find the end of each line and save it into the array. | |
7061 */ | |
5798 | 7062 if (str_list) |
7063 { | |
7064 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
7 | 7065 { |
5856 | 7066 i = (long)STRLEN(*ss); |
5798 | 7067 pp[lnum] = vim_strnsave(*ss, i); |
7068 if (i > maxlen) | |
7069 maxlen = i; | |
7 | 7070 } |
5798 | 7071 } |
7072 else | |
7073 { | |
7074 for (start = 0; start < len + extraline; start += i + 1) | |
7 | 7075 { |
5798 | 7076 for (i = start; i < len; ++i) /* find the end of the line */ |
7077 if (str[i] == '\n') | |
7078 break; | |
7079 i -= start; /* i is now length of line */ | |
7080 if (i > maxlen) | |
7081 maxlen = i; | |
7082 if (append) | |
7083 { | |
7084 --lnum; | |
7085 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
7086 } | |
7087 else | |
7088 extra = 0; | |
7089 s = alloc((unsigned)(i + extra + 1)); | |
7090 if (s == NULL) | |
7091 break; | |
7092 if (extra) | |
7093 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
7094 if (append) | |
7095 vim_free(y_ptr->y_array[lnum]); | |
7096 if (i) | |
7097 mch_memmove(s + extra, str + start, (size_t)i); | |
7098 extra += i; | |
7099 s[extra] = NUL; | |
7100 y_ptr->y_array[lnum++] = s; | |
7101 while (--extra >= 0) | |
7102 { | |
7103 if (*s == NUL) | |
7104 *s = '\n'; /* replace NUL with newline */ | |
7105 ++s; | |
7106 } | |
7107 append = FALSE; /* only first line is appended */ | |
7 | 7108 } |
7109 } | |
7110 y_ptr->y_type = type; | |
7111 y_ptr->y_size = lnum; | |
7112 if (type == MBLOCK) | |
7113 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
7114 else | |
7115 y_ptr->y_width = 0; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7116 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7117 y_ptr->y_time_set = vim_time(); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7118 #endif |
7 | 7119 } |
7120 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
7121 | |
7122 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7123 clear_oparg(oparg_T *oap) |
7 | 7124 { |
7125 vim_memset(oap, 0, sizeof(oparg_T)); | |
7126 } | |
7127 | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7128 static varnumber_T line_count_info(char_u *line, varnumber_T *wc, varnumber_T *cc, varnumber_T limit, int eol_size); |
7 | 7129 |
7130 /* | |
161 | 7131 * Count the number of bytes, characters and "words" in a line. |
7 | 7132 * |
7133 * "Words" are counted by looking for boundaries between non-space and | |
7134 * space characters. (it seems to produce results that match 'wc'.) | |
7135 * | |
161 | 7136 * Return value is byte count; word count for the line is added to "*wc". |
7137 * Char count is added to "*cc". | |
7 | 7138 * |
7139 * The function will only examine the first "limit" characters in the | |
7140 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
7141 * case, eol_size will be added to the character count to account for | |
7142 * the size of the EOL character. | |
7143 */ | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7144 static varnumber_T |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7145 line_count_info( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7146 char_u *line, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7147 varnumber_T *wc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7148 varnumber_T *cc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7149 varnumber_T limit, |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7150 int eol_size) |
7 | 7151 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7152 varnumber_T i; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7153 varnumber_T words = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7154 varnumber_T chars = 0; |
7 | 7155 int is_word = 0; |
7156 | |
3626 | 7157 for (i = 0; i < limit && line[i] != NUL; ) |
7 | 7158 { |
7159 if (is_word) | |
7160 { | |
7161 if (vim_isspace(line[i])) | |
7162 { | |
7163 words++; | |
7164 is_word = 0; | |
7165 } | |
7166 } | |
7167 else if (!vim_isspace(line[i])) | |
7168 is_word = 1; | |
161 | 7169 ++chars; |
7170 #ifdef FEAT_MBYTE | |
474 | 7171 i += (*mb_ptr2len)(line + i); |
161 | 7172 #else |
7173 ++i; | |
7174 #endif | |
7 | 7175 } |
7176 | |
7177 if (is_word) | |
7178 words++; | |
7179 *wc += words; | |
7180 | |
7181 /* Add eol_size if the end of line was reached before hitting limit. */ | |
2996 | 7182 if (i < limit && line[i] == NUL) |
161 | 7183 { |
7 | 7184 i += eol_size; |
161 | 7185 chars += eol_size; |
7186 } | |
7187 *cc += chars; | |
7 | 7188 return i; |
7189 } | |
7190 | |
7191 /* | |
7192 * Give some info about the position of the cursor (for "g CTRL-G"). | |
7193 * In Visual mode, give some info about the selected region. (In this case, | |
7194 * the *_count_cursor variables store running totals for the selection.) | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7195 * When "dict" is not NULL store the info there instead of showing it. |
7 | 7196 */ |
7197 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7198 cursor_pos_info(dict_T *dict) |
7 | 7199 { |
7200 char_u *p; | |
274 | 7201 char_u buf1[50]; |
7202 char_u buf2[40]; | |
7 | 7203 linenr_T lnum; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7204 varnumber_T byte_count = 0; |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7205 #ifdef FEAT_MBYTE |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7206 varnumber_T bom_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7207 #endif |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7208 varnumber_T byte_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7209 varnumber_T char_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7210 varnumber_T char_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7211 varnumber_T word_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7212 varnumber_T word_count_cursor = 0; |
7 | 7213 int eol_size; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7214 varnumber_T last_check = 100000L; |
7 | 7215 long line_count_selected = 0; |
7216 pos_T min_pos, max_pos; | |
7217 oparg_T oparg; | |
7218 struct block_def bd; | |
7219 | |
7220 /* | |
7221 * Compute the length of the file in characters. | |
7222 */ | |
7223 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
7224 { | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7225 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7226 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7227 MSG(_(no_lines_msg)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7228 return; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7229 } |
7 | 7230 } |
7231 else | |
7232 { | |
7233 if (get_fileformat(curbuf) == EOL_DOS) | |
7234 eol_size = 2; | |
7235 else | |
7236 eol_size = 1; | |
7237 | |
7238 if (VIsual_active) | |
7239 { | |
7240 if (lt(VIsual, curwin->w_cursor)) | |
7241 { | |
7242 min_pos = VIsual; | |
7243 max_pos = curwin->w_cursor; | |
7244 } | |
7245 else | |
7246 { | |
7247 min_pos = curwin->w_cursor; | |
7248 max_pos = VIsual; | |
7249 } | |
7250 if (*p_sel == 'e' && max_pos.col > 0) | |
7251 --max_pos.col; | |
7252 | |
7253 if (VIsual_mode == Ctrl_V) | |
7254 { | |
1866 | 7255 #ifdef FEAT_LINEBREAK |
7256 char_u * saved_sbr = p_sbr; | |
7257 | |
7258 /* Make 'sbr' empty for a moment to get the correct size. */ | |
7259 p_sbr = empty_option; | |
7260 #endif | |
7 | 7261 oparg.is_VIsual = 1; |
7262 oparg.block_mode = TRUE; | |
7263 oparg.op_type = OP_NOP; | |
7264 getvcols(curwin, &min_pos, &max_pos, | |
688 | 7265 &oparg.start_vcol, &oparg.end_vcol); |
1866 | 7266 #ifdef FEAT_LINEBREAK |
7267 p_sbr = saved_sbr; | |
7268 #endif | |
688 | 7269 if (curwin->w_curswant == MAXCOL) |
7270 oparg.end_vcol = MAXCOL; | |
7 | 7271 /* Swap the start, end vcol if needed */ |
7272 if (oparg.end_vcol < oparg.start_vcol) | |
7273 { | |
7274 oparg.end_vcol += oparg.start_vcol; | |
7275 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
7276 oparg.end_vcol -= oparg.start_vcol; | |
7277 } | |
7278 } | |
7279 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
7280 } | |
7281 | |
7282 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
7283 { | |
7284 /* Check for a CTRL-C every 100000 characters. */ | |
161 | 7285 if (byte_count > last_check) |
7 | 7286 { |
7287 ui_breakcheck(); | |
7288 if (got_int) | |
7289 return; | |
161 | 7290 last_check = byte_count + 100000L; |
7 | 7291 } |
7292 | |
7293 /* Do extra processing for VIsual mode. */ | |
7294 if (VIsual_active | |
7295 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
7296 { | |
45 | 7297 char_u *s = NULL; |
7298 long len = 0L; | |
7299 | |
7 | 7300 switch (VIsual_mode) |
7301 { | |
7302 case Ctrl_V: | |
5735 | 7303 #ifdef FEAT_VIRTUALEDIT |
7 | 7304 virtual_op = virtual_active(); |
5735 | 7305 #endif |
7 | 7306 block_prep(&oparg, &bd, lnum, 0); |
5735 | 7307 #ifdef FEAT_VIRTUALEDIT |
7 | 7308 virtual_op = MAYBE; |
5735 | 7309 #endif |
45 | 7310 s = bd.textstart; |
7311 len = (long)bd.textlen; | |
7 | 7312 break; |
7313 case 'V': | |
45 | 7314 s = ml_get(lnum); |
7315 len = MAXCOL; | |
7 | 7316 break; |
7317 case 'v': | |
7318 { | |
7319 colnr_T start_col = (lnum == min_pos.lnum) | |
7320 ? min_pos.col : 0; | |
7321 colnr_T end_col = (lnum == max_pos.lnum) | |
7322 ? max_pos.col - start_col + 1 : MAXCOL; | |
7323 | |
45 | 7324 s = ml_get(lnum) + start_col; |
7325 len = end_col; | |
7 | 7326 } |
7327 break; | |
7328 } | |
45 | 7329 if (s != NULL) |
7330 { | |
161 | 7331 byte_count_cursor += line_count_info(s, &word_count_cursor, |
7332 &char_count_cursor, len, eol_size); | |
45 | 7333 if (lnum == curbuf->b_ml.ml_line_count |
7334 && !curbuf->b_p_eol | |
6933 | 7335 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
50 | 7336 && (long)STRLEN(s) < len) |
161 | 7337 byte_count_cursor -= eol_size; |
45 | 7338 } |
7 | 7339 } |
7340 else | |
7341 { | |
7342 /* In non-visual mode, check for the line the cursor is on */ | |
7343 if (lnum == curwin->w_cursor.lnum) | |
7344 { | |
7345 word_count_cursor += word_count; | |
161 | 7346 char_count_cursor += char_count; |
7347 byte_count_cursor = byte_count + | |
7348 line_count_info(ml_get(lnum), | |
7349 &word_count_cursor, &char_count_cursor, | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7350 (varnumber_T)(curwin->w_cursor.col + 1), |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7351 eol_size); |
7 | 7352 } |
7353 } | |
7354 /* Add to the running totals */ | |
161 | 7355 byte_count += line_count_info(ml_get(lnum), &word_count, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7356 &char_count, (varnumber_T)MAXCOL, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7357 eol_size); |
7 | 7358 } |
7359 | |
7360 /* Correction for when last line doesn't have an EOL. */ | |
6933 | 7361 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
161 | 7362 byte_count -= eol_size; |
7 | 7363 |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7364 if (dict == NULL) |
7 | 7365 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7366 if (VIsual_active) |
7 | 7367 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7368 if (VIsual_mode == Ctrl_V && curwin->w_curswant < MAXCOL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7369 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7370 getvcols(curwin, &min_pos, &max_pos, &min_pos.col, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7371 &max_pos.col); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7372 vim_snprintf((char *)buf1, sizeof(buf1), _("%ld Cols; "), |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7373 (long)(oparg.end_vcol - oparg.start_vcol + 1)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7374 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7375 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7376 buf1[0] = NUL; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7377 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7378 if (char_count_cursor == byte_count_cursor |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7379 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7380 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7381 _("Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"), |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7382 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7383 (long)curbuf->b_ml.ml_line_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7384 word_count_cursor, word_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7385 byte_count_cursor, byte_count); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7386 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7387 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7388 _("Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of %lld Bytes"), |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7389 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7390 (long)curbuf->b_ml.ml_line_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7391 word_count_cursor, word_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7392 char_count_cursor, char_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7393 byte_count_cursor, byte_count); |
7 | 7394 } |
7395 else | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7396 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7397 p = ml_get_curline(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7398 validate_virtcol(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7399 col_print(buf1, sizeof(buf1), (int)curwin->w_cursor.col + 1, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7400 (int)curwin->w_virtcol + 1); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7401 col_print(buf2, sizeof(buf2), (int)STRLEN(p), |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7402 linetabsize(p)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7403 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7404 if (char_count_cursor == byte_count_cursor |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7405 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7406 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7407 _("Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"), |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7408 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7409 (long)curwin->w_cursor.lnum, |
7 | 7410 (long)curbuf->b_ml.ml_line_count, |
7411 word_count_cursor, word_count, | |
161 | 7412 byte_count_cursor, byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7413 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7414 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7415 _("Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte %lld of %lld"), |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7416 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7417 (long)curwin->w_cursor.lnum, |
161 | 7418 (long)curbuf->b_ml.ml_line_count, |
7419 word_count_cursor, word_count, | |
7420 char_count_cursor, char_count, | |
7421 byte_count_cursor, byte_count); | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7422 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7423 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7424 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7425 #ifdef FEAT_MBYTE |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7426 bom_count = bomb_size(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7427 if (bom_count > 0) |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7428 vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE, |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7429 _("(+%ld for BOM)"), bom_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7430 #endif |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7431 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7432 { |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7433 /* Don't shorten this message, the user asked for it. */ |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7434 p = p_shm; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7435 p_shm = (char_u *)""; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7436 msg(IObuff); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7437 p_shm = p; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7438 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7439 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7440 #if defined(FEAT_EVAL) |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7441 if (dict != NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7442 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7443 dict_add_nr_str(dict, "words", word_count, NULL); |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7444 dict_add_nr_str(dict, "chars", char_count, NULL); |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7445 dict_add_nr_str(dict, "bytes", byte_count |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7446 # ifdef FEAT_MBYTE |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7447 + bom_count |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7448 # endif |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7449 , NULL); |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7450 dict_add_nr_str(dict, VIsual_active ? "visual_bytes" : "cursor_bytes", |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7451 byte_count_cursor, NULL); |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7452 dict_add_nr_str(dict, VIsual_active ? "visual_chars" : "cursor_chars", |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7453 char_count_cursor, NULL); |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7454 dict_add_nr_str(dict, VIsual_active ? "visual_words" : "cursor_words", |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7455 word_count_cursor, NULL); |
7 | 7456 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7457 #endif |
7 | 7458 } |