Mercurial > vim
annotate src/ops.c @ 13047:669c4f75a69e v8.0.1399
patch 8.0.1399: warnings and errors when building tiny version
commit https://github.com/vim/vim/commit/ee219b0e9faab4b7159ed1725c5b82cea4f4d4f8
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Dec 17 14:55:01 2017 +0100
patch 8.0.1399: warnings and errors when building tiny version
Problem: Warnings and errors when building tiny version. (Tony Mechelynck)
Solution: Add #ifdefs.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 17 Dec 2017 15:00:05 +0100 |
parents | 6e81a68d63a1 |
children | 50aa6da392ce |
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); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
116 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
|
117 static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1); |
7 | 118 #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
|
119 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
|
120 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
121 static int ends_in_white(linenr_T lnum); |
7 | 122 #ifdef FEAT_COMMENTS |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
123 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
|
124 static int fmt_check_par(linenr_T, int *, char_u **, int do_comments); |
7 | 125 #else |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
126 static int fmt_check_par(linenr_T); |
7 | 127 #endif |
128 | |
129 /* | |
130 * The names of operators. | |
131 * IMPORTANT: Index must correspond with defines in vim.h!!! | |
132 * The third field indicates whether the operator always works on lines. | |
133 */ | |
134 static char opchars[][3] = | |
135 { | |
136 {NUL, NUL, FALSE}, /* OP_NOP */ | |
137 {'d', NUL, FALSE}, /* OP_DELETE */ | |
138 {'y', NUL, FALSE}, /* OP_YANK */ | |
139 {'c', NUL, FALSE}, /* OP_CHANGE */ | |
140 {'<', NUL, TRUE}, /* OP_LSHIFT */ | |
141 {'>', NUL, TRUE}, /* OP_RSHIFT */ | |
142 {'!', NUL, TRUE}, /* OP_FILTER */ | |
143 {'g', '~', FALSE}, /* OP_TILDE */ | |
144 {'=', NUL, TRUE}, /* OP_INDENT */ | |
145 {'g', 'q', TRUE}, /* OP_FORMAT */ | |
146 {':', NUL, TRUE}, /* OP_COLON */ | |
147 {'g', 'U', FALSE}, /* OP_UPPER */ | |
148 {'g', 'u', FALSE}, /* OP_LOWER */ | |
149 {'J', NUL, TRUE}, /* DO_JOIN */ | |
150 {'g', 'J', TRUE}, /* DO_JOIN_NS */ | |
151 {'g', '?', FALSE}, /* OP_ROT13 */ | |
152 {'r', NUL, FALSE}, /* OP_REPLACE */ | |
153 {'I', NUL, FALSE}, /* OP_INSERT */ | |
154 {'A', NUL, FALSE}, /* OP_APPEND */ | |
155 {'z', 'f', TRUE}, /* OP_FOLD */ | |
156 {'z', 'o', TRUE}, /* OP_FOLDOPEN */ | |
157 {'z', 'O', TRUE}, /* OP_FOLDOPENREC */ | |
158 {'z', 'c', TRUE}, /* OP_FOLDCLOSE */ | |
159 {'z', 'C', TRUE}, /* OP_FOLDCLOSEREC */ | |
160 {'z', 'd', TRUE}, /* OP_FOLDDEL */ | |
161 {'z', 'D', TRUE}, /* OP_FOLDDELREC */ | |
162 {'g', 'w', TRUE}, /* OP_FORMAT2 */ | |
603 | 163 {'g', '@', FALSE}, /* OP_FUNCTION */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
164 {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
|
165 {Ctrl_X, NUL, FALSE}, /* OP_NR_SUB */ |
7 | 166 }; |
167 | |
168 /* | |
169 * Translate a command name into an operator type. | |
170 * Must only be called with a valid operator name! | |
171 */ | |
172 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
173 get_op_type(int char1, int char2) |
7 | 174 { |
175 int i; | |
176 | |
177 if (char1 == 'r') /* ignore second character */ | |
178 return OP_REPLACE; | |
179 if (char1 == '~') /* when tilde is an operator */ | |
180 return OP_TILDE; | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
181 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
|
182 return OP_NR_ADD; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
183 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
|
184 return OP_NR_SUB; |
7 | 185 for (i = 0; ; ++i) |
186 if (opchars[i][0] == char1 && opchars[i][1] == char2) | |
187 break; | |
188 return i; | |
189 } | |
190 | |
191 /* | |
192 * Return TRUE if operator "op" always works on whole lines. | |
193 */ | |
194 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
195 op_on_lines(int op) |
7 | 196 { |
197 return opchars[op][2]; | |
198 } | |
199 | |
200 /* | |
201 * Get first operator command character. | |
202 * Returns 'g' or 'z' if there is another command character. | |
203 */ | |
204 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
205 get_op_char(int optype) |
7 | 206 { |
207 return opchars[optype][0]; | |
208 } | |
209 | |
210 /* | |
211 * Get second operator command character. | |
212 */ | |
213 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
214 get_extra_op_char(int optype) |
7 | 215 { |
216 return opchars[optype][1]; | |
217 } | |
218 | |
219 /* | |
220 * op_shift - handle a shift operation | |
221 */ | |
222 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
223 op_shift(oparg_T *oap, int curs_top, int amount) |
7 | 224 { |
225 long i; | |
226 int first_char; | |
227 char_u *s; | |
228 int block_col = 0; | |
229 | |
230 if (u_save((linenr_T)(oap->start.lnum - 1), | |
231 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
232 return; | |
233 | |
234 if (oap->block_mode) | |
235 block_col = curwin->w_cursor.col; | |
236 | |
237 for (i = oap->line_count; --i >= 0; ) | |
238 { | |
239 first_char = *ml_get_curline(); | |
240 if (first_char == NUL) /* empty line */ | |
241 curwin->w_cursor.col = 0; | |
242 #ifdef FEAT_VISUALEXTRA | |
243 else if (oap->block_mode) | |
244 shift_block(oap, amount); | |
245 #endif | |
246 else | |
247 /* Move the line right if it doesn't start with '#', 'smartindent' | |
248 * isn't set or 'cindent' isn't set or '#' isn't in 'cino'. */ | |
249 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
250 if (first_char != '#' || !preprocs_left()) | |
251 #endif | |
252 { | |
1516 | 253 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE); |
7 | 254 } |
255 ++curwin->w_cursor.lnum; | |
256 } | |
257 | |
258 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
259 if (oap->block_mode) | |
260 { | |
261 curwin->w_cursor.lnum = oap->start.lnum; | |
262 curwin->w_cursor.col = block_col; | |
263 } | |
5735 | 264 else if (curs_top) /* put cursor on first line, for ">>" */ |
7 | 265 { |
266 curwin->w_cursor.lnum = oap->start.lnum; | |
267 beginline(BL_SOL | BL_FIX); /* shift_line() may have set cursor.col */ | |
268 } | |
269 else | |
270 --curwin->w_cursor.lnum; /* put cursor on last line, for ":>" */ | |
271 | |
10486
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
272 #ifdef FEAT_FOLDING |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
273 /* 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
|
274 foldOpenCursor(); |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
275 #endif |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
276 |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
277 |
7 | 278 if (oap->line_count > p_report) |
279 { | |
280 if (oap->op_type == OP_RSHIFT) | |
281 s = (char_u *)">"; | |
282 else | |
283 s = (char_u *)"<"; | |
284 if (oap->line_count == 1) | |
285 { | |
286 if (amount == 1) | |
287 sprintf((char *)IObuff, _("1 line %sed 1 time"), s); | |
288 else | |
289 sprintf((char *)IObuff, _("1 line %sed %d times"), s, amount); | |
290 } | |
291 else | |
292 { | |
293 if (amount == 1) | |
294 sprintf((char *)IObuff, _("%ld lines %sed 1 time"), | |
295 oap->line_count, s); | |
296 else | |
297 sprintf((char *)IObuff, _("%ld lines %sed %d times"), | |
298 oap->line_count, s, amount); | |
299 } | |
300 msg(IObuff); | |
301 } | |
302 | |
303 /* | |
304 * Set "'[" and "']" marks. | |
305 */ | |
306 curbuf->b_op_start = oap->start; | |
307 curbuf->b_op_end.lnum = oap->end.lnum; | |
308 curbuf->b_op_end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
309 if (curbuf->b_op_end.col > 0) | |
310 --curbuf->b_op_end.col; | |
311 } | |
312 | |
313 /* | |
314 * shift the current line one shiftwidth left (if left != 0) or right | |
315 * leaves cursor on first blank in the line | |
316 */ | |
317 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
318 shift_line( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
319 int left, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
320 int round, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
321 int amount, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
322 int call_changed_bytes) /* call changed_bytes() */ |
7 | 323 { |
324 int count; | |
325 int i, j; | |
5438 | 326 int p_sw = (int)get_sw_value(curbuf); |
7 | 327 |
328 count = get_indent(); /* get current indent */ | |
329 | |
330 if (round) /* round off indent */ | |
331 { | |
332 i = count / p_sw; /* number of p_sw rounded down */ | |
333 j = count % p_sw; /* extra spaces */ | |
334 if (j && left) /* first remove extra spaces */ | |
335 --amount; | |
336 if (left) | |
337 { | |
338 i -= amount; | |
339 if (i < 0) | |
340 i = 0; | |
341 } | |
342 else | |
343 i += amount; | |
344 count = i * p_sw; | |
345 } | |
346 else /* original vi indent */ | |
347 { | |
348 if (left) | |
349 { | |
350 count -= p_sw * amount; | |
351 if (count < 0) | |
352 count = 0; | |
353 } | |
354 else | |
355 count += p_sw * amount; | |
356 } | |
357 | |
358 /* Set new indent */ | |
359 #ifdef FEAT_VREPLACE | |
360 if (State & VREPLACE_FLAG) | |
1516 | 361 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes); |
7 | 362 else |
363 #endif | |
1516 | 364 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0); |
7 | 365 } |
366 | |
367 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
368 /* | |
369 * Shift one line of the current block one shiftwidth right or left. | |
370 * Leaves cursor on first character in block. | |
371 */ | |
372 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
373 shift_block(oparg_T *oap, int amount) |
7 | 374 { |
375 int left = (oap->op_type == OP_LSHIFT); | |
376 int oldstate = State; | |
1839 | 377 int total; |
378 char_u *newp, *oldp; | |
7 | 379 int oldcol = curwin->w_cursor.col; |
5438 | 380 int p_sw = (int)get_sw_value(curbuf); |
7 | 381 int p_ts = (int)curbuf->b_p_ts; |
382 struct block_def bd; | |
383 int incr; | |
1839 | 384 colnr_T ws_vcol; |
7 | 385 int i = 0, j = 0; |
386 int len; | |
387 #ifdef FEAT_RIGHTLEFT | |
388 int old_p_ri = p_ri; | |
389 | |
4352 | 390 p_ri = 0; /* don't want revins in indent */ |
7 | 391 #endif |
392 | |
393 State = INSERT; /* don't want REPLACE for State */ | |
394 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); | |
395 if (bd.is_short) | |
396 return; | |
397 | |
398 /* total is number of screen columns to be inserted/removed */ | |
11997
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
399 total = (int)((unsigned)amount * (unsigned)p_sw); |
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
400 if ((total / p_sw) != amount) |
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
401 return; /* multiplication overflow */ |
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
402 |
7 | 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 } |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
432 for ( ; VIM_ISWHITE(*bd.textstart); ) |
7 | 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) | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
489 MB_PTR_ADV(non_white); |
1839 | 490 |
491 /* The character's column is in "bd.start_vcol". */ | |
492 non_white_col = bd.start_vcol; | |
493 | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
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; | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
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]; |
11597
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1642 y_current = &y_regs[1]; |
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1643 if (!y_append) |
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1644 y_previous = y_current; |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1645 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
|
1646 } |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1647 |
13047
669c4f75a69e
patch 8.0.1399: warnings and errors when building tiny version
Christian Brabandt <cb@256bit.org>
parents:
13037
diff
changeset
|
1648 #ifdef FEAT_AUTOCMD |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1649 static void |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1650 yank_do_autocmd(oparg_T *oap, yankreg_T *reg) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1651 { |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1652 static int recursive = FALSE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1653 dict_T *v_event; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1654 list_T *list; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1655 int n; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1656 char_u buf[NUMBUFLEN + 2]; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1657 long reglen = 0; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1658 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1659 if (recursive) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1660 return; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1661 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1662 v_event = get_vim_var_dict(VV_EVENT); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1663 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1664 list = list_alloc(); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1665 for (n = 0; n < reg->y_size; n++) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1666 list_append_string(list, reg->y_array[n], -1); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1667 list->lv_lock = VAR_FIXED; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1668 dict_add_list(v_event, "regcontents", list); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1669 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1670 buf[0] = (char_u)oap->regname; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1671 buf[1] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1672 dict_add_nr_str(v_event, "regname", 0, buf); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1673 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1674 buf[0] = get_op_char(oap->op_type); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1675 buf[1] = get_extra_op_char(oap->op_type); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1676 buf[2] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1677 dict_add_nr_str(v_event, "operator", 0, buf); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1678 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1679 buf[0] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1680 buf[1] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1681 switch (get_reg_type(oap->regname, ®len)) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1682 { |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1683 case MLINE: buf[0] = 'V'; break; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1684 case MCHAR: buf[0] = 'v'; break; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1685 case MBLOCK: |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1686 vim_snprintf((char *)buf, sizeof(buf), "%c%ld", Ctrl_V, |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1687 reglen + 1); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1688 break; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1689 } |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1690 dict_add_nr_str(v_event, "regtype", 0, buf); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1691 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1692 /* Lock the dictionary and its keys */ |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1693 dict_set_items_ro(v_event); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1694 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1695 recursive = TRUE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1696 textlock++; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1697 apply_autocmds(EVENT_TEXTYANKPOST, NULL, NULL, FALSE, curbuf); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1698 textlock--; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1699 recursive = FALSE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1700 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1701 /* Empty the dictionary, v:event is still valid */ |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1702 dict_free_contents(v_event); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1703 hash_init(&v_event->dv_hashtab); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1704 } |
13047
669c4f75a69e
patch 8.0.1399: warnings and errors when building tiny version
Christian Brabandt <cb@256bit.org>
parents:
13037
diff
changeset
|
1705 #endif |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1706 |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1707 /* |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1708 * Handle a delete operation. |
7 | 1709 * |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1710 * Return FAIL if undo failed, OK otherwise. |
7 | 1711 */ |
1712 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1713 op_delete(oparg_T *oap) |
7 | 1714 { |
1715 int n; | |
1716 linenr_T lnum; | |
1717 char_u *ptr; | |
1718 char_u *newp, *oldp; | |
1719 struct block_def bd; | |
1720 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
1721 int did_yank = FALSE; | |
3782 | 1722 int orig_regname = oap->regname; |
7 | 1723 |
1724 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
1725 return OK; | |
1726 | |
1727 /* Nothing to delete, return here. Do prepare undo, for op_change(). */ | |
1728 if (oap->empty) | |
1729 return u_save_cursor(); | |
1730 | |
1731 if (!curbuf->b_p_ma) | |
1732 { | |
1733 EMSG(_(e_modifiable)); | |
1734 return FAIL; | |
1735 } | |
1736 | |
1737 #ifdef FEAT_CLIPBOARD | |
1738 adjust_clip_reg(&oap->regname); | |
1739 #endif | |
1740 | |
1741 #ifdef FEAT_MBYTE | |
1742 if (has_mbyte) | |
1743 mb_adjust_opend(oap); | |
1744 #endif | |
1745 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1746 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1747 * 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
|
1748 * 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
|
1749 * 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
|
1750 */ |
7 | 1751 if ( oap->motion_type == MCHAR |
1752 && !oap->is_VIsual | |
50 | 1753 && !oap->block_mode |
7 | 1754 && oap->line_count > 1 |
3254 | 1755 && oap->motion_force == NUL |
7 | 1756 && oap->op_type == OP_DELETE) |
1757 { | |
2957 | 1758 ptr = ml_get(oap->end.lnum) + oap->end.col; |
1759 if (*ptr != NUL) | |
1760 ptr += oap->inclusive; | |
7 | 1761 ptr = skipwhite(ptr); |
1762 if (*ptr == NUL && inindent(0)) | |
1763 oap->motion_type = MLINE; | |
1764 } | |
1765 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1766 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1767 * 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
|
1768 * 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
|
1769 */ |
7 | 1770 if ( oap->motion_type == MCHAR |
1771 && oap->line_count == 1 | |
1772 && oap->op_type == OP_DELETE | |
1773 && *ml_get(oap->start.lnum) == NUL) | |
1774 { | |
1775 /* | |
446 | 1776 * It's an error to operate on an empty region, when 'E' included in |
7 | 1777 * 'cpoptions' (Vi compatible). |
1778 */ | |
446 | 1779 #ifdef FEAT_VIRTUALEDIT |
1780 if (virtual_op) | |
1781 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
1782 * marks as if it happened. */ | |
1783 goto setmarks; | |
1784 #endif | |
7 | 1785 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
1786 beep_flush(); | |
1787 return OK; | |
1788 } | |
1789 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1790 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1791 * 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
|
1792 * 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
|
1793 * 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
|
1794 */ |
7 | 1795 if (oap->regname != '_') |
1796 { | |
1797 if (oap->regname != 0) | |
1798 { | |
1799 /* check for read-only register */ | |
1800 if (!valid_yank_reg(oap->regname, TRUE)) | |
1801 { | |
1802 beep_flush(); | |
1803 return OK; | |
1804 } | |
1805 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
1806 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
1807 did_yank = TRUE; | |
1808 } | |
1809 | |
1810 /* | |
1811 * Put deleted text into register 1 and shift number registers if the | |
1812 * delete contains a line break, or when a regname has been specified. | |
3782 | 1813 * Use the register name from before adjust_clip_reg() may have |
1814 * changed it. | |
7 | 1815 */ |
3782 | 1816 if (orig_regname != 0 || oap->motion_type == MLINE |
7 | 1817 || oap->line_count > 1 || oap->use_reg_one) |
1818 { | |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1819 shift_delete_registers(); |
7 | 1820 if (op_yank(oap, TRUE, FALSE) == OK) |
1821 did_yank = TRUE; | |
1822 } | |
1823 | |
3468 | 1824 /* Yank into small delete register when no named register specified |
1825 * and the delete is within one line. */ | |
1826 if (( | |
1827 #ifdef FEAT_CLIPBOARD | |
3584 | 1828 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
1829 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
3468 | 1830 #endif |
1831 oap->regname == 0) && oap->motion_type != MLINE | |
7 | 1832 && oap->line_count == 1) |
1833 { | |
1834 oap->regname = '-'; | |
1835 get_yank_register(oap->regname, TRUE); | |
1836 if (op_yank(oap, TRUE, FALSE) == OK) | |
1837 did_yank = TRUE; | |
1838 oap->regname = 0; | |
1839 } | |
1840 | |
1841 /* | |
1842 * If there's too much stuff to fit in the yank register, then get a | |
1843 * confirmation before doing the delete. This is crude, but simple. | |
1844 * And it avoids doing a delete of something we can't put back if we | |
1845 * want. | |
1846 */ | |
1847 if (!did_yank) | |
1848 { | |
1849 int msg_silent_save = msg_silent; | |
1850 | |
1851 msg_silent = 0; /* must display the prompt */ | |
1852 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
1853 msg_silent = msg_silent_save; | |
1854 if (n != 'y') | |
1855 { | |
1856 EMSG(_(e_abort)); | |
1857 return FAIL; | |
1858 } | |
1859 } | |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1860 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1861 #ifdef FEAT_AUTOCMD |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1862 if (did_yank && has_textyankpost()) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1863 yank_do_autocmd(oap, y_current); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1864 #endif |
7 | 1865 } |
1866 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1867 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1868 * 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
|
1869 */ |
7 | 1870 if (oap->block_mode) |
1871 { | |
1872 if (u_save((linenr_T)(oap->start.lnum - 1), | |
1873 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
1874 return FAIL; | |
1875 | |
1876 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
1877 { | |
1878 block_prep(oap, &bd, lnum, TRUE); | |
1879 if (bd.textlen == 0) /* nothing to delete */ | |
1880 continue; | |
1881 | |
1882 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
1883 if (lnum == curwin->w_cursor.lnum) | |
1884 { | |
1885 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
1886 # ifdef FEAT_VIRTUALEDIT | |
1887 curwin->w_cursor.coladd = 0; | |
1888 # endif | |
1889 } | |
1890 | |
1891 /* n == number of chars deleted | |
1892 * If we delete a TAB, it may be replaced by several characters. | |
1893 * Thus the number of characters may increase! | |
1894 */ | |
1895 n = bd.textlen - bd.startspaces - bd.endspaces; | |
1896 oldp = ml_get(lnum); | |
1897 newp = alloc_check((unsigned)STRLEN(oldp) + 1 - n); | |
1898 if (newp == NULL) | |
1899 continue; | |
1900 /* copy up to deleted part */ | |
1901 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
1902 /* insert spaces */ | |
6929 | 1903 vim_memset(newp + bd.textcol, ' ', |
7 | 1904 (size_t)(bd.startspaces + bd.endspaces)); |
1905 /* copy the part after the deleted part */ | |
1906 oldp += bd.textcol + bd.textlen; | |
1622 | 1907 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
7 | 1908 /* replace the line */ |
1909 ml_replace(lnum, newp, FALSE); | |
1910 } | |
1911 | |
1912 check_cursor_col(); | |
1913 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
1914 oap->end.lnum + 1, 0L); | |
1915 oap->line_count = 0; /* no lines deleted */ | |
1916 } | |
5735 | 1917 else if (oap->motion_type == MLINE) |
7 | 1918 { |
1919 if (oap->op_type == OP_CHANGE) | |
1920 { | |
1921 /* Delete the lines except the first one. Temporarily move the | |
1922 * cursor to the next line. Save the current line number, if the | |
1923 * last line is deleted it may be changed. | |
1924 */ | |
1925 if (oap->line_count > 1) | |
1926 { | |
1927 lnum = curwin->w_cursor.lnum; | |
1928 ++curwin->w_cursor.lnum; | |
1929 del_lines((long)(oap->line_count - 1), TRUE); | |
1930 curwin->w_cursor.lnum = lnum; | |
1931 } | |
1932 if (u_save_cursor() == FAIL) | |
1933 return FAIL; | |
1934 if (curbuf->b_p_ai) /* don't delete indent */ | |
1935 { | |
1936 beginline(BL_WHITE); /* cursor on first non-white */ | |
1937 did_ai = TRUE; /* delete the indent when ESC hit */ | |
1938 ai_col = curwin->w_cursor.col; | |
1939 } | |
1940 else | |
1941 beginline(0); /* cursor in column 0 */ | |
1942 truncate_line(FALSE); /* delete the rest of the line */ | |
1943 /* leave cursor past last char in line */ | |
1944 if (oap->line_count > 1) | |
1945 u_clearline(); /* "U" command not possible after "2cc" */ | |
1946 } | |
1947 else | |
1948 { | |
1949 del_lines(oap->line_count, TRUE); | |
1950 beginline(BL_WHITE | BL_FIX); | |
1951 u_clearline(); /* "U" command not possible after "dd" */ | |
1952 } | |
1953 } | |
1954 else | |
1955 { | |
1956 #ifdef FEAT_VIRTUALEDIT | |
1957 if (virtual_op) | |
1958 { | |
1959 int endcol = 0; | |
1960 | |
1961 /* For virtualedit: break the tabs that are partly included. */ | |
1962 if (gchar_pos(&oap->start) == '\t') | |
1963 { | |
1964 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
1965 return FAIL; | |
1966 if (oap->line_count == 1) | |
1967 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
1968 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
1969 oap->start = curwin->w_cursor; | |
1970 if (oap->line_count == 1) | |
1971 { | |
1972 coladvance(endcol); | |
1973 oap->end.col = curwin->w_cursor.col; | |
1974 oap->end.coladd = curwin->w_cursor.coladd; | |
1975 curwin->w_cursor = oap->start; | |
1976 } | |
1977 } | |
1978 | |
1979 /* Break a tab only when it's included in the area. */ | |
1980 if (gchar_pos(&oap->end) == '\t' | |
1981 && (int)oap->end.coladd < oap->inclusive) | |
1982 { | |
1983 /* save last line for undo */ | |
1984 if (u_save((linenr_T)(oap->end.lnum - 1), | |
1985 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
1986 return FAIL; | |
1987 curwin->w_cursor = oap->end; | |
1988 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
1989 oap->end = curwin->w_cursor; | |
1990 curwin->w_cursor = oap->start; | |
1991 } | |
1992 } | |
1993 #endif | |
1994 | |
1995 if (oap->line_count == 1) /* delete characters within one line */ | |
1996 { | |
1997 if (u_save_cursor() == FAIL) /* save line for undo */ | |
1998 return FAIL; | |
1999 | |
2000 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
5735 | 2001 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
7 | 2002 && oap->op_type == OP_CHANGE |
2003 && oap->end.lnum == curwin->w_cursor.lnum | |
5735 | 2004 && !oap->is_VIsual) |
7 | 2005 display_dollar(oap->end.col - !oap->inclusive); |
2006 | |
2007 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
2008 | |
2009 #ifdef FEAT_VIRTUALEDIT | |
2010 if (virtual_op) | |
2011 { | |
2012 /* fix up things for virtualedit-delete: | |
2013 * break the tabs which are going to get in our way | |
2014 */ | |
2015 char_u *curline = ml_get_curline(); | |
2016 int len = (int)STRLEN(curline); | |
2017 | |
2018 if (oap->end.coladd != 0 | |
2019 && (int)oap->end.col >= len - 1 | |
2020 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
2021 n++; | |
2022 /* Delete at least one char (e.g, when on a control char). */ | |
2023 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
2024 n = 1; | |
2025 | |
2026 /* When deleted a char in the line, reset coladd. */ | |
2027 if (gchar_cursor() != NUL) | |
2028 curwin->w_cursor.coladd = 0; | |
2029 } | |
2030 #endif | |
6826 | 2031 (void)del_bytes((long)n, !virtual_op, |
2032 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
7 | 2033 } |
2034 else /* delete characters between lines */ | |
2035 { | |
2036 pos_T curpos; | |
2037 | |
2038 /* save deleted and changed lines for undo */ | |
2039 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
2040 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
2041 return FAIL; | |
2042 | |
2043 truncate_line(TRUE); /* delete from cursor to end of line */ | |
2044 | |
2045 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
2046 ++curwin->w_cursor.lnum; | |
2047 del_lines((long)(oap->line_count - 2), FALSE); | |
2048 | |
6826 | 2049 /* delete from start of line until op_end */ |
2957 | 2050 n = (oap->end.col + 1 - !oap->inclusive); |
6826 | 2051 curwin->w_cursor.col = 0; |
2052 (void)del_bytes((long)n, !virtual_op, | |
2053 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
2054 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
2055 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
7 | 2056 } |
2057 } | |
2058 | |
2059 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
2060 | |
446 | 2061 #ifdef FEAT_VIRTUALEDIT |
2062 setmarks: | |
2063 #endif | |
7 | 2064 if (oap->block_mode) |
2065 { | |
2066 curbuf->b_op_end.lnum = oap->end.lnum; | |
2067 curbuf->b_op_end.col = oap->start.col; | |
2068 } | |
2069 else | |
2070 curbuf->b_op_end = oap->start; | |
2071 curbuf->b_op_start = oap->start; | |
2072 | |
2073 return OK; | |
2074 } | |
2075 | |
2076 #ifdef FEAT_MBYTE | |
2077 /* | |
2078 * Adjust end of operating area for ending on a multi-byte character. | |
2079 * Used for deletion. | |
2080 */ | |
2081 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2082 mb_adjust_opend(oparg_T *oap) |
7 | 2083 { |
2084 char_u *p; | |
2085 | |
2086 if (oap->inclusive) | |
2087 { | |
2088 p = ml_get(oap->end.lnum); | |
2089 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
2090 } | |
2091 } | |
2092 #endif | |
2093 | |
2094 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
2095 /* | |
2096 * Replace a whole area with one character. | |
2097 */ | |
2098 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2099 op_replace(oparg_T *oap, int c) |
7 | 2100 { |
2101 int n, numc; | |
2102 #ifdef FEAT_MBYTE | |
2103 int num_chars; | |
2104 #endif | |
2105 char_u *newp, *oldp; | |
2106 size_t oldlen; | |
2107 struct block_def bd; | |
5428 | 2108 char_u *after_p = NULL; |
2109 int had_ctrl_v_cr = (c == -1 || c == -2); | |
7 | 2110 |
2111 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
2112 return OK; /* nothing to do */ | |
2113 | |
5428 | 2114 if (had_ctrl_v_cr) |
2115 c = (c == -1 ? '\r' : '\n'); | |
2116 | |
7 | 2117 #ifdef FEAT_MBYTE |
2118 if (has_mbyte) | |
2119 mb_adjust_opend(oap); | |
2120 #endif | |
2121 | |
2122 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2123 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2124 return FAIL; | |
2125 | |
2126 /* | |
2127 * block mode replace | |
2128 */ | |
2129 if (oap->block_mode) | |
2130 { | |
2131 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2132 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
2133 { | |
1982 | 2134 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
7 | 2135 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
2136 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
2137 continue; /* nothing to replace */ | |
2138 | |
2139 /* n == number of extra chars required | |
2140 * If we split a TAB, it may be replaced by several characters. | |
2141 * Thus the number of characters may increase! | |
2142 */ | |
2143 #ifdef FEAT_VIRTUALEDIT | |
2144 /* If the range starts in virtual space, count the initial | |
2145 * coladd offset as part of "startspaces" */ | |
2146 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
2147 { | |
2148 pos_T vpos; | |
2149 | |
1982 | 2150 vpos.lnum = curwin->w_cursor.lnum; |
7 | 2151 getvpos(&vpos, oap->start_vcol); |
2152 bd.startspaces += vpos.coladd; | |
2153 n = bd.startspaces; | |
2154 } | |
2155 else | |
2156 #endif | |
2157 /* allow for pre spaces */ | |
2158 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
2159 | |
2160 /* allow for post spp */ | |
2161 n += (bd.endspaces | |
2162 #ifdef FEAT_VIRTUALEDIT | |
2163 && !bd.is_oneChar | |
2164 #endif | |
2165 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
2166 /* Figure out how many characters to replace. */ | |
2167 numc = oap->end_vcol - oap->start_vcol + 1; | |
2168 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
2169 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
2170 | |
2171 #ifdef FEAT_MBYTE | |
2172 /* A double-wide character can be replaced only up to half the | |
2173 * times. */ | |
2174 if ((*mb_char2cells)(c) > 1) | |
2175 { | |
2176 if ((numc & 1) && !bd.is_short) | |
2177 { | |
2178 ++bd.endspaces; | |
2179 ++n; | |
2180 } | |
2181 numc = numc / 2; | |
2182 } | |
2183 | |
2184 /* Compute bytes needed, move character count to num_chars. */ | |
2185 num_chars = numc; | |
2186 numc *= (*mb_char2len)(c); | |
2187 #endif | |
2188 /* oldlen includes textlen, so don't double count */ | |
2189 n += numc - bd.textlen; | |
2190 | |
2191 oldp = ml_get_curline(); | |
2192 oldlen = STRLEN(oldp); | |
2193 newp = alloc_check((unsigned)oldlen + 1 + n); | |
2194 if (newp == NULL) | |
2195 continue; | |
2196 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
2197 /* copy up to deleted part */ | |
2198 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2199 oldp += bd.textcol + bd.textlen; | |
2200 /* insert pre-spaces */ | |
6929 | 2201 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
7 | 2202 /* insert replacement chars CHECK FOR ALLOCATED SPACE */ |
5428 | 2203 /* -1/-2 is used for entering CR literally. */ |
2204 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) | |
7 | 2205 { |
5428 | 2206 #ifdef FEAT_MBYTE |
2207 if (has_mbyte) | |
2208 { | |
2209 n = (int)STRLEN(newp); | |
2210 while (--num_chars >= 0) | |
2211 n += (*mb_char2bytes)(c, newp + n); | |
2212 } | |
2213 else | |
2214 #endif | |
6929 | 2215 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
5428 | 2216 if (!bd.is_short) |
2217 { | |
2218 /* insert post-spaces */ | |
6929 | 2219 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
5428 | 2220 /* copy the part after the changed part */ |
2221 STRMOVE(newp + STRLEN(newp), oldp); | |
2222 } | |
7 | 2223 } |
2224 else | |
2225 { | |
5428 | 2226 /* Replacing with \r or \n means splitting the line. */ |
5475 | 2227 after_p = alloc_check( |
2228 (unsigned)(oldlen + 1 + n - STRLEN(newp))); | |
5428 | 2229 if (after_p != NULL) |
2230 STRMOVE(after_p, oldp); | |
7 | 2231 } |
2232 /* replace the line */ | |
2233 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
5428 | 2234 if (after_p != NULL) |
2235 { | |
2236 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
2237 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
2238 oap->end.lnum++; | |
2239 vim_free(after_p); | |
2240 } | |
7 | 2241 } |
2242 } | |
2243 else | |
2244 { | |
2245 /* | |
2246 * MCHAR and MLINE motion replace. | |
2247 */ | |
2248 if (oap->motion_type == MLINE) | |
2249 { | |
2250 oap->start.col = 0; | |
2251 curwin->w_cursor.col = 0; | |
2252 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2253 if (oap->end.col) | |
2254 --oap->end.col; | |
2255 } | |
2256 else if (!oap->inclusive) | |
2257 dec(&(oap->end)); | |
2258 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2259 while (LTOREQ_POS(curwin->w_cursor, oap->end)) |
7 | 2260 { |
2261 n = gchar_cursor(); | |
2262 if (n != NUL) | |
2263 { | |
2264 #ifdef FEAT_MBYTE | |
2265 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
2266 { | |
2267 /* This is slow, but it handles replacing a single-byte | |
2268 * with a multi-byte and the other way around. */ | |
4203 | 2269 if (curwin->w_cursor.lnum == oap->end.lnum) |
2270 oap->end.col += (*mb_char2len)(c) - (*mb_char2len)(n); | |
7 | 2271 n = State; |
2272 State = REPLACE; | |
2273 ins_char(c); | |
2274 State = n; | |
2275 /* Backup to the replaced character. */ | |
2276 dec_cursor(); | |
2277 } | |
2278 else | |
2279 #endif | |
2280 { | |
2281 #ifdef FEAT_VIRTUALEDIT | |
2282 if (n == TAB) | |
2283 { | |
2284 int end_vcol = 0; | |
2285 | |
2286 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2287 { | |
2288 /* oap->end has to be recalculated when | |
2289 * the tab breaks */ | |
2290 end_vcol = getviscol2(oap->end.col, | |
2291 oap->end.coladd); | |
2292 } | |
2293 coladvance_force(getviscol()); | |
2294 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2295 getvpos(&oap->end, end_vcol); | |
2296 } | |
2297 #endif | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2298 PCHAR(curwin->w_cursor, c); |
7 | 2299 } |
2300 } | |
2301 #ifdef FEAT_VIRTUALEDIT | |
2302 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
2303 { | |
2304 int virtcols = oap->end.coladd; | |
2305 | |
2306 if (curwin->w_cursor.lnum == oap->start.lnum | |
2307 && oap->start.col == oap->end.col && oap->start.coladd) | |
2308 virtcols -= oap->start.coladd; | |
2309 | |
2310 /* oap->end has been trimmed so it's effectively inclusive; | |
2311 * as a result an extra +1 must be counted so we don't | |
2312 * trample the NUL byte. */ | |
2313 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
2314 curwin->w_cursor.col -= (virtcols + 1); | |
2315 for (; virtcols >= 0; virtcols--) | |
2316 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2317 PCHAR(curwin->w_cursor, c); |
7 | 2318 if (inc(&curwin->w_cursor) == -1) |
2319 break; | |
2320 } | |
2321 } | |
2322 #endif | |
2323 | |
2324 /* Advance to next character, stop at the end of the file. */ | |
2325 if (inc_cursor() == -1) | |
2326 break; | |
2327 } | |
2328 } | |
2329 | |
2330 curwin->w_cursor = oap->start; | |
2331 check_cursor(); | |
2332 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
2333 | |
2334 /* Set "'[" and "']" marks. */ | |
2335 curbuf->b_op_start = oap->start; | |
2336 curbuf->b_op_end = oap->end; | |
2337 | |
2338 return OK; | |
2339 } | |
2340 #endif | |
2341 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2342 static int swapchars(int op_type, pos_T *pos, int length); |
1525 | 2343 |
7 | 2344 /* |
2345 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
2346 */ | |
2347 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2348 op_tilde(oparg_T *oap) |
7 | 2349 { |
2350 pos_T pos; | |
2351 struct block_def bd; | |
1528 | 2352 int did_change = FALSE; |
7 | 2353 |
2354 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2355 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2356 return; | |
2357 | |
2358 pos = oap->start; | |
2359 if (oap->block_mode) /* Visual block mode */ | |
2360 { | |
2361 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
2362 { | |
1766 | 2363 int one_change; |
2364 | |
7 | 2365 block_prep(oap, &bd, pos.lnum, FALSE); |
2366 pos.col = bd.textcol; | |
1766 | 2367 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
2368 did_change |= one_change; | |
1525 | 2369 |
5735 | 2370 #ifdef FEAT_NETBEANS_INTG |
2210 | 2371 if (netbeans_active() && one_change) |
7 | 2372 { |
2373 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2374 | |
33 | 2375 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
2376 (long)bd.textlen); | |
7 | 2377 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
2210 | 2378 &ptr[bd.textcol], bd.textlen); |
7 | 2379 } |
5735 | 2380 #endif |
7 | 2381 } |
2382 if (did_change) | |
2383 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
2384 } | |
2385 else /* not block mode */ | |
2386 { | |
2387 if (oap->motion_type == MLINE) | |
2388 { | |
2389 oap->start.col = 0; | |
2390 pos.col = 0; | |
2391 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2392 if (oap->end.col) | |
2393 --oap->end.col; | |
2394 } | |
2395 else if (!oap->inclusive) | |
2396 dec(&(oap->end)); | |
2397 | |
1528 | 2398 if (pos.lnum == oap->end.lnum) |
2399 did_change = swapchars(oap->op_type, &pos, | |
2400 oap->end.col - pos.col + 1); | |
2401 else | |
2402 for (;;) | |
2403 { | |
2404 did_change |= swapchars(oap->op_type, &pos, | |
2405 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
2406 (int)STRLEN(ml_get_pos(&pos))); | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2407 if (LTOREQ_POS(oap->end, pos) || inc(&pos) == -1) |
1528 | 2408 break; |
2409 } | |
7 | 2410 if (did_change) |
2411 { | |
2412 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
2413 0L); | |
2414 #ifdef FEAT_NETBEANS_INTG | |
2210 | 2415 if (netbeans_active() && did_change) |
7 | 2416 { |
2417 char_u *ptr; | |
2418 int count; | |
2419 | |
2420 pos = oap->start; | |
2421 while (pos.lnum < oap->end.lnum) | |
2422 { | |
2423 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
835 | 2424 count = (int)STRLEN(ptr) - pos.col; |
33 | 2425 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2426 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2427 &ptr[pos.col], count); |
7 | 2428 pos.col = 0; |
2429 pos.lnum++; | |
2430 } | |
2431 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2432 count = oap->end.col - pos.col + 1; | |
33 | 2433 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2434 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2435 &ptr[pos.col], count); |
7 | 2436 } |
2437 #endif | |
2438 } | |
2439 } | |
2440 | |
2441 if (!did_change && oap->is_VIsual) | |
2442 /* No change: need to remove the Visual selection */ | |
2443 redraw_curbuf_later(INVERTED); | |
2444 | |
2445 /* | |
2446 * Set '[ and '] marks. | |
2447 */ | |
2448 curbuf->b_op_start = oap->start; | |
2449 curbuf->b_op_end = oap->end; | |
2450 | |
2451 if (oap->line_count > p_report) | |
2452 { | |
2453 if (oap->line_count == 1) | |
2454 MSG(_("1 line changed")); | |
2455 else | |
2456 smsg((char_u *)_("%ld lines changed"), oap->line_count); | |
2457 } | |
2458 } | |
2459 | |
2460 /* | |
1525 | 2461 * Invoke swapchar() on "length" bytes at position "pos". |
2462 * "pos" is advanced to just after the changed characters. | |
2463 * "length" is rounded up to include the whole last multi-byte character. | |
2464 * Also works correctly when the number of bytes changes. | |
2465 * Returns TRUE if some character was changed. | |
2466 */ | |
2467 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2468 swapchars(int op_type, pos_T *pos, int length) |
1525 | 2469 { |
2470 int todo; | |
2471 int did_change = 0; | |
2472 | |
2473 for (todo = length; todo > 0; --todo) | |
2474 { | |
2475 # ifdef FEAT_MBYTE | |
2476 if (has_mbyte) | |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2477 { |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2478 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2479 |
1525 | 2480 /* we're counting bytes, not characters */ |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2481 if (len > 0) |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2482 todo -= len - 1; |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2483 } |
1525 | 2484 # endif |
2485 did_change |= swapchar(op_type, pos); | |
2486 if (inc(pos) == -1) /* at end of file */ | |
2487 break; | |
2488 } | |
2489 return did_change; | |
2490 } | |
2491 | |
2492 /* | |
7 | 2493 * If op_type == OP_UPPER: make uppercase, |
2494 * if op_type == OP_LOWER: make lowercase, | |
2495 * if op_type == OP_ROT13: do rot13 encoding, | |
2496 * else swap case of character at 'pos' | |
2497 * returns TRUE when something actually changed. | |
2498 */ | |
2499 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2500 swapchar(int op_type, pos_T *pos) |
7 | 2501 { |
2502 int c; | |
2503 int nc; | |
2504 | |
2505 c = gchar_pos(pos); | |
2506 | |
2507 /* Only do rot13 encoding for ASCII characters. */ | |
2508 if (c >= 0x80 && op_type == OP_ROT13) | |
2509 return FALSE; | |
2510 | |
2511 #ifdef FEAT_MBYTE | |
1525 | 2512 if (op_type == OP_UPPER && c == 0xdf |
2513 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
493 | 2514 { |
2515 pos_T sp = curwin->w_cursor; | |
2516 | |
2517 /* Special handling of German sharp s: change to "SS". */ | |
2518 curwin->w_cursor = *pos; | |
2519 del_char(FALSE); | |
2520 ins_char('S'); | |
2521 ins_char('S'); | |
2522 curwin->w_cursor = sp; | |
2523 inc(pos); | |
2524 } | |
2525 | |
7 | 2526 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
2527 return FALSE; | |
2528 #endif | |
2529 nc = c; | |
2530 if (MB_ISLOWER(c)) | |
2531 { | |
2532 if (op_type == OP_ROT13) | |
2533 nc = ROT13(c, 'a'); | |
2534 else if (op_type != OP_LOWER) | |
2535 nc = MB_TOUPPER(c); | |
2536 } | |
2537 else if (MB_ISUPPER(c)) | |
2538 { | |
2539 if (op_type == OP_ROT13) | |
2540 nc = ROT13(c, 'A'); | |
2541 else if (op_type != OP_UPPER) | |
2542 nc = MB_TOLOWER(c); | |
2543 } | |
2544 if (nc != c) | |
2545 { | |
2546 #ifdef FEAT_MBYTE | |
2547 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
2548 { | |
2549 pos_T sp = curwin->w_cursor; | |
2550 | |
2551 curwin->w_cursor = *pos; | |
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2552 /* 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
|
2553 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
7 | 2554 ins_char(nc); |
2555 curwin->w_cursor = sp; | |
2556 } | |
2557 else | |
2558 #endif | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2559 PCHAR(*pos, nc); |
7 | 2560 return TRUE; |
2561 } | |
2562 return FALSE; | |
2563 } | |
2564 | |
2565 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
2566 /* | |
2567 * op_insert - Insert and append operators for Visual mode. | |
2568 */ | |
2569 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2570 op_insert(oparg_T *oap, long count1) |
7 | 2571 { |
2572 long ins_len, pre_textlen = 0; | |
2573 char_u *firstline, *ins_text; | |
12329
0b10cff73322
patch 8.0.1044: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12327
diff
changeset
|
2574 colnr_T ind_pre = 0, ind_post; |
7 | 2575 struct block_def bd; |
2576 int i; | |
6579 | 2577 pos_T t1; |
7 | 2578 |
2579 /* edit() changes this - record it for OP_APPEND */ | |
2580 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2581 | |
2582 /* vis block is still marked. Get rid of it now. */ | |
2583 curwin->w_cursor.lnum = oap->start.lnum; | |
2584 update_screen(INVERTED); | |
2585 | |
2586 if (oap->block_mode) | |
2587 { | |
2588 #ifdef FEAT_VIRTUALEDIT | |
2589 /* When 'virtualedit' is used, need to insert the extra spaces before | |
2590 * doing block_prep(). When only "block" is used, virtual edit is | |
2591 * already disabled, but still need it when calling | |
2592 * coladvance_force(). */ | |
2593 if (curwin->w_cursor.coladd > 0) | |
2594 { | |
2595 int old_ve_flags = ve_flags; | |
2596 | |
2597 ve_flags = VE_ALL; | |
2598 if (u_save_cursor() == FAIL) | |
2599 return; | |
2600 coladvance_force(oap->op_type == OP_APPEND | |
2601 ? oap->end_vcol + 1 : getviscol()); | |
2602 if (oap->op_type == OP_APPEND) | |
2603 --curwin->w_cursor.col; | |
2604 ve_flags = old_ve_flags; | |
2605 } | |
2606 #endif | |
2607 /* Get the info about the block before entering the text */ | |
2608 block_prep(oap, &bd, oap->start.lnum, TRUE); | |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2609 /* Get indent information */ |
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2610 ind_pre = (colnr_T)getwhitecols_curline(); |
7 | 2611 firstline = ml_get(oap->start.lnum) + bd.textcol; |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2612 |
7 | 2613 if (oap->op_type == OP_APPEND) |
2614 firstline += bd.textlen; | |
2615 pre_textlen = (long)STRLEN(firstline); | |
2616 } | |
2617 | |
2618 if (oap->op_type == OP_APPEND) | |
2619 { | |
2620 if (oap->block_mode | |
2621 #ifdef FEAT_VIRTUALEDIT | |
2622 && curwin->w_cursor.coladd == 0 | |
2623 #endif | |
2624 ) | |
2625 { | |
2626 /* Move the cursor to the character right of the block. */ | |
2627 curwin->w_set_curswant = TRUE; | |
2628 while (*ml_get_cursor() != NUL | |
2629 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
2630 ++curwin->w_cursor.col; | |
2631 if (bd.is_short && !bd.is_MAX) | |
2632 { | |
2633 /* First line was too short, make it longer and adjust the | |
2634 * values in "bd". */ | |
2635 if (u_save_cursor() == FAIL) | |
2636 return; | |
2637 for (i = 0; i < bd.endspaces; ++i) | |
2638 ins_char(' '); | |
2639 bd.textlen += bd.endspaces; | |
2640 } | |
2641 } | |
2642 else | |
2643 { | |
2644 curwin->w_cursor = oap->end; | |
893 | 2645 check_cursor_col(); |
7 | 2646 |
2647 /* Works just like an 'i'nsert on the next character. */ | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2648 if (!LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2649 && oap->start_vcol != oap->end_vcol) |
2650 inc_cursor(); | |
2651 } | |
2652 } | |
2653 | |
6579 | 2654 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
|
2655 (void)edit(NUL, FALSE, (linenr_T)count1); |
7 | 2656 |
6579 | 2657 /* When a tab was inserted, and the characters in front of the tab |
2658 * have been converted to a tab as well, the column of the cursor | |
2659 * might have actually been reduced, so need to adjust here. */ | |
2660 if (t1.lnum == curbuf->b_op_start_orig.lnum | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2661 && LT_POS(curbuf->b_op_start_orig, t1)) |
6579 | 2662 oap->start = curbuf->b_op_start_orig; |
2663 | |
1477 | 2664 /* If user has moved off this line, we don't know what to do, so do |
2665 * nothing. | |
2666 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
2667 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
7 | 2668 return; |
2669 | |
2670 if (oap->block_mode) | |
2671 { | |
2672 struct block_def bd2; | |
2673 | |
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2674 /* If indent kicked in, the firstline might have changed |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2675 * but only do that, if the indent actually increased. */ |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2676 ind_post = (colnr_T)getwhitecols_curline(); |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2677 if (curbuf->b_op_start.col > ind_pre && ind_post > ind_pre) |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2678 { |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2679 bd.textcol += ind_post - ind_pre; |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2680 bd.start_vcol += ind_post - ind_pre; |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2681 } |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2682 |
5471 | 2683 /* The user may have moved the cursor before inserting something, try |
2684 * to adjust the block for that. */ | |
5680 | 2685 if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX) |
5471 | 2686 { |
2687 if (oap->op_type == OP_INSERT | |
5730 | 2688 && oap->start.col |
2689 #ifdef FEAT_VIRTUALEDIT | |
2690 + oap->start.coladd | |
2691 #endif | |
2692 != curbuf->b_op_start_orig.col | |
2693 #ifdef FEAT_VIRTUALEDIT | |
2694 + curbuf->b_op_start_orig.coladd | |
2695 #endif | |
2696 ) | |
5471 | 2697 { |
6579 | 2698 int t = getviscol2(curbuf->b_op_start_orig.col, |
2699 curbuf->b_op_start_orig.coladd); | |
5680 | 2700 oap->start.col = curbuf->b_op_start_orig.col; |
6579 | 2701 pre_textlen -= t - oap->start_vcol; |
2702 oap->start_vcol = t; | |
5471 | 2703 } |
2704 else if (oap->op_type == OP_APPEND | |
5730 | 2705 && oap->end.col |
2706 #ifdef FEAT_VIRTUALEDIT | |
2707 + oap->end.coladd | |
2708 #endif | |
2709 >= curbuf->b_op_start_orig.col | |
2710 #ifdef FEAT_VIRTUALEDIT | |
2711 + curbuf->b_op_start_orig.coladd | |
2712 #endif | |
2713 ) | |
5471 | 2714 { |
6579 | 2715 int t = getviscol2(curbuf->b_op_start_orig.col, |
2716 curbuf->b_op_start_orig.coladd); | |
5680 | 2717 oap->start.col = curbuf->b_op_start_orig.col; |
5471 | 2718 /* reset pre_textlen to the value of OP_INSERT */ |
2719 pre_textlen += bd.textlen; | |
6579 | 2720 pre_textlen -= t - oap->start_vcol; |
2721 oap->start_vcol = t; | |
5471 | 2722 oap->op_type = OP_INSERT; |
2723 } | |
2724 } | |
2725 | |
7 | 2726 /* |
2727 * Spaces and tabs in the indent may have changed to other spaces and | |
1392 | 2728 * tabs. Get the starting column again and correct the length. |
7 | 2729 * Don't do this when "$" used, end-of-line will have changed. |
2730 */ | |
2731 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
2732 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
2733 { | |
2734 if (oap->op_type == OP_APPEND) | |
2735 { | |
2736 pre_textlen += bd2.textlen - bd.textlen; | |
2737 if (bd2.endspaces) | |
2738 --bd2.textlen; | |
2739 } | |
2740 bd.textcol = bd2.textcol; | |
2741 bd.textlen = bd2.textlen; | |
2742 } | |
2743 | |
2744 /* | |
2745 * Subsequent calls to ml_get() flush the firstline data - take a | |
2746 * copy of the required string. | |
2747 */ | |
2748 firstline = ml_get(oap->start.lnum) + bd.textcol; | |
2749 if (oap->op_type == OP_APPEND) | |
2750 firstline += bd.textlen; | |
3421 | 2751 if (pre_textlen >= 0 |
2752 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
7 | 2753 { |
2754 ins_text = vim_strnsave(firstline, (int)ins_len); | |
2755 if (ins_text != NULL) | |
2756 { | |
2757 /* block handled here */ | |
2758 if (u_save(oap->start.lnum, | |
2759 (linenr_T)(oap->end.lnum + 1)) == OK) | |
2760 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
2761 &bd); | |
2762 | |
2763 curwin->w_cursor.col = oap->start.col; | |
2764 check_cursor(); | |
2765 vim_free(ins_text); | |
2766 } | |
2767 } | |
2768 } | |
2769 } | |
2770 #endif | |
2771 | |
2772 /* | |
2773 * op_change - handle a change operation | |
2774 * | |
2775 * return TRUE if edit() returns because of a CTRL-O command | |
2776 */ | |
2777 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2778 op_change(oparg_T *oap) |
7 | 2779 { |
2780 colnr_T l; | |
2781 int retval; | |
2782 #ifdef FEAT_VISUALEXTRA | |
2783 long offset; | |
2784 linenr_T linenr; | |
1392 | 2785 long ins_len; |
2786 long pre_textlen = 0; | |
2787 long pre_indent = 0; | |
7 | 2788 char_u *firstline; |
2789 char_u *ins_text, *newp, *oldp; | |
2790 struct block_def bd; | |
2791 #endif | |
2792 | |
2793 l = oap->start.col; | |
2794 if (oap->motion_type == MLINE) | |
2795 { | |
2796 l = 0; | |
2797 #ifdef FEAT_SMARTINDENT | |
2798 if (!p_paste && curbuf->b_p_si | |
2799 # ifdef FEAT_CINDENT | |
2800 && !curbuf->b_p_cin | |
2801 # endif | |
2802 ) | |
2803 can_si = TRUE; /* It's like opening a new line, do si */ | |
2804 #endif | |
2805 } | |
2806 | |
2807 /* First delete the text in the region. In an empty buffer only need to | |
2808 * save for undo */ | |
2809 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
2810 { | |
2811 if (u_save_cursor() == FAIL) | |
2812 return FALSE; | |
2813 } | |
2814 else if (op_delete(oap) == FAIL) | |
2815 return FALSE; | |
2816 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2817 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2818 && !virtual_op) |
2819 inc_cursor(); | |
2820 | |
2821 #ifdef FEAT_VISUALEXTRA | |
2822 /* check for still on same line (<CR> in inserted text meaningless) */ | |
2823 /* skip blank lines too */ | |
2824 if (oap->block_mode) | |
2825 { | |
2826 # ifdef FEAT_VIRTUALEDIT | |
2827 /* Add spaces before getting the current line length. */ | |
2828 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
2829 || gchar_cursor() == NUL)) | |
2830 coladvance_force(getviscol()); | |
2831 # endif | |
1392 | 2832 firstline = ml_get(oap->start.lnum); |
2833 pre_textlen = (long)STRLEN(firstline); | |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2834 pre_indent = (long)getwhitecols(firstline); |
7 | 2835 bd.textcol = curwin->w_cursor.col; |
2836 } | |
2837 #endif | |
2838 | |
2839 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
2840 if (oap->motion_type == MLINE) | |
2841 fix_indent(); | |
2842 #endif | |
2843 | |
2844 retval = edit(NUL, FALSE, (linenr_T)1); | |
2845 | |
2846 #ifdef FEAT_VISUALEXTRA | |
2847 /* | |
39 | 2848 * In Visual block mode, handle copying the new text to all lines of the |
7 | 2849 * block. |
1477 | 2850 * Don't repeat the insert when Insert mode ended with CTRL-C. |
7 | 2851 */ |
1477 | 2852 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
7 | 2853 { |
1392 | 2854 /* Auto-indenting may have changed the indent. If the cursor was past |
2855 * the indent, exclude that indent change from the inserted text. */ | |
7 | 2856 firstline = ml_get(oap->start.lnum); |
1403 | 2857 if (bd.textcol > (colnr_T)pre_indent) |
7 | 2858 { |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2859 long new_indent = (long)getwhitecols(firstline); |
1392 | 2860 |
2861 pre_textlen += new_indent - pre_indent; | |
2862 bd.textcol += new_indent - pre_indent; | |
2863 } | |
2864 | |
2865 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
2866 if (ins_len > 0) | |
2867 { | |
2868 /* Subsequent calls to ml_get() flush the firstline data - take a | |
2869 * copy of the inserted text. */ | |
7 | 2870 if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL) |
2871 { | |
419 | 2872 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
7 | 2873 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
2874 linenr++) | |
2875 { | |
2876 block_prep(oap, &bd, linenr, TRUE); | |
2877 if (!bd.is_short || virtual_op) | |
2878 { | |
2879 # ifdef FEAT_VIRTUALEDIT | |
2880 pos_T vpos; | |
2881 | |
2882 /* If the block starts in virtual space, count the | |
2883 * initial coladd offset as part of "startspaces" */ | |
2884 if (bd.is_short) | |
2885 { | |
1982 | 2886 vpos.lnum = linenr; |
7 | 2887 (void)getvpos(&vpos, oap->start_vcol); |
2888 } | |
2889 else | |
2890 vpos.coladd = 0; | |
2891 # endif | |
2892 oldp = ml_get(linenr); | |
2893 newp = alloc_check((unsigned)(STRLEN(oldp) | |
2894 # ifdef FEAT_VIRTUALEDIT | |
2895 + vpos.coladd | |
2896 # endif | |
2897 + ins_len + 1)); | |
2898 if (newp == NULL) | |
2899 continue; | |
2900 /* copy up to block start */ | |
2901 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2902 offset = bd.textcol; | |
2903 # ifdef FEAT_VIRTUALEDIT | |
6929 | 2904 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
7 | 2905 offset += vpos.coladd; |
2906 # endif | |
2907 mch_memmove(newp + offset, ins_text, (size_t)ins_len); | |
2908 offset += ins_len; | |
2909 oldp += bd.textcol; | |
1622 | 2910 STRMOVE(newp + offset, oldp); |
7 | 2911 ml_replace(linenr, newp, FALSE); |
2912 } | |
2913 } | |
2914 check_cursor(); | |
2915 | |
2916 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
2917 } | |
2918 vim_free(ins_text); | |
2919 } | |
2920 } | |
2921 #endif | |
2922 | |
2923 return retval; | |
2924 } | |
2925 | |
2926 /* | |
2927 * set all the yank registers to empty (called from main()) | |
2928 */ | |
2929 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2930 init_yank(void) |
7 | 2931 { |
2932 int i; | |
2933 | |
2934 for (i = 0; i < NUM_REGISTERS; ++i) | |
2935 y_regs[i].y_array = NULL; | |
2936 } | |
2937 | |
356 | 2938 #if defined(EXITFREE) || defined(PROTO) |
2939 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2940 clear_registers(void) |
356 | 2941 { |
2942 int i; | |
2943 | |
2944 for (i = 0; i < NUM_REGISTERS; ++i) | |
2945 { | |
2946 y_current = &y_regs[i]; | |
2947 if (y_current->y_array != NULL) | |
2948 free_yank_all(); | |
2949 } | |
2950 } | |
2951 #endif | |
2952 | |
7 | 2953 /* |
2954 * Free "n" lines from the current yank register. | |
2955 * Called for normal freeing and in case of error. | |
2956 */ | |
2957 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2958 free_yank(long n) |
7 | 2959 { |
2960 if (y_current->y_array != NULL) | |
2961 { | |
2962 long i; | |
2963 | |
2964 for (i = n; --i >= 0; ) | |
2965 { | |
2966 #ifdef AMIGA /* only for very slow machines */ | |
2967 if ((i & 1023) == 1023) /* this may take a while */ | |
2968 { | |
2969 /* | |
2970 * This message should never cause a hit-return message. | |
2971 * Overwrite this message with any next message. | |
2972 */ | |
2973 ++no_wait_return; | |
2974 smsg((char_u *)_("freeing %ld lines"), i + 1); | |
2975 --no_wait_return; | |
2976 msg_didout = FALSE; | |
2977 msg_col = 0; | |
2978 } | |
2979 #endif | |
2980 vim_free(y_current->y_array[i]); | |
2981 } | |
2982 vim_free(y_current->y_array); | |
2983 y_current->y_array = NULL; | |
2984 #ifdef AMIGA | |
2985 if (n >= 1000) | |
2986 MSG(""); | |
2987 #endif | |
2988 } | |
2989 } | |
2990 | |
2991 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2992 free_yank_all(void) |
7 | 2993 { |
2994 free_yank(y_current->y_size); | |
2995 } | |
2996 | |
2997 /* | |
2998 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
2999 * If we are to append (uppercase register), we first yank into a new yank | |
3000 * register and then concatenate the old and the new one (so we keep the old | |
3001 * one in case of out-of-memory). | |
3002 * | |
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
3003 * Return FAIL for failure, OK otherwise. |
7 | 3004 */ |
3005 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3006 op_yank(oparg_T *oap, int deleting, int mess) |
7 | 3007 { |
3008 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
|
3009 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
|
3010 yankreg_T newreg; /* new yank register when appending */ |
7 | 3011 char_u **new_ptr; |
3012 linenr_T lnum; /* current line number */ | |
3013 long j; | |
3014 int yanktype = oap->motion_type; | |
3015 long yanklines = oap->line_count; | |
3016 linenr_T yankendlnum = oap->end.lnum; | |
3017 char_u *p; | |
3018 char_u *pnew; | |
3019 struct block_def bd; | |
2658 | 3020 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
2654 | 3021 int did_star = FALSE; |
2658 | 3022 #endif |
7 | 3023 |
3024 /* check for read-only register */ | |
3025 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
3026 { | |
3027 beep_flush(); | |
3028 return FAIL; | |
3029 } | |
3030 if (oap->regname == '_') /* black hole: nothing to do */ | |
3031 return OK; | |
3032 | |
3033 #ifdef FEAT_CLIPBOARD | |
3034 if (!clip_star.available && oap->regname == '*') | |
3035 oap->regname = 0; | |
3036 else if (!clip_plus.available && oap->regname == '+') | |
3037 oap->regname = 0; | |
3038 #endif | |
3039 | |
3040 if (!deleting) /* op_delete() already set y_current */ | |
3041 get_yank_register(oap->regname, TRUE); | |
3042 | |
3043 curr = y_current; | |
3044 /* append to existing contents */ | |
3045 if (y_append && y_current->y_array != NULL) | |
3046 y_current = &newreg; | |
3047 else | |
3048 free_yank_all(); /* free previously yanked lines */ | |
3049 | |
593 | 3050 /* |
3051 * If the cursor was in column 1 before and after the movement, and the | |
3052 * operator is not inclusive, the yank is always linewise. | |
3053 */ | |
7 | 3054 if ( oap->motion_type == MCHAR |
3055 && oap->start.col == 0 | |
3056 && !oap->inclusive | |
3057 && (!oap->is_VIsual || *p_sel == 'o') | |
50 | 3058 && !oap->block_mode |
7 | 3059 && oap->end.col == 0 |
3060 && yanklines > 1) | |
3061 { | |
3062 yanktype = MLINE; | |
3063 --yankendlnum; | |
3064 --yanklines; | |
3065 } | |
3066 | |
3067 y_current->y_size = yanklines; | |
3068 y_current->y_type = yanktype; /* set the yank register type */ | |
3069 y_current->y_width = 0; | |
3070 y_current->y_array = (char_u **)lalloc_clear((long_u)(sizeof(char_u *) * | |
3071 yanklines), TRUE); | |
3072 if (y_current->y_array == NULL) | |
3073 { | |
3074 y_current = curr; | |
3075 return FAIL; | |
3076 } | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3077 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3078 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
|
3079 #endif |
7 | 3080 |
3081 y_idx = 0; | |
3082 lnum = oap->start.lnum; | |
3083 | |
3084 if (oap->block_mode) | |
3085 { | |
3086 /* Visual block mode */ | |
3087 y_current->y_type = MBLOCK; /* set the yank register type */ | |
3088 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
3089 | |
3090 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
3091 y_current->y_width--; | |
3092 } | |
3093 | |
3094 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
3095 { | |
3096 switch (y_current->y_type) | |
3097 { | |
3098 case MBLOCK: | |
3099 block_prep(oap, &bd, lnum, FALSE); | |
3100 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3101 goto fail; | |
3102 break; | |
3103 | |
3104 case MLINE: | |
3105 if ((y_current->y_array[y_idx] = | |
3106 vim_strsave(ml_get(lnum))) == NULL) | |
3107 goto fail; | |
3108 break; | |
3109 | |
3110 case MCHAR: | |
3111 { | |
3112 colnr_T startcol = 0, endcol = MAXCOL; | |
3113 #ifdef FEAT_VIRTUALEDIT | |
3114 int is_oneChar = FALSE; | |
3115 colnr_T cs, ce; | |
3116 #endif | |
3117 p = ml_get(lnum); | |
3118 bd.startspaces = 0; | |
3119 bd.endspaces = 0; | |
3120 | |
3121 if (lnum == oap->start.lnum) | |
3122 { | |
3123 startcol = oap->start.col; | |
3124 #ifdef FEAT_VIRTUALEDIT | |
3125 if (virtual_op) | |
3126 { | |
3127 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
3128 if (ce != cs && oap->start.coladd > 0) | |
3129 { | |
3130 /* Part of a tab selected -- but don't | |
3131 * double-count it. */ | |
3132 bd.startspaces = (ce - cs + 1) | |
3133 - oap->start.coladd; | |
3134 startcol++; | |
3135 } | |
3136 } | |
3137 #endif | |
3138 } | |
3139 | |
3140 if (lnum == oap->end.lnum) | |
3141 { | |
3142 endcol = oap->end.col; | |
3143 #ifdef FEAT_VIRTUALEDIT | |
3144 if (virtual_op) | |
3145 { | |
3146 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
3147 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
3148 # ifdef FEAT_MBYTE | |
3149 /* Don't add space for double-wide | |
3150 * char; endcol will be on last byte | |
3151 * of multi-byte char. */ | |
3152 && (*mb_head_off)(p, p + endcol) == 0 | |
3153 # endif | |
3154 )) | |
3155 { | |
3156 if (oap->start.lnum == oap->end.lnum | |
3157 && oap->start.col == oap->end.col) | |
3158 { | |
3159 /* Special case: inside a single char */ | |
3160 is_oneChar = TRUE; | |
3161 bd.startspaces = oap->end.coladd | |
3162 - oap->start.coladd + oap->inclusive; | |
3163 endcol = startcol; | |
3164 } | |
3165 else | |
3166 { | |
3167 bd.endspaces = oap->end.coladd | |
3168 + oap->inclusive; | |
3169 endcol -= oap->inclusive; | |
3170 } | |
3171 } | |
3172 } | |
3173 #endif | |
3174 } | |
3510 | 3175 if (endcol == MAXCOL) |
3176 endcol = (colnr_T)STRLEN(p); | |
7 | 3177 if (startcol > endcol |
3178 #ifdef FEAT_VIRTUALEDIT | |
3179 || is_oneChar | |
3180 #endif | |
3181 ) | |
3182 bd.textlen = 0; | |
3183 else | |
3184 { | |
3185 bd.textlen = endcol - startcol + oap->inclusive; | |
3186 } | |
3187 bd.textstart = p + startcol; | |
3188 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3189 goto fail; | |
3190 break; | |
3191 } | |
3192 /* NOTREACHED */ | |
3193 } | |
3194 } | |
3195 | |
3196 if (curr != y_current) /* append the new block to the old block */ | |
3197 { | |
3198 new_ptr = (char_u **)lalloc((long_u)(sizeof(char_u *) * | |
3199 (curr->y_size + y_current->y_size)), TRUE); | |
3200 if (new_ptr == NULL) | |
3201 goto fail; | |
3202 for (j = 0; j < curr->y_size; ++j) | |
3203 new_ptr[j] = curr->y_array[j]; | |
3204 vim_free(curr->y_array); | |
3205 curr->y_array = new_ptr; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3206 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3207 curr->y_time_set = vim_time(); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3208 #endif |
7 | 3209 |
3210 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
3211 curr->y_type = MLINE; | |
3212 | |
164 | 3213 /* Concatenate the last line of the old block with the first line of |
3214 * the new block, unless being Vi compatible. */ | |
3215 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
7 | 3216 { |
3217 pnew = lalloc((long_u)(STRLEN(curr->y_array[curr->y_size - 1]) | |
3218 + STRLEN(y_current->y_array[0]) + 1), TRUE); | |
3219 if (pnew == NULL) | |
3220 { | |
3221 y_idx = y_current->y_size - 1; | |
3222 goto fail; | |
3223 } | |
3224 STRCPY(pnew, curr->y_array[--j]); | |
3225 STRCAT(pnew, y_current->y_array[0]); | |
3226 vim_free(curr->y_array[j]); | |
3227 vim_free(y_current->y_array[0]); | |
3228 curr->y_array[j++] = pnew; | |
3229 y_idx = 1; | |
3230 } | |
3231 else | |
3232 y_idx = 0; | |
3233 while (y_idx < y_current->y_size) | |
3234 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
3235 curr->y_size = j; | |
3236 vim_free(y_current->y_array); | |
3237 y_current = curr; | |
3238 } | |
5981 | 3239 if (curwin->w_p_rnu) |
3240 redraw_later(SOME_VALID); /* cursor moved to start */ | |
7 | 3241 if (mess) /* Display message about yank? */ |
3242 { | |
3243 if (yanktype == MCHAR | |
3244 && !oap->block_mode | |
3245 && yanklines == 1) | |
3246 yanklines = 0; | |
3247 /* Some versions of Vi use ">=" here, some don't... */ | |
3248 if (yanklines > p_report) | |
3249 { | |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3250 char namebuf[100]; |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3251 |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3252 if (oap->regname == NUL) |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3253 *namebuf = NUL; |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3254 else |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3255 vim_snprintf(namebuf, sizeof(namebuf), |
11688
570f00932da8
patch 8.0.0727: message about what register to yank into is not translated
Christian Brabandt <cb@256bit.org>
parents:
11682
diff
changeset
|
3256 _(" into \"%c"), oap->regname); |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3257 |
7 | 3258 /* redisplay now, so message is not deleted */ |
3259 update_topline_redraw(); | |
3260 if (yanklines == 1) | |
205 | 3261 { |
3262 if (oap->block_mode) | |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3263 smsg((char_u *)_("block of 1 line yanked%s"), namebuf); |
205 | 3264 else |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3265 smsg((char_u *)_("1 line yanked%s"), namebuf); |
205 | 3266 } |
3267 else if (oap->block_mode) | |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3268 smsg((char_u *)_("block of %ld lines yanked%s"), |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3269 yanklines, namebuf); |
7 | 3270 else |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3271 smsg((char_u *)_("%ld lines yanked%s"), yanklines, |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3272 namebuf); |
7 | 3273 } |
3274 } | |
3275 | |
3276 /* | |
3277 * Set "'[" and "']" marks. | |
3278 */ | |
3279 curbuf->b_op_start = oap->start; | |
3280 curbuf->b_op_end = oap->end; | |
5735 | 3281 if (yanktype == MLINE && !oap->block_mode) |
36 | 3282 { |
3283 curbuf->b_op_start.col = 0; | |
3284 curbuf->b_op_end.col = MAXCOL; | |
3285 } | |
7 | 3286 |
3287 #ifdef FEAT_CLIPBOARD | |
3288 /* | |
3289 * If we were yanking to the '*' register, send result to clipboard. | |
3290 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
3291 * to the '*' register. | |
3292 */ | |
3293 if (clip_star.available | |
3294 && (curr == &(y_regs[STAR_REGISTER]) | |
2654 | 3295 || (!deleting && oap->regname == 0 |
6116 | 3296 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
7 | 3297 { |
3298 if (curr != &(y_regs[STAR_REGISTER])) | |
3299 /* Copy the text from register 0 to the clipboard register. */ | |
3300 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3301 | |
3302 clip_own_selection(&clip_star); | |
3303 clip_gen_set_selection(&clip_star); | |
2658 | 3304 # ifdef FEAT_X11 |
2654 | 3305 did_star = TRUE; |
2658 | 3306 # endif |
7 | 3307 } |
3308 | |
3309 # ifdef FEAT_X11 | |
3310 /* | |
3311 * If we were yanking to the '+' register, send result to selection. | |
3312 * Also copy to the '*' register, in case auto-select is off. | |
3313 */ | |
2654 | 3314 if (clip_plus.available |
3315 && (curr == &(y_regs[PLUS_REGISTER]) | |
3316 || (!deleting && oap->regname == 0 | |
6116 | 3317 && ((clip_unnamed | clip_unnamed_saved) & |
3318 CLIP_UNNAMED_PLUS)))) | |
7 | 3319 { |
2654 | 3320 if (curr != &(y_regs[PLUS_REGISTER])) |
3321 /* Copy the text from register 0 to the clipboard register. */ | |
3322 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
3323 | |
7 | 3324 clip_own_selection(&clip_plus); |
3325 clip_gen_set_selection(&clip_plus); | |
12642
d1cbe8cb05d0
patch 8.0.1199: when 'clipboard' is "autoselectplus" star register is set
Christian Brabandt <cb@256bit.org>
parents:
12329
diff
changeset
|
3326 if (!clip_isautosel_star() && !clip_isautosel_plus() |
d1cbe8cb05d0
patch 8.0.1199: when 'clipboard' is "autoselectplus" star register is set
Christian Brabandt <cb@256bit.org>
parents:
12329
diff
changeset
|
3327 && !did_star && curr == &(y_regs[PLUS_REGISTER])) |
7 | 3328 { |
3329 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3330 clip_own_selection(&clip_star); | |
3331 clip_gen_set_selection(&clip_star); | |
3332 } | |
3333 } | |
3334 # endif | |
3335 #endif | |
3336 | |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3337 #ifdef FEAT_AUTOCMD |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3338 if (!deleting && has_textyankpost()) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3339 yank_do_autocmd(oap, y_current); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3340 #endif |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3341 |
7 | 3342 return OK; |
3343 | |
3344 fail: /* free the allocated lines */ | |
3345 free_yank(y_idx + 1); | |
3346 y_current = curr; | |
3347 return FAIL; | |
3348 } | |
3349 | |
3350 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3351 yank_copy_line(struct block_def *bd, long y_idx) |
7 | 3352 { |
3353 char_u *pnew; | |
3354 | |
3355 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
3356 == NULL) | |
3357 return FAIL; | |
3358 y_current->y_array[y_idx] = pnew; | |
6929 | 3359 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
7 | 3360 pnew += bd->startspaces; |
3361 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
3362 pnew += bd->textlen; | |
6929 | 3363 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
7 | 3364 pnew += bd->endspaces; |
3365 *pnew = NUL; | |
3366 return OK; | |
3367 } | |
3368 | |
3369 #ifdef FEAT_CLIPBOARD | |
3370 /* | |
3371 * Make a copy of the y_current register to register "reg". | |
3372 */ | |
3373 static void | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3374 copy_yank_reg(yankreg_T *reg) |
7 | 3375 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3376 yankreg_T *curr = y_current; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3377 long j; |
7 | 3378 |
3379 y_current = reg; | |
3380 free_yank_all(); | |
3381 *y_current = *curr; | |
3382 y_current->y_array = (char_u **)lalloc_clear( | |
3383 (long_u)(sizeof(char_u *) * y_current->y_size), TRUE); | |
3384 if (y_current->y_array == NULL) | |
3385 y_current->y_size = 0; | |
3386 else | |
3387 for (j = 0; j < y_current->y_size; ++j) | |
3388 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
3389 { | |
3390 free_yank(j); | |
3391 y_current->y_size = 0; | |
3392 break; | |
3393 } | |
3394 y_current = curr; | |
3395 } | |
3396 #endif | |
3397 | |
3398 /* | |
140 | 3399 * Put contents of register "regname" into the text. |
3400 * Caller must check "regname" to be valid! | |
3401 * "flags": PUT_FIXINDENT make indent look nice | |
3402 * PUT_CURSEND leave cursor after end of new text | |
3403 * PUT_LINE force linewise put (":put") | |
7 | 3404 */ |
3405 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3406 do_put( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3407 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3408 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
|
3409 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3410 int flags) |
7 | 3411 { |
3412 char_u *ptr; | |
3413 char_u *newp, *oldp; | |
3414 int yanklen; | |
3415 int totlen = 0; /* init for gcc */ | |
3416 linenr_T lnum; | |
3417 colnr_T col; | |
3418 long i; /* index in y_array[] */ | |
3419 int y_type; | |
3420 long y_size; | |
3421 int oldlen; | |
3422 long y_width = 0; | |
3423 colnr_T vcol; | |
3424 int delcount; | |
3425 int incr = 0; | |
3426 long j; | |
3427 struct block_def bd; | |
3428 char_u **y_array = NULL; | |
3429 long nr_lines = 0; | |
3430 pos_T new_cursor; | |
3431 int indent; | |
3432 int orig_indent = 0; /* init for gcc */ | |
3433 int indent_diff = 0; /* init for gcc */ | |
3434 int first_indent = TRUE; | |
3435 int lendiff = 0; | |
3436 pos_T old_pos; | |
3437 char_u *insert_string = NULL; | |
3438 int allocated = FALSE; | |
3439 long cnt; | |
3440 | |
3441 #ifdef FEAT_CLIPBOARD | |
3442 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
3443 adjust_clip_reg(®name); | |
3444 (void)may_get_selection(regname); | |
3445 #endif | |
3446 | |
3447 if (flags & PUT_FIXINDENT) | |
3448 orig_indent = get_indent(); | |
3449 | |
3450 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3451 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3452 | |
3453 /* | |
3454 * Using inserted text works differently, because the register includes | |
3455 * special characters (newlines, etc.). | |
3456 */ | |
3457 if (regname == '.') | |
3458 { | |
10494
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3459 if (VIsual_active) |
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3460 stuffcharReadbuff(VIsual_mode); |
7 | 3461 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : |
3462 (count == -1 ? 'O' : 'i')), count, FALSE); | |
3463 /* Putting the text is done later, so can't really move the cursor to | |
3464 * the next character. Use "l" to simulate it. */ | |
3465 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
3466 stuffcharReadbuff('l'); | |
3467 return; | |
3468 } | |
3469 | |
3470 /* | |
3471 * For special registers '%' (file name), '#' (alternate file name) and | |
3472 * ':' (last command line), etc. we have to create a fake yank register. | |
3473 */ | |
3474 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
3475 { | |
3476 if (insert_string == NULL) | |
3477 return; | |
3478 } | |
3479 | |
4005 | 3480 #ifdef FEAT_AUTOCMD |
3481 /* Autocommands may be executed when saving lines for undo, which may make | |
3482 * y_array invalid. Start undo now to avoid that. */ | |
3483 u_save(curwin->w_cursor.lnum, curwin->w_cursor.lnum + 1); | |
3484 #endif | |
3485 | |
7 | 3486 if (insert_string != NULL) |
3487 { | |
3488 y_type = MCHAR; | |
3489 #ifdef FEAT_EVAL | |
3490 if (regname == '=') | |
3491 { | |
3492 /* For the = register we need to split the string at NL | |
3093 | 3493 * characters. |
3494 * Loop twice: count the number of lines and save them. */ | |
7 | 3495 for (;;) |
3496 { | |
3497 y_size = 0; | |
3498 ptr = insert_string; | |
3499 while (ptr != NULL) | |
3500 { | |
3501 if (y_array != NULL) | |
3502 y_array[y_size] = ptr; | |
3503 ++y_size; | |
3504 ptr = vim_strchr(ptr, '\n'); | |
3505 if (ptr != NULL) | |
3506 { | |
3507 if (y_array != NULL) | |
3508 *ptr = NUL; | |
3509 ++ptr; | |
3093 | 3510 /* A trailing '\n' makes the register linewise. */ |
7 | 3511 if (*ptr == NUL) |
3512 { | |
3513 y_type = MLINE; | |
3514 break; | |
3515 } | |
3516 } | |
3517 } | |
3518 if (y_array != NULL) | |
3519 break; | |
3520 y_array = (char_u **)alloc((unsigned) | |
3521 (y_size * sizeof(char_u *))); | |
3522 if (y_array == NULL) | |
3523 goto end; | |
3524 } | |
3525 } | |
3526 else | |
3527 #endif | |
3528 { | |
3529 y_size = 1; /* use fake one-line yank register */ | |
3530 y_array = &insert_string; | |
3531 } | |
3532 } | |
3533 else | |
3534 { | |
3535 get_yank_register(regname, FALSE); | |
3536 | |
3537 y_type = y_current->y_type; | |
3538 y_width = y_current->y_width; | |
3539 y_size = y_current->y_size; | |
3540 y_array = y_current->y_array; | |
3541 } | |
3542 | |
3543 if (y_type == MLINE) | |
3544 { | |
3545 if (flags & PUT_LINE_SPLIT) | |
3546 { | |
6845 | 3547 char_u *p; |
3548 | |
7 | 3549 /* "p" or "P" in Visual mode: split the lines to put the text in |
3550 * between. */ | |
3551 if (u_save_cursor() == FAIL) | |
3552 goto end; | |
6845 | 3553 p = ml_get_cursor(); |
3554 if (dir == FORWARD && *p != NUL) | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3555 MB_PTR_ADV(p); |
6845 | 3556 ptr = vim_strsave(p); |
7 | 3557 if (ptr == NULL) |
3558 goto end; | |
3559 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
3560 vim_free(ptr); | |
3561 | |
6845 | 3562 oldp = ml_get_curline(); |
3563 p = oldp + curwin->w_cursor.col; | |
3564 if (dir == FORWARD && *p != NUL) | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3565 MB_PTR_ADV(p); |
6845 | 3566 ptr = vim_strnsave(oldp, p - oldp); |
7 | 3567 if (ptr == NULL) |
3568 goto end; | |
3569 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
3570 ++nr_lines; | |
3571 dir = FORWARD; | |
3572 } | |
3573 if (flags & PUT_LINE_FORWARD) | |
3574 { | |
3575 /* Must be "p" for a Visual block, put lines below the block. */ | |
692 | 3576 curwin->w_cursor = curbuf->b_visual.vi_end; |
7 | 3577 dir = FORWARD; |
3578 } | |
3579 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3580 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3581 } | |
3582 | |
3583 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
3584 y_type = MLINE; | |
3585 | |
3586 if (y_size == 0 || y_array == NULL) | |
3587 { | |
3588 EMSG2(_("E353: Nothing in register %s"), | |
3589 regname == 0 ? (char_u *)"\"" : transchar(regname)); | |
3590 goto end; | |
3591 } | |
3592 | |
3593 if (y_type == MBLOCK) | |
3594 { | |
3595 lnum = curwin->w_cursor.lnum + y_size + 1; | |
3596 if (lnum > curbuf->b_ml.ml_line_count) | |
3597 lnum = curbuf->b_ml.ml_line_count + 1; | |
3598 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
3599 goto end; | |
3600 } | |
5735 | 3601 else if (y_type == MLINE) |
7 | 3602 { |
3603 lnum = curwin->w_cursor.lnum; | |
3604 #ifdef FEAT_FOLDING | |
3605 /* Correct line number for closed fold. Don't move the cursor yet, | |
3606 * u_save() uses it. */ | |
3607 if (dir == BACKWARD) | |
3608 (void)hasFolding(lnum, &lnum, NULL); | |
3609 else | |
3610 (void)hasFolding(lnum, NULL, &lnum); | |
3611 #endif | |
3612 if (dir == FORWARD) | |
3613 ++lnum; | |
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3614 /* 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
|
3615 * it in the saved lines. */ |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
3616 if ((BUFEMPTY() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
7 | 3617 goto end; |
3618 #ifdef FEAT_FOLDING | |
3619 if (dir == FORWARD) | |
3620 curwin->w_cursor.lnum = lnum - 1; | |
3621 else | |
3622 curwin->w_cursor.lnum = lnum; | |
3623 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
3624 #endif | |
3625 } | |
3626 else if (u_save_cursor() == FAIL) | |
3627 goto end; | |
3628 | |
3629 yanklen = (int)STRLEN(y_array[0]); | |
3630 | |
3631 #ifdef FEAT_VIRTUALEDIT | |
3632 if (ve_flags == VE_ALL && y_type == MCHAR) | |
3633 { | |
3634 if (gchar_cursor() == TAB) | |
3635 { | |
3636 /* Don't need to insert spaces when "p" on the last position of a | |
3637 * tab or "P" on the first position. */ | |
3638 if (dir == FORWARD | |
3639 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
3640 : curwin->w_cursor.coladd > 0) | |
3641 coladvance_force(getviscol()); | |
3642 else | |
3643 curwin->w_cursor.coladd = 0; | |
3644 } | |
3645 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
3646 coladvance_force(getviscol() + (dir == FORWARD)); | |
3647 } | |
3648 #endif | |
3649 | |
3650 lnum = curwin->w_cursor.lnum; | |
3651 col = curwin->w_cursor.col; | |
3652 | |
3653 /* | |
3654 * Block mode | |
3655 */ | |
3656 if (y_type == MBLOCK) | |
3657 { | |
10664
94db9c08e206
patch 8.0.0222: blockwise put on multi-byte character misplaced
Christian Brabandt <cb@256bit.org>
parents:
10494
diff
changeset
|
3658 int c = gchar_cursor(); |
7 | 3659 colnr_T endcol2 = 0; |
3660 | |
3661 if (dir == FORWARD && c != NUL) | |
3662 { | |
3663 #ifdef FEAT_VIRTUALEDIT | |
3664 if (ve_flags == VE_ALL) | |
3665 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3666 else | |
3667 #endif | |
3668 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
3669 | |
3670 #ifdef FEAT_MBYTE | |
3671 if (has_mbyte) | |
3672 /* move to start of next multi-byte character */ | |
474 | 3673 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
7 | 3674 else |
3675 #endif | |
3676 #ifdef FEAT_VIRTUALEDIT | |
3677 if (c != TAB || ve_flags != VE_ALL) | |
3678 #endif | |
3679 ++curwin->w_cursor.col; | |
3680 ++col; | |
3681 } | |
3682 else | |
3683 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3684 | |
3685 #ifdef FEAT_VIRTUALEDIT | |
3686 col += curwin->w_cursor.coladd; | |
1304 | 3687 if (ve_flags == VE_ALL |
3688 && (curwin->w_cursor.coladd > 0 | |
3689 || endcol2 == curwin->w_cursor.col)) | |
7 | 3690 { |
3691 if (dir == FORWARD && c == NUL) | |
3692 ++col; | |
3693 if (dir != FORWARD && c != NUL) | |
3694 ++curwin->w_cursor.col; | |
3695 if (c == TAB) | |
3696 { | |
3697 if (dir == BACKWARD && curwin->w_cursor.col) | |
3698 curwin->w_cursor.col--; | |
3699 if (dir == FORWARD && col - 1 == endcol2) | |
3700 curwin->w_cursor.col++; | |
3701 } | |
3702 } | |
3703 curwin->w_cursor.coladd = 0; | |
3704 #endif | |
699 | 3705 bd.textcol = 0; |
7 | 3706 for (i = 0; i < y_size; ++i) |
3707 { | |
3708 int spaces; | |
3709 char shortline; | |
3710 | |
3711 bd.startspaces = 0; | |
3712 bd.endspaces = 0; | |
3713 vcol = 0; | |
3714 delcount = 0; | |
3715 | |
3716 /* add a new line */ | |
3717 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
3718 { | |
3719 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
3720 (colnr_T)1, FALSE) == FAIL) | |
3721 break; | |
3722 ++nr_lines; | |
3723 } | |
3724 /* get the old line and advance to the position to insert at */ | |
3725 oldp = ml_get_curline(); | |
3726 oldlen = (int)STRLEN(oldp); | |
3727 for (ptr = oldp; vcol < col && *ptr; ) | |
3728 { | |
3729 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 3730 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
7 | 3731 vcol += incr; |
3732 } | |
3733 bd.textcol = (colnr_T)(ptr - oldp); | |
3734 | |
3735 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
3736 | |
3737 if (vcol < col) /* line too short, padd with spaces */ | |
3738 bd.startspaces = col - vcol; | |
3739 else if (vcol > col) | |
3740 { | |
3741 bd.endspaces = vcol - col; | |
3742 bd.startspaces = incr - bd.endspaces; | |
3743 --bd.textcol; | |
3744 delcount = 1; | |
3745 #ifdef FEAT_MBYTE | |
3746 if (has_mbyte) | |
3747 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
3748 #endif | |
3749 if (oldp[bd.textcol] != TAB) | |
3750 { | |
3751 /* Only a Tab can be split into spaces. Other | |
3752 * characters will have to be moved to after the | |
3753 * block, causing misalignment. */ | |
3754 delcount = 0; | |
3755 bd.endspaces = 0; | |
3756 } | |
3757 } | |
3758 | |
3759 yanklen = (int)STRLEN(y_array[i]); | |
3760 | |
3761 /* calculate number of spaces required to fill right side of block*/ | |
3762 spaces = y_width + 1; | |
3763 for (j = 0; j < yanklen; j++) | |
5995 | 3764 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
7 | 3765 if (spaces < 0) |
3766 spaces = 0; | |
3767 | |
3768 /* insert the new text */ | |
3769 totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces; | |
3770 newp = alloc_check((unsigned)totlen + oldlen + 1); | |
3771 if (newp == NULL) | |
3772 break; | |
3773 /* copy part up to cursor to new line */ | |
3774 ptr = newp; | |
3775 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
3776 ptr += bd.textcol; | |
3777 /* may insert some spaces before the new text */ | |
6929 | 3778 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
7 | 3779 ptr += bd.startspaces; |
3780 /* insert the new text */ | |
3781 for (j = 0; j < count; ++j) | |
3782 { | |
3783 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
3784 ptr += yanklen; | |
3785 | |
3786 /* insert block's trailing spaces only if there's text behind */ | |
3787 if ((j < count - 1 || !shortline) && spaces) | |
3788 { | |
6929 | 3789 vim_memset(ptr, ' ', (size_t)spaces); |
7 | 3790 ptr += spaces; |
3791 } | |
3792 } | |
3793 /* may insert some spaces after the new text */ | |
6929 | 3794 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
7 | 3795 ptr += bd.endspaces; |
3796 /* move the text after the cursor to the end of the line. */ | |
3797 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
3798 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
3799 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
3800 | |
3801 ++curwin->w_cursor.lnum; | |
3802 if (i == 0) | |
3803 curwin->w_cursor.col += bd.startspaces; | |
3804 } | |
3805 | |
3806 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
3807 | |
3808 /* Set '[ mark. */ | |
3809 curbuf->b_op_start = curwin->w_cursor; | |
3810 curbuf->b_op_start.lnum = lnum; | |
3811 | |
3812 /* adjust '] mark */ | |
3813 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
3814 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
237 | 3815 # ifdef FEAT_VIRTUALEDIT |
7 | 3816 curbuf->b_op_end.coladd = 0; |
237 | 3817 # endif |
7 | 3818 if (flags & PUT_CURSEND) |
3819 { | |
916 | 3820 colnr_T len; |
3821 | |
7 | 3822 curwin->w_cursor = curbuf->b_op_end; |
3823 curwin->w_cursor.col++; | |
916 | 3824 |
3825 /* in Insert mode we might be after the NUL, correct for that */ | |
3826 len = (colnr_T)STRLEN(ml_get_curline()); | |
3827 if (curwin->w_cursor.col > len) | |
3828 curwin->w_cursor.col = len; | |
7 | 3829 } |
3830 else | |
3831 curwin->w_cursor.lnum = lnum; | |
3832 } | |
3833 else | |
3834 { | |
3835 /* | |
3836 * Character or Line mode | |
3837 */ | |
3838 if (y_type == MCHAR) | |
3839 { | |
3840 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
3841 * char */ | |
3842 if (dir == FORWARD && gchar_cursor() != NUL) | |
3843 { | |
3844 #ifdef FEAT_MBYTE | |
3845 if (has_mbyte) | |
3846 { | |
474 | 3847 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
7 | 3848 |
3849 /* put it on the next of the multi-byte character. */ | |
3850 col += bytelen; | |
3851 if (yanklen) | |
3852 { | |
3853 curwin->w_cursor.col += bytelen; | |
3854 curbuf->b_op_end.col += bytelen; | |
3855 } | |
3856 } | |
3857 else | |
3858 #endif | |
3859 { | |
3860 ++col; | |
3861 if (yanklen) | |
3862 { | |
3863 ++curwin->w_cursor.col; | |
3864 ++curbuf->b_op_end.col; | |
3865 } | |
3866 } | |
3867 } | |
3868 curbuf->b_op_start = curwin->w_cursor; | |
3869 } | |
3870 /* | |
3871 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
3872 */ | |
3873 else if (dir == BACKWARD) | |
3874 --lnum; | |
699 | 3875 new_cursor = curwin->w_cursor; |
7 | 3876 |
3877 /* | |
3878 * simple case: insert into current line | |
3879 */ | |
3880 if (y_type == MCHAR && y_size == 1) | |
3881 { | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3882 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
|
3883 |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3884 if (VIsual_active) |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3885 { |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3886 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
|
3887 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
|
3888 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
|
3889 } |
10670
bce3eccea39a
patch 8.0.0225: put in Visual block mode terminates early
Christian Brabandt <cb@256bit.org>
parents:
10664
diff
changeset
|
3890 |
5365 | 3891 do { |
3892 totlen = count * yanklen; | |
3893 if (totlen > 0) | |
7 | 3894 { |
5365 | 3895 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
|
3896 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
|
3897 { |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3898 lnum++; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3899 continue; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3900 } |
5365 | 3901 newp = alloc_check((unsigned)(STRLEN(oldp) + totlen + 1)); |
3902 if (newp == NULL) | |
3903 goto end; /* alloc() gave an error message */ | |
3904 mch_memmove(newp, oldp, (size_t)col); | |
3905 ptr = newp + col; | |
3906 for (i = 0; i < count; ++i) | |
3907 { | |
3908 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
3909 ptr += yanklen; | |
3910 } | |
3911 STRMOVE(ptr, oldp + col); | |
3912 ml_replace(lnum, newp, FALSE); | |
3913 /* Place cursor on last putted char. */ | |
3914 if (lnum == curwin->w_cursor.lnum) | |
5496 | 3915 { |
3916 /* make sure curwin->w_virtcol is updated */ | |
3917 changed_cline_bef_curs(); | |
5365 | 3918 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
5496 | 3919 } |
7 | 3920 } |
5365 | 3921 if (VIsual_active) |
3922 lnum++; | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3923 } while (VIsual_active && lnum <= end_lnum); |
5365 | 3924 |
6379 | 3925 if (VIsual_active) /* reset lnum to the last visual line */ |
3926 lnum--; | |
3927 | |
7 | 3928 curbuf->b_op_end = curwin->w_cursor; |
3929 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
3930 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
3931 ++curwin->w_cursor.col; | |
3932 changed_bytes(lnum, col); | |
3933 } | |
3934 else | |
3935 { | |
3936 /* | |
3937 * Insert at least one line. When y_type is MCHAR, break the first | |
3938 * line in two. | |
3939 */ | |
3940 for (cnt = 1; cnt <= count; ++cnt) | |
3941 { | |
3942 i = 0; | |
3943 if (y_type == MCHAR) | |
3944 { | |
3945 /* | |
3946 * Split the current line in two at the insert position. | |
3947 * First insert y_array[size - 1] in front of second line. | |
3948 * Then append y_array[0] to first line. | |
3949 */ | |
3950 lnum = new_cursor.lnum; | |
3951 ptr = ml_get(lnum) + col; | |
3952 totlen = (int)STRLEN(y_array[y_size - 1]); | |
3953 newp = alloc_check((unsigned)(STRLEN(ptr) + totlen + 1)); | |
3954 if (newp == NULL) | |
3955 goto error; | |
3956 STRCPY(newp, y_array[y_size - 1]); | |
3957 STRCAT(newp, ptr); | |
3958 /* insert second line */ | |
3959 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
3960 vim_free(newp); | |
3961 | |
3962 oldp = ml_get(lnum); | |
3963 newp = alloc_check((unsigned)(col + yanklen + 1)); | |
3964 if (newp == NULL) | |
3965 goto error; | |
3966 /* copy first part of line */ | |
3967 mch_memmove(newp, oldp, (size_t)col); | |
3968 /* append to first line */ | |
3969 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
3970 ml_replace(lnum, newp, FALSE); | |
3971 | |
3972 curwin->w_cursor.lnum = lnum; | |
3973 i = 1; | |
3974 } | |
3975 | |
3976 for (; i < y_size; ++i) | |
3977 { | |
3978 if ((y_type != MCHAR || i < y_size - 1) | |
3979 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
3980 == FAIL) | |
3981 goto error; | |
3982 lnum++; | |
3983 ++nr_lines; | |
3984 if (flags & PUT_FIXINDENT) | |
3985 { | |
3986 old_pos = curwin->w_cursor; | |
3987 curwin->w_cursor.lnum = lnum; | |
3988 ptr = ml_get(lnum); | |
3989 if (cnt == count && i == y_size - 1) | |
3990 lendiff = (int)STRLEN(ptr); | |
3991 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
3992 if (*ptr == '#' && preprocs_left()) | |
3993 indent = 0; /* Leave # lines at start */ | |
3994 else | |
3995 #endif | |
3996 if (*ptr == NUL) | |
3997 indent = 0; /* Ignore empty lines */ | |
3998 else if (first_indent) | |
3999 { | |
4000 indent_diff = orig_indent - get_indent(); | |
4001 indent = orig_indent; | |
4002 first_indent = FALSE; | |
4003 } | |
4004 else if ((indent = get_indent() + indent_diff) < 0) | |
4005 indent = 0; | |
4006 (void)set_indent(indent, 0); | |
4007 curwin->w_cursor = old_pos; | |
4008 /* remember how many chars were removed */ | |
4009 if (cnt == count && i == y_size - 1) | |
4010 lendiff -= (int)STRLEN(ml_get(lnum)); | |
4011 } | |
4012 } | |
4013 } | |
4014 | |
4015 error: | |
4016 /* Adjust marks. */ | |
4017 if (y_type == MLINE) | |
4018 { | |
4019 curbuf->b_op_start.col = 0; | |
4020 if (dir == FORWARD) | |
4021 curbuf->b_op_start.lnum++; | |
4022 } | |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
4023 /* 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
|
4024 * 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
|
4025 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
|
4026 < 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
|
4027 #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
|
4028 || 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
|
4029 #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
|
4030 ) |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
4031 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
7 | 4032 (linenr_T)MAXLNUM, nr_lines, 0L); |
4033 | |
4034 /* note changed text for displaying and folding */ | |
4035 if (y_type == MCHAR) | |
4036 changed_lines(curwin->w_cursor.lnum, col, | |
4037 curwin->w_cursor.lnum + 1, nr_lines); | |
4038 else | |
4039 changed_lines(curbuf->b_op_start.lnum, 0, | |
4040 curbuf->b_op_start.lnum, nr_lines); | |
4041 | |
4042 /* put '] mark at last inserted character */ | |
4043 curbuf->b_op_end.lnum = lnum; | |
4044 /* correct length for change in indent */ | |
4045 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
4046 if (col > 1) | |
4047 curbuf->b_op_end.col = col - 1; | |
4048 else | |
4049 curbuf->b_op_end.col = 0; | |
4050 | |
168 | 4051 if (flags & PUT_CURSLINE) |
4052 { | |
237 | 4053 /* ":put": put cursor on last inserted line */ |
168 | 4054 curwin->w_cursor.lnum = lnum; |
4055 beginline(BL_WHITE | BL_FIX); | |
4056 } | |
4057 else if (flags & PUT_CURSEND) | |
7 | 4058 { |
4059 /* put cursor after inserted text */ | |
4060 if (y_type == MLINE) | |
4061 { | |
4062 if (lnum >= curbuf->b_ml.ml_line_count) | |
4063 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
4064 else | |
4065 curwin->w_cursor.lnum = lnum + 1; | |
4066 curwin->w_cursor.col = 0; | |
4067 } | |
4068 else | |
4069 { | |
4070 curwin->w_cursor.lnum = lnum; | |
4071 curwin->w_cursor.col = col; | |
4072 } | |
4073 } | |
4074 else if (y_type == MLINE) | |
4075 { | |
168 | 4076 /* put cursor on first non-blank in first inserted line */ |
7 | 4077 curwin->w_cursor.col = 0; |
4078 if (dir == FORWARD) | |
4079 ++curwin->w_cursor.lnum; | |
4080 beginline(BL_WHITE | BL_FIX); | |
4081 } | |
4082 else /* put cursor on first inserted character */ | |
4083 curwin->w_cursor = new_cursor; | |
4084 } | |
4085 } | |
4086 | |
4087 msgmore(nr_lines); | |
4088 curwin->w_set_curswant = TRUE; | |
4089 | |
4090 end: | |
4091 if (allocated) | |
4092 vim_free(insert_string); | |
840 | 4093 if (regname == '=') |
4094 vim_free(y_array); | |
4095 | |
5380 | 4096 VIsual_active = FALSE; |
4097 | |
140 | 4098 /* If the cursor is past the end of the line put it at the end. */ |
844 | 4099 adjust_cursor_eol(); |
4100 } | |
4101 | |
4102 /* | |
4103 * When the cursor is on the NUL past the end of the line and it should not be | |
4104 * there move it left. | |
4105 */ | |
4106 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4107 adjust_cursor_eol(void) |
844 | 4108 { |
4109 if (curwin->w_cursor.col > 0 | |
4110 && gchar_cursor() == NUL | |
773 | 4111 #ifdef FEAT_VIRTUALEDIT |
4112 && (ve_flags & VE_ONEMORE) == 0 | |
4113 #endif | |
7 | 4114 && !(restart_edit || (State & INSERT))) |
4115 { | |
557 | 4116 /* Put the cursor on the last character in the line. */ |
555 | 4117 dec_cursor(); |
844 | 4118 |
7 | 4119 #ifdef FEAT_VIRTUALEDIT |
4120 if (ve_flags == VE_ALL) | |
557 | 4121 { |
4122 colnr_T scol, ecol; | |
4123 | |
4124 /* Coladd is set to the width of the last character. */ | |
4125 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
4126 curwin->w_cursor.coladd = ecol - scol + 1; | |
4127 } | |
7 | 4128 #endif |
4129 } | |
4130 } | |
4131 | |
4132 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
4133 /* | |
4134 * Return TRUE if lines starting with '#' should be left aligned. | |
4135 */ | |
4136 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4137 preprocs_left(void) |
7 | 4138 { |
4139 return | |
4140 # ifdef FEAT_SMARTINDENT | |
4141 # ifdef FEAT_CINDENT | |
4142 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
4143 # else | |
4144 curbuf->b_p_si | |
4145 # endif | |
4146 # endif | |
4147 # ifdef FEAT_CINDENT | |
5438 | 4148 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
4149 && curbuf->b_ind_hash_comment == 0) | |
7 | 4150 # endif |
4151 ; | |
4152 } | |
4153 #endif | |
4154 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4155 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4156 * 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
|
4157 */ |
7 | 4158 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4159 get_register_name(int num) |
7 | 4160 { |
4161 if (num == -1) | |
4162 return '"'; | |
4163 else if (num < 10) | |
4164 return num + '0'; | |
4165 else if (num == DELETION_REGISTER) | |
4166 return '-'; | |
4167 #ifdef FEAT_CLIPBOARD | |
4168 else if (num == STAR_REGISTER) | |
4169 return '*'; | |
4170 else if (num == PLUS_REGISTER) | |
4171 return '+'; | |
4172 #endif | |
4173 else | |
4174 { | |
4175 #ifdef EBCDIC | |
4176 int i; | |
4177 | |
4178 /* EBCDIC is really braindead ... */ | |
4179 i = 'a' + (num - 10); | |
4180 if (i > 'i') | |
4181 i += 7; | |
4182 if (i > 'r') | |
4183 i += 8; | |
4184 return i; | |
4185 #else | |
4186 return num + 'a' - 10; | |
4187 #endif | |
4188 } | |
4189 } | |
4190 | |
4191 /* | |
4192 * ":dis" and ":registers": Display the contents of the yank registers. | |
4193 */ | |
4194 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4195 ex_display(exarg_T *eap) |
7 | 4196 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4197 int i, n; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4198 long j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4199 char_u *p; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4200 yankreg_T *yb; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4201 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4202 int attr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4203 char_u *arg = eap->arg; |
22 | 4204 #ifdef FEAT_MBYTE |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4205 int clen; |
22 | 4206 #else |
4207 # define clen 1 | |
4208 #endif | |
7 | 4209 |
4210 if (arg != NULL && *arg == NUL) | |
4211 arg = NULL; | |
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
4212 attr = HL_ATTR(HLF_8); |
7 | 4213 |
4214 /* Highlight title */ | |
4215 MSG_PUTS_TITLE(_("\n--- Registers ---")); | |
4216 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) | |
4217 { | |
4218 name = get_register_name(i); | |
2644 | 4219 if (arg != NULL && vim_strchr(arg, name) == NULL |
4220 #ifdef ONE_CLIPBOARD | |
4221 /* Star register and plus register contain the same thing. */ | |
4222 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
4223 #endif | |
4224 ) | |
7 | 4225 continue; /* did not ask for this register */ |
4226 | |
4227 #ifdef FEAT_CLIPBOARD | |
4228 /* Adjust register name for "unnamed" in 'clipboard'. | |
4229 * When it's a clipboard register, fill it with the current contents | |
4230 * of the clipboard. */ | |
4231 adjust_clip_reg(&name); | |
4232 (void)may_get_selection(name); | |
4233 #endif | |
4234 | |
4235 if (i == -1) | |
4236 { | |
4237 if (y_previous != NULL) | |
4238 yb = y_previous; | |
4239 else | |
4240 yb = &(y_regs[0]); | |
4241 } | |
4242 else | |
4243 yb = &(y_regs[i]); | |
2000 | 4244 |
4245 #ifdef FEAT_EVAL | |
4246 if (name == MB_TOLOWER(redir_reg) | |
4247 || (redir_reg == '"' && yb == y_previous)) | |
4248 continue; /* do not list register being written to, the | |
4249 * pointer can be freed */ | |
4250 #endif | |
4251 | |
7 | 4252 if (yb->y_array != NULL) |
4253 { | |
4254 msg_putchar('\n'); | |
4255 msg_putchar('"'); | |
4256 msg_putchar(name); | |
4257 MSG_PUTS(" "); | |
4258 | |
4259 n = (int)Columns - 6; | |
4260 for (j = 0; j < yb->y_size && n > 1; ++j) | |
4261 { | |
4262 if (j) | |
4263 { | |
4264 MSG_PUTS_ATTR("^J", attr); | |
4265 n -= 2; | |
4266 } | |
4267 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
4268 { | |
4269 #ifdef FEAT_MBYTE | |
474 | 4270 clen = (*mb_ptr2len)(p); |
22 | 4271 #endif |
4272 msg_outtrans_len(p, clen); | |
4273 #ifdef FEAT_MBYTE | |
4274 p += clen - 1; | |
7 | 4275 #endif |
4276 } | |
4277 } | |
4278 if (n > 1 && yb->y_type == MLINE) | |
4279 MSG_PUTS_ATTR("^J", attr); | |
4280 out_flush(); /* show one line at a time */ | |
4281 } | |
4282 ui_breakcheck(); | |
4283 } | |
4284 | |
4285 /* | |
4286 * display last inserted text | |
4287 */ | |
4288 if ((p = get_last_insert()) != NULL | |
4289 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
4290 { | |
4291 MSG_PUTS("\n\". "); | |
4292 dis_msg(p, TRUE); | |
4293 } | |
4294 | |
4295 /* | |
4296 * display last command line | |
4297 */ | |
4298 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
4299 && !got_int) | |
4300 { | |
4301 MSG_PUTS("\n\": "); | |
4302 dis_msg(last_cmdline, FALSE); | |
4303 } | |
4304 | |
4305 /* | |
4306 * display current file name | |
4307 */ | |
4308 if (curbuf->b_fname != NULL | |
4309 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4310 { | |
4311 MSG_PUTS("\n\"% "); | |
4312 dis_msg(curbuf->b_fname, FALSE); | |
4313 } | |
4314 | |
4315 /* | |
4316 * display alternate file name | |
4317 */ | |
4318 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4319 { | |
4320 char_u *fname; | |
4321 linenr_T dummy; | |
4322 | |
4323 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
4324 { | |
4325 MSG_PUTS("\n\"# "); | |
4326 dis_msg(fname, FALSE); | |
4327 } | |
4328 } | |
4329 | |
4330 /* | |
4331 * display last search pattern | |
4332 */ | |
4333 if (last_search_pat() != NULL | |
4334 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
4335 { | |
4336 MSG_PUTS("\n\"/ "); | |
4337 dis_msg(last_search_pat(), FALSE); | |
4338 } | |
4339 | |
4340 #ifdef FEAT_EVAL | |
4341 /* | |
4342 * display last used expression | |
4343 */ | |
4344 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
4345 && !got_int) | |
4346 { | |
4347 MSG_PUTS("\n\"= "); | |
4348 dis_msg(expr_line, FALSE); | |
4349 } | |
4350 #endif | |
4351 } | |
4352 | |
4353 /* | |
4354 * display a string for do_dis() | |
4355 * truncate at end of screen line | |
4356 */ | |
4357 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4358 dis_msg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4359 char_u *p, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4360 int skip_esc) /* if TRUE, ignore trailing ESC */ |
7 | 4361 { |
4362 int n; | |
4363 #ifdef FEAT_MBYTE | |
4364 int l; | |
4365 #endif | |
4366 | |
4367 n = (int)Columns - 6; | |
4368 while (*p != NUL | |
4369 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
4370 && (n -= ptr2cells(p)) >= 0) | |
4371 { | |
4372 #ifdef FEAT_MBYTE | |
474 | 4373 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
7 | 4374 { |
4375 msg_outtrans_len(p, l); | |
4376 p += l; | |
4377 } | |
4378 else | |
4379 #endif | |
4380 msg_outtrans_len(p++, 1); | |
4381 } | |
4382 ui_breakcheck(); | |
4383 } | |
4384 | |
3562 | 4385 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4386 /* | |
4387 * If "process" is TRUE and the line begins with a comment leader (possibly | |
4388 * after some white space), return a pointer to the text after it. Put a boolean | |
4389 * value indicating whether the line ends with an unclosed comment in | |
4390 * "is_comment". | |
4391 * line - line to be processed, | |
4392 * process - if FALSE, will only check whether the line ends with an unclosed | |
3584 | 4393 * comment, |
3562 | 4394 * include_space - whether to also skip space following the comment leader, |
4395 * is_comment - will indicate whether the current line ends with an unclosed | |
3584 | 4396 * comment. |
3562 | 4397 */ |
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4398 char_u * |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4399 skip_comment( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4400 char_u *line, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4401 int process, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4402 int include_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4403 int *is_comment) |
3562 | 4404 { |
4405 char_u *comment_flags = NULL; | |
4406 int lead_len; | |
4407 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
4408 | |
4409 *is_comment = FALSE; | |
4410 if (leader_offset != -1) | |
4411 { | |
4412 /* Let's check whether the line ends with an unclosed comment. | |
4413 * If the last comment leader has COM_END in flags, there's no comment. | |
4414 */ | |
4415 while (*comment_flags) | |
4416 { | |
4417 if (*comment_flags == COM_END | |
4418 || *comment_flags == ':') | |
4419 break; | |
4420 ++comment_flags; | |
4421 } | |
4422 if (*comment_flags != COM_END) | |
4423 *is_comment = TRUE; | |
4424 } | |
4425 | |
4426 if (process == FALSE) | |
4427 return line; | |
4428 | |
4429 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
4430 | |
4431 if (lead_len == 0) | |
4432 return line; | |
4433 | |
4434 /* Find: | |
4435 * - COM_END, | |
4436 * - colon, | |
4437 * whichever comes first. | |
4438 */ | |
4439 while (*comment_flags) | |
4440 { | |
3580 | 4441 if (*comment_flags == COM_END |
3562 | 4442 || *comment_flags == ':') |
4443 { | |
4444 break; | |
4445 } | |
4446 ++comment_flags; | |
4447 } | |
4448 | |
4449 /* If we found a colon, it means that we are not processing a line | |
3580 | 4450 * starting with a closing part of a three-part comment. That's good, |
4451 * because we don't want to remove those as this would be annoying. | |
3562 | 4452 */ |
4453 if (*comment_flags == ':' || *comment_flags == NUL) | |
4454 line += lead_len; | |
4455 | |
4456 return line; | |
4457 } | |
4458 #endif | |
4459 | |
7 | 4460 /* |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4461 * 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
|
4462 * When "save_undo" is TRUE save lines for undo first. |
5848 | 4463 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
4464 * leaders should not be removed. | |
4465 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
4466 * to set those marks. | |
7 | 4467 * |
1217 | 4468 * return FAIL for failure, OK otherwise |
7 | 4469 */ |
4470 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4471 do_join( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4472 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4473 int insert_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4474 int save_undo, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4475 int use_formatoptions UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4476 int setmark) |
7 | 4477 { |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4478 char_u *curr = NULL; |
2597 | 4479 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
|
4480 char_u *cend; |
7 | 4481 char_u *newp; |
2597 | 4482 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
|
4483 int endcurr1 = NUL; |
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4484 int endcurr2 = NUL; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4485 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
|
4486 int sumsize = 0; /* size of the long new line */ |
7 | 4487 linenr_T t; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4488 colnr_T col = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4489 int ret = OK; |
3562 | 4490 #if defined(FEAT_COMMENTS) || defined(PROTO) |
3574 | 4491 int *comments = NULL; |
3562 | 4492 int remove_comments = (use_formatoptions == TRUE) |
4493 && has_format_option(FO_REMOVE_COMS); | |
4494 int prev_was_comment; | |
4495 #endif | |
4496 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4497 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4498 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
|
4499 (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
|
4500 return FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4501 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4502 /* 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
|
4503 * 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
|
4504 * 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
|
4505 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
|
4506 if (spaces == NULL) |
7 | 4507 return FAIL; |
3562 | 4508 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4509 if (remove_comments) | |
4510 { | |
4511 comments = (int *)lalloc_clear((long_u)count * sizeof(int), TRUE); | |
4512 if (comments == NULL) | |
4513 { | |
4514 vim_free(spaces); | |
4515 return FAIL; | |
4516 } | |
4517 } | |
4518 #endif | |
7 | 4519 |
4520 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4521 * 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
|
4522 * and setup the array of space strings lengths |
7 | 4523 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4524 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
|
4525 { |
2597 | 4526 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
5848 | 4527 if (t == 0 && setmark) |
5664 | 4528 { |
4529 /* Set the '[ mark. */ | |
4530 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
4531 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
4532 } | |
3562 | 4533 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4534 if (remove_comments) | |
4535 { | |
4536 /* We don't want to remove the comment leader if the | |
4537 * previous line is not a comment. */ | |
4538 if (t > 0 && prev_was_comment) | |
4539 { | |
4540 | |
4541 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
4542 &prev_was_comment); | |
3576 | 4543 comments[t] = (int)(new_curr - curr); |
3562 | 4544 curr = new_curr; |
4545 } | |
4546 else | |
4547 curr = skip_comment(curr, FALSE, insert_space, | |
4548 &prev_was_comment); | |
4549 } | |
4550 #endif | |
4551 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4552 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
|
4553 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4554 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4555 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
|
4556 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4557 && (!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
|
4558 || (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
|
4559 && (!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
|
4560 || 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
|
4561 #endif |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4562 ) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4563 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4564 /* 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
|
4565 if (endcurr1 == ' ') |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4566 endcurr1 = endcurr2; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4567 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4568 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4569 /* 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
|
4570 if ( p_js |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4571 && (endcurr1 == '.' |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4572 || (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
|
4573 && (endcurr1 == '?' || endcurr1 == '!')))) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4574 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4575 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4576 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4577 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4578 sumsize += currsize + spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4579 endcurr1 = endcurr2 = NUL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4580 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
|
4581 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4582 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4583 if (has_mbyte) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4584 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4585 cend = curr + currsize; |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4586 MB_PTR_BACK(curr, cend); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4587 endcurr1 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4588 if (cend > curr) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4589 { |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4590 MB_PTR_BACK(curr, cend); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4591 endcurr2 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4592 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4593 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4594 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4595 #endif |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4596 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4597 endcurr1 = *(curr + currsize - 1); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4598 if (currsize > 1) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4599 endcurr2 = *(curr + currsize - 2); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4600 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4601 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4602 line_breakcheck(); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4603 if (got_int) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4604 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4605 ret = FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4606 goto theend; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4607 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4608 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4609 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4610 /* 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
|
4611 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
|
4612 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4613 /* 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
|
4614 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
|
4615 cend = newp + sumsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4616 *cend = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4617 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4618 /* |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4619 * 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
|
4620 * |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4621 * 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
|
4622 * 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
|
4623 * 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
|
4624 */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4625 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
|
4626 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4627 cend -= currsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4628 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
|
4629 if (spaces[t] > 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4630 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4631 cend -= spaces[t]; |
6929 | 4632 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
|
4633 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4634 mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t, |
2597 | 4635 (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
|
4636 if (t == 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4637 break; |
2597 | 4638 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1)); |
3562 | 4639 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4640 if (remove_comments) | |
4641 curr += comments[t - 1]; | |
4642 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4643 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
|
4644 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4645 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4646 } |
7 | 4647 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
4648 | |
5848 | 4649 if (setmark) |
4650 { | |
4651 /* Set the '] mark. */ | |
4652 curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; | |
4653 curwin->w_buffer->b_op_end.col = (colnr_T)STRLEN(newp); | |
4654 } | |
5664 | 4655 |
7 | 4656 /* Only report the change in the first line here, del_lines() will report |
4657 * the deleted line. */ | |
4658 changed_lines(curwin->w_cursor.lnum, currsize, | |
4659 curwin->w_cursor.lnum + 1, 0L); | |
4660 | |
4661 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4662 * Delete following lines. To do this we move the cursor there |
7 | 4663 * briefly, and then move it back. After del_lines() the cursor may |
4664 * have moved up (last line deleted), so the current lnum is kept in t. | |
4665 */ | |
4666 t = curwin->w_cursor.lnum; | |
4667 ++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
|
4668 del_lines(count - 1, FALSE); |
7 | 4669 curwin->w_cursor.lnum = t; |
4670 | |
4671 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4672 * Set the cursor column: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4673 * 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
|
4674 * vim: use the column of the last join |
7 | 4675 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4676 curwin->w_cursor.col = |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4677 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
7 | 4678 check_cursor_col(); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4679 |
7 | 4680 #ifdef FEAT_VIRTUALEDIT |
4681 curwin->w_cursor.coladd = 0; | |
4682 #endif | |
4683 curwin->w_set_curswant = TRUE; | |
4684 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4685 theend: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4686 vim_free(spaces); |
3562 | 4687 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4688 if (remove_comments) | |
4689 vim_free(comments); | |
4690 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4691 return ret; |
7 | 4692 } |
4693 | |
4694 #ifdef FEAT_COMMENTS | |
4695 /* | |
4696 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
4697 * the first line. White-space is ignored. Note that the whole of | |
4698 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
4699 */ | |
4700 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4701 same_leader( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4702 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4703 int leader1_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4704 char_u *leader1_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4705 int leader2_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4706 char_u *leader2_flags) |
7 | 4707 { |
4708 int idx1 = 0, idx2 = 0; | |
4709 char_u *p; | |
4710 char_u *line1; | |
4711 char_u *line2; | |
4712 | |
4713 if (leader1_len == 0) | |
4714 return (leader2_len == 0); | |
4715 | |
4716 /* | |
4717 * If first leader has 'f' flag, the lines can be joined only if the | |
4718 * second line does not have a leader. | |
4719 * If first leader has 'e' flag, the lines can never be joined. | |
4720 * If fist leader has 's' flag, the lines can only be joined if there is | |
4721 * some text after it and the second line has the 'm' flag. | |
4722 */ | |
4723 if (leader1_flags != NULL) | |
4724 { | |
4725 for (p = leader1_flags; *p && *p != ':'; ++p) | |
4726 { | |
4727 if (*p == COM_FIRST) | |
4728 return (leader2_len == 0); | |
4729 if (*p == COM_END) | |
4730 return FALSE; | |
4731 if (*p == COM_START) | |
4732 { | |
4733 if (*(ml_get(lnum) + leader1_len) == NUL) | |
4734 return FALSE; | |
4735 if (leader2_flags == NULL || leader2_len == 0) | |
4736 return FALSE; | |
4737 for (p = leader2_flags; *p && *p != ':'; ++p) | |
4738 if (*p == COM_MIDDLE) | |
4739 return TRUE; | |
4740 return FALSE; | |
4741 } | |
4742 } | |
4743 } | |
4744 | |
4745 /* | |
4746 * Get current line and next line, compare the leaders. | |
4747 * The first line has to be saved, only one line can be locked at a time. | |
4748 */ | |
4749 line1 = vim_strsave(ml_get(lnum)); | |
4750 if (line1 != NULL) | |
4751 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4752 for (idx1 = 0; VIM_ISWHITE(line1[idx1]); ++idx1) |
7 | 4753 ; |
4754 line2 = ml_get(lnum + 1); | |
4755 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
4756 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4757 if (!VIM_ISWHITE(line2[idx2])) |
7 | 4758 { |
4759 if (line1[idx1++] != line2[idx2]) | |
4760 break; | |
4761 } | |
4762 else | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4763 while (VIM_ISWHITE(line1[idx1])) |
7 | 4764 ++idx1; |
4765 } | |
4766 vim_free(line1); | |
4767 } | |
4768 return (idx2 == leader2_len && idx1 == leader1_len); | |
4769 } | |
4770 #endif | |
4771 | |
4772 /* | |
3252 | 4773 * Implementation of the format operator 'gq'. |
7 | 4774 */ |
4775 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4776 op_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4777 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4778 int keep_cursor) /* keep cursor on same text char */ |
7 | 4779 { |
4780 long old_line_count = curbuf->b_ml.ml_line_count; | |
4781 | |
4782 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
4783 * can put it back there. */ | |
4784 curwin->w_cursor = oap->cursor_start; | |
4785 | |
4786 if (u_save((linenr_T)(oap->start.lnum - 1), | |
4787 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
4788 return; | |
4789 curwin->w_cursor = oap->start; | |
4790 | |
4791 if (oap->is_VIsual) | |
4792 /* When there is no change: need to remove the Visual selection */ | |
4793 redraw_curbuf_later(INVERTED); | |
4794 | |
4795 /* Set '[ mark at the start of the formatted area */ | |
4796 curbuf->b_op_start = oap->start; | |
4797 | |
4798 /* For "gw" remember the cursor position and put it back below (adjusted | |
4799 * for joined and split lines). */ | |
4800 if (keep_cursor) | |
4801 saved_cursor = oap->cursor_start; | |
4802 | |
1563 | 4803 format_lines(oap->line_count, keep_cursor); |
7 | 4804 |
4805 /* | |
4806 * Leave the cursor at the first non-blank of the last formatted line. | |
4807 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
4808 * line, so "." will do the next lines. | |
4809 */ | |
4810 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
4811 ++curwin->w_cursor.lnum; | |
4812 beginline(BL_WHITE | BL_FIX); | |
4813 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
4814 msgmore(old_line_count); | |
4815 | |
4816 /* put '] mark on the end of the formatted area */ | |
4817 curbuf->b_op_end = curwin->w_cursor; | |
4818 | |
4819 if (keep_cursor) | |
4820 { | |
4821 curwin->w_cursor = saved_cursor; | |
4822 saved_cursor.lnum = 0; | |
4823 } | |
4824 | |
4825 if (oap->is_VIsual) | |
4826 { | |
4827 win_T *wp; | |
4828 | |
4829 FOR_ALL_WINDOWS(wp) | |
4830 { | |
4831 if (wp->w_old_cursor_lnum != 0) | |
4832 { | |
4833 /* When lines have been inserted or deleted, adjust the end of | |
4834 * the Visual area to be redrawn. */ | |
4835 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
4836 wp->w_old_cursor_lnum += old_line_count; | |
4837 else | |
4838 wp->w_old_visual_lnum += old_line_count; | |
4839 } | |
4840 } | |
4841 } | |
4842 } | |
4843 | |
667 | 4844 #if defined(FEAT_EVAL) || defined(PROTO) |
4845 /* | |
4846 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
4847 */ | |
4848 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4849 op_formatexpr(oparg_T *oap) |
667 | 4850 { |
4851 if (oap->is_VIsual) | |
4852 /* When there is no change: need to remove the Visual selection */ | |
4853 redraw_curbuf_later(INVERTED); | |
4854 | |
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4855 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
|
4856 /* 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
|
4857 * internal formatting. */ |
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4858 op_format(oap, FALSE); |
667 | 4859 } |
4860 | |
4861 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4862 fex_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4863 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4864 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4865 int c) /* character to be inserted */ |
667 | 4866 { |
681 | 4867 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
4868 OPT_LOCAL); | |
667 | 4869 int r; |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4870 char_u *fex; |
667 | 4871 |
4872 /* | |
4873 * Set v:lnum to the first line number and v:count to the number of lines. | |
844 | 4874 * Set v:char to the character to be inserted (can be NUL). |
667 | 4875 */ |
4876 set_vim_var_nr(VV_LNUM, lnum); | |
4877 set_vim_var_nr(VV_COUNT, count); | |
1969 | 4878 set_vim_var_char(c); |
844 | 4879 |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4880 /* 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
|
4881 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
|
4882 if (fex == NULL) |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4883 return 0; |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4884 |
667 | 4885 /* |
4886 * Evaluate the function. | |
4887 */ | |
4888 if (use_sandbox) | |
4889 ++sandbox; | |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4890 r = (int)eval_to_number(fex); |
667 | 4891 if (use_sandbox) |
4892 --sandbox; | |
844 | 4893 |
4894 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
|
4895 vim_free(fex); |
844 | 4896 |
667 | 4897 return r; |
4898 } | |
4899 #endif | |
4900 | |
7 | 4901 /* |
4902 * Format "line_count" lines, starting at the cursor position. | |
4903 * When "line_count" is negative, format until the end of the paragraph. | |
4904 * Lines after the cursor line are saved for undo, caller must have saved the | |
4905 * first line. | |
4906 */ | |
4907 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4908 format_lines( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4909 linenr_T line_count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4910 int avoid_fex) /* don't use 'formatexpr' */ |
7 | 4911 { |
4912 int max_len; | |
4913 int is_not_par; /* current line not part of parag. */ | |
4914 int next_is_not_par; /* next line not part of paragraph */ | |
4915 int is_end_par; /* at end of paragraph */ | |
4916 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
4917 int next_is_start_par = FALSE; | |
4918 #ifdef FEAT_COMMENTS | |
4919 int leader_len = 0; /* leader len of current line */ | |
4920 int next_leader_len; /* leader len of next line */ | |
4921 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
4922 char_u *next_leader_flags; /* flags for leader of next line */ | |
4923 int do_comments; /* format comments */ | |
3584 | 4924 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
7 | 4925 #endif |
4926 int advance = TRUE; | |
3584 | 4927 int second_indent = -1; /* indent for second line (comment |
4928 * aware) */ | |
7 | 4929 int do_second_indent; |
4930 int do_number_indent; | |
4931 int do_trail_white; | |
4932 int first_par_line = TRUE; | |
4933 int smd_save; | |
4934 long count; | |
4935 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
4936 int force_format = FALSE; | |
4937 int old_State = State; | |
4938 | |
4939 /* length of a line to force formatting: 3 * 'tw' */ | |
4940 max_len = comp_textwidth(TRUE) * 3; | |
4941 | |
4942 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
4943 #ifdef FEAT_COMMENTS | |
4944 do_comments = has_format_option(FO_Q_COMS); | |
4945 #endif | |
4946 do_second_indent = has_format_option(FO_Q_SECOND); | |
4947 do_number_indent = has_format_option(FO_Q_NUMBER); | |
4948 do_trail_white = has_format_option(FO_WHITE_PAR); | |
4949 | |
4950 /* | |
4951 * Get info about the previous and current line. | |
4952 */ | |
4953 if (curwin->w_cursor.lnum > 1) | |
4954 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
4955 #ifdef FEAT_COMMENTS | |
4956 , &leader_len, &leader_flags, do_comments | |
4957 #endif | |
4958 ); | |
4959 else | |
4960 is_not_par = TRUE; | |
4961 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
4962 #ifdef FEAT_COMMENTS | |
4963 , &next_leader_len, &next_leader_flags, do_comments | |
4964 #endif | |
4965 ); | |
4966 is_end_par = (is_not_par || next_is_not_par); | |
4967 if (!is_end_par && do_trail_white) | |
4968 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
4969 | |
4970 curwin->w_cursor.lnum--; | |
4971 for (count = line_count; count != 0 && !got_int; --count) | |
4972 { | |
4973 /* | |
4974 * Advance to next paragraph. | |
4975 */ | |
4976 if (advance) | |
4977 { | |
4978 curwin->w_cursor.lnum++; | |
4979 prev_is_end_par = is_end_par; | |
4980 is_not_par = next_is_not_par; | |
4981 #ifdef FEAT_COMMENTS | |
4982 leader_len = next_leader_len; | |
4983 leader_flags = next_leader_flags; | |
4984 #endif | |
4985 } | |
4986 | |
4987 /* | |
4988 * The last line to be formatted. | |
4989 */ | |
4990 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
4991 { | |
4992 next_is_not_par = TRUE; | |
4993 #ifdef FEAT_COMMENTS | |
4994 next_leader_len = 0; | |
4995 next_leader_flags = NULL; | |
4996 #endif | |
4997 } | |
4998 else | |
4999 { | |
5000 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
5001 #ifdef FEAT_COMMENTS | |
5002 , &next_leader_len, &next_leader_flags, do_comments | |
5003 #endif | |
5004 ); | |
5005 if (do_number_indent) | |
5006 next_is_start_par = | |
5007 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
5008 } | |
5009 advance = TRUE; | |
5010 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
5011 if (!is_end_par && do_trail_white) | |
5012 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
5013 | |
5014 /* | |
5015 * Skip lines that are not in a paragraph. | |
5016 */ | |
5017 if (is_not_par) | |
5018 { | |
5019 if (line_count < 0) | |
5020 break; | |
5021 } | |
5022 else | |
5023 { | |
5024 /* | |
5025 * For the first line of a paragraph, check indent of second line. | |
5026 * Don't do this for comments and empty lines. | |
5027 */ | |
5028 if (first_par_line | |
5029 && (do_second_indent || do_number_indent) | |
5030 && prev_is_end_par | |
3584 | 5031 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
5032 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
5033 if (do_second_indent && !LINEEMPTY(curwin->w_cursor.lnum + 1)) |
3584 | 5034 { |
5035 #ifdef FEAT_COMMENTS | |
5036 if (leader_len == 0 && next_leader_len == 0) | |
5037 { | |
5038 /* no comment found */ | |
5039 #endif | |
5040 second_indent = | |
5041 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
7 | 5042 #ifdef FEAT_COMMENTS |
3584 | 5043 } |
5044 else | |
5045 { | |
5046 second_indent = next_leader_len; | |
5047 do_comments_list = 1; | |
5048 } | |
5049 #endif | |
5050 } | |
7 | 5051 else if (do_number_indent) |
3584 | 5052 { |
5053 #ifdef FEAT_COMMENTS | |
5054 if (leader_len == 0 && next_leader_len == 0) | |
5055 { | |
5056 /* no comment found */ | |
5057 #endif | |
5058 second_indent = | |
5059 get_number_indent(curwin->w_cursor.lnum); | |
5060 #ifdef FEAT_COMMENTS | |
5061 } | |
5062 else | |
5063 { | |
5064 /* get_number_indent() is now "comment aware"... */ | |
5065 second_indent = | |
5066 get_number_indent(curwin->w_cursor.lnum); | |
5067 do_comments_list = 1; | |
5068 } | |
5069 #endif | |
5070 } | |
7 | 5071 } |
5072 | |
5073 /* | |
5074 * When the comment leader changes, it's the end of the paragraph. | |
5075 */ | |
5076 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
5077 #ifdef FEAT_COMMENTS | |
5078 || !same_leader(curwin->w_cursor.lnum, | |
5079 leader_len, leader_flags, | |
5080 next_leader_len, next_leader_flags) | |
5081 #endif | |
5082 ) | |
5083 is_end_par = TRUE; | |
5084 | |
5085 /* | |
5086 * If we have got to the end of a paragraph, or the line is | |
5087 * getting long, format it. | |
5088 */ | |
5089 if (is_end_par || force_format) | |
5090 { | |
5091 if (need_set_indent) | |
5092 /* replace indent in first line with minimal number of | |
5093 * tabs and spaces, according to current options */ | |
5094 (void)set_indent(get_indent(), SIN_CHANGED); | |
5095 | |
5096 /* put cursor on last non-space */ | |
5097 State = NORMAL; /* don't go past end-of-line */ | |
5098 coladvance((colnr_T)MAXCOL); | |
5099 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
5100 dec_cursor(); | |
5101 | |
5102 /* do the formatting, without 'showmode' */ | |
5103 State = INSERT; /* for open_line() */ | |
5104 smd_save = p_smd; | |
5105 p_smd = FALSE; | |
5106 insertchar(NUL, INSCHAR_FORMAT | |
5107 #ifdef FEAT_COMMENTS | |
5108 + (do_comments ? INSCHAR_DO_COM : 0) | |
3584 | 5109 + (do_comments && do_comments_list |
5110 ? INSCHAR_COM_LIST : 0) | |
7 | 5111 #endif |
1563 | 5112 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
7 | 5113 State = old_State; |
5114 p_smd = smd_save; | |
5115 second_indent = -1; | |
5116 /* at end of par.: need to set indent of next par. */ | |
5117 need_set_indent = is_end_par; | |
5118 if (is_end_par) | |
5119 { | |
5120 /* When called with a negative line count, break at the | |
5121 * end of the paragraph. */ | |
5122 if (line_count < 0) | |
5123 break; | |
5124 first_par_line = TRUE; | |
5125 } | |
5126 force_format = FALSE; | |
5127 } | |
5128 | |
5129 /* | |
5130 * When still in same paragraph, join the lines together. But | |
5403 | 5131 * first delete the leader from the second line. |
7 | 5132 */ |
5133 if (!is_end_par) | |
5134 { | |
5135 advance = FALSE; | |
5136 curwin->w_cursor.lnum++; | |
5137 curwin->w_cursor.col = 0; | |
5138 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
|
5139 break; |
7 | 5140 #ifdef FEAT_COMMENTS |
5141 if (next_leader_len > 0) | |
5403 | 5142 { |
5143 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
7 | 5144 mark_col_adjust(curwin->w_cursor.lnum, (colnr_T)0, 0L, |
5145 (long)-next_leader_len); | |
5403 | 5146 } else |
5147 #endif | |
5148 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
5149 { | |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
5150 int indent = getwhitecols_curline(); |
5403 | 5151 |
5152 if (indent > 0) | |
5153 { | |
5154 (void)del_bytes(indent, FALSE, FALSE); | |
5155 mark_col_adjust(curwin->w_cursor.lnum, | |
5156 (colnr_T)0, 0L, (long)-indent); | |
5415 | 5157 } |
5403 | 5158 } |
7 | 5159 curwin->w_cursor.lnum--; |
5848 | 5160 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
7 | 5161 { |
5162 beep_flush(); | |
5163 break; | |
5164 } | |
5165 first_par_line = FALSE; | |
5166 /* If the line is getting long, format it next time */ | |
5167 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
5168 force_format = TRUE; | |
5169 else | |
5170 force_format = FALSE; | |
5171 } | |
5172 } | |
5173 line_breakcheck(); | |
5174 } | |
5175 } | |
5176 | |
5177 /* | |
5178 * Return TRUE if line "lnum" ends in a white character. | |
5179 */ | |
5180 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5181 ends_in_white(linenr_T lnum) |
7 | 5182 { |
5183 char_u *s = ml_get(lnum); | |
5184 size_t l; | |
5185 | |
5186 if (*s == NUL) | |
5187 return FALSE; | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5188 /* Don't use STRLEN() inside VIM_ISWHITE(), SAS/C complains: "macro |
7 | 5189 * invocation may call function multiple times". */ |
5190 l = STRLEN(s) - 1; | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5191 return VIM_ISWHITE(s[l]); |
7 | 5192 } |
5193 | |
5194 /* | |
5195 * Blank lines, and lines containing only the comment leader, are left | |
5196 * untouched by the formatting. The function returns TRUE in this | |
5197 * case. It also returns TRUE when a line starts with the end of a comment | |
5198 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
5199 * previous line. A new paragraph starts after a blank line, or when the | |
5200 * comment leader changes -- webb. | |
5201 */ | |
5202 #ifdef FEAT_COMMENTS | |
5203 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5204 fmt_check_par( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5205 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5206 int *leader_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5207 char_u **leader_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5208 int do_comments) |
7 | 5209 { |
5210 char_u *flags = NULL; /* init for GCC */ | |
5211 char_u *ptr; | |
5212 | |
5213 ptr = ml_get(lnum); | |
5214 if (do_comments) | |
3562 | 5215 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
7 | 5216 else |
5217 *leader_len = 0; | |
5218 | |
5219 if (*leader_len > 0) | |
5220 { | |
5221 /* | |
5222 * Search for 'e' flag in comment leader flags. | |
5223 */ | |
5224 flags = *leader_flags; | |
5225 while (*flags && *flags != ':' && *flags != COM_END) | |
5226 ++flags; | |
5227 } | |
5228 | |
5229 return (*skipwhite(ptr + *leader_len) == NUL | |
5230 || (*leader_len > 0 && *flags == COM_END) | |
5231 || startPS(lnum, NUL, FALSE)); | |
5232 } | |
5233 #else | |
5234 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5235 fmt_check_par(linenr_T lnum) |
7 | 5236 { |
5237 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
5238 } | |
5239 #endif | |
5240 | |
5241 /* | |
5242 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
5243 * previous line is in the same paragraph. Used for auto-formatting. | |
5244 */ | |
5245 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5246 paragraph_start(linenr_T lnum) |
7 | 5247 { |
5248 char_u *p; | |
5249 #ifdef FEAT_COMMENTS | |
5250 int leader_len = 0; /* leader len of current line */ | |
5251 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
5252 int next_leader_len; /* leader len of next line */ | |
5253 char_u *next_leader_flags; /* flags for leader of next line */ | |
5254 int do_comments; /* format comments */ | |
5255 #endif | |
5256 | |
5257 if (lnum <= 1) | |
5258 return TRUE; /* start of the file */ | |
5259 | |
5260 p = ml_get(lnum - 1); | |
5261 if (*p == NUL) | |
5262 return TRUE; /* after empty line */ | |
5263 | |
5264 #ifdef FEAT_COMMENTS | |
5265 do_comments = has_format_option(FO_Q_COMS); | |
5266 #endif | |
5267 if (fmt_check_par(lnum - 1 | |
5268 #ifdef FEAT_COMMENTS | |
5269 , &leader_len, &leader_flags, do_comments | |
5270 #endif | |
5271 )) | |
5272 return TRUE; /* after non-paragraph line */ | |
5273 | |
5274 if (fmt_check_par(lnum | |
5275 #ifdef FEAT_COMMENTS | |
5276 , &next_leader_len, &next_leader_flags, do_comments | |
5277 #endif | |
5278 )) | |
5279 return TRUE; /* "lnum" is not a paragraph line */ | |
5280 | |
5281 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
5282 return TRUE; /* missing trailing space in previous line. */ | |
5283 | |
5284 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
5285 return TRUE; /* numbered item starts in "lnum". */ | |
5286 | |
5287 #ifdef FEAT_COMMENTS | |
5288 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
5289 next_leader_len, next_leader_flags)) | |
5290 return TRUE; /* change of comment leader. */ | |
5291 #endif | |
5292 | |
5293 return FALSE; | |
5294 } | |
5295 | |
5296 /* | |
5297 * prepare a few things for block mode yank/delete/tilde | |
5298 * | |
5299 * for delete: | |
5300 * - textlen includes the first/last char to be (partly) deleted | |
5301 * - start/endspaces is the number of columns that are taken by the | |
5302 * first/last deleted char minus the number of columns that have to be | |
1839 | 5303 * deleted. |
5304 * for yank and tilde: | |
7 | 5305 * - textlen includes the first/last char to be wholly yanked |
5306 * - start/endspaces is the number of columns of the first/last yanked char | |
5307 * that are to be yanked. | |
5308 */ | |
5309 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5310 block_prep( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5311 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5312 struct block_def *bdp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5313 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5314 int is_del) |
7 | 5315 { |
5316 int incr = 0; | |
5317 char_u *pend; | |
5318 char_u *pstart; | |
5319 char_u *line; | |
5320 char_u *prev_pstart; | |
5321 char_u *prev_pend; | |
5322 | |
5323 bdp->startspaces = 0; | |
5324 bdp->endspaces = 0; | |
5325 bdp->textlen = 0; | |
5326 bdp->start_vcol = 0; | |
5327 bdp->end_vcol = 0; | |
5328 #ifdef FEAT_VISUALEXTRA | |
5329 bdp->is_short = FALSE; | |
5330 bdp->is_oneChar = FALSE; | |
5331 bdp->pre_whitesp = 0; | |
5332 bdp->pre_whitesp_c = 0; | |
5333 bdp->end_char_vcols = 0; | |
5334 #endif | |
5335 bdp->start_char_vcols = 0; | |
5336 | |
5337 line = ml_get(lnum); | |
5338 pstart = line; | |
5339 prev_pstart = line; | |
5340 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
5341 { | |
5342 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 5343 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
7 | 5344 bdp->start_vcol += incr; |
5345 #ifdef FEAT_VISUALEXTRA | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5346 if (VIM_ISWHITE(*pstart)) |
7 | 5347 { |
5348 bdp->pre_whitesp += incr; | |
5349 bdp->pre_whitesp_c++; | |
5350 } | |
5351 else | |
5352 { | |
5353 bdp->pre_whitesp = 0; | |
5354 bdp->pre_whitesp_c = 0; | |
5355 } | |
5356 #endif | |
5357 prev_pstart = pstart; | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
5358 MB_PTR_ADV(pstart); |
7 | 5359 } |
5360 bdp->start_char_vcols = incr; | |
5361 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
5362 { | |
5363 bdp->end_vcol = bdp->start_vcol; | |
5364 #ifdef FEAT_VISUALEXTRA | |
5365 bdp->is_short = TRUE; | |
5366 #endif | |
5367 if (!is_del || oap->op_type == OP_APPEND) | |
5368 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
5369 } | |
5370 else | |
5371 { | |
5372 /* notice: this converts partly selected Multibyte characters to | |
5373 * spaces, too. */ | |
5374 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
5375 if (is_del && bdp->startspaces) | |
5376 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
5377 pend = pstart; | |
5378 bdp->end_vcol = bdp->start_vcol; | |
5379 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
5380 { | |
5381 #ifdef FEAT_VISUALEXTRA | |
5382 bdp->is_oneChar = TRUE; | |
5383 #endif | |
5384 if (oap->op_type == OP_INSERT) | |
5385 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5386 else if (oap->op_type == OP_APPEND) | |
5387 { | |
5388 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
5389 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5390 } | |
5391 else | |
5392 { | |
5393 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
5394 if (is_del && oap->op_type != OP_LSHIFT) | |
5395 { | |
5396 /* just putting the sum of those two into | |
5397 * bdp->startspaces doesn't work for Visual replace, | |
5398 * so we have to split the tab in two */ | |
5399 bdp->startspaces = bdp->start_char_vcols | |
5400 - (bdp->start_vcol - oap->start_vcol); | |
5401 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5402 } | |
5403 } | |
5404 } | |
5405 else | |
5406 { | |
5407 prev_pend = pend; | |
5408 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
5409 { | |
5410 /* Count a tab for what it's worth (if list mode not on) */ | |
5411 prev_pend = pend; | |
6535 | 5412 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
7 | 5413 bdp->end_vcol += incr; |
5414 } | |
5415 if (bdp->end_vcol <= oap->end_vcol | |
5416 && (!is_del | |
5417 || oap->op_type == OP_APPEND | |
5418 || oap->op_type == OP_REPLACE)) /* line too short */ | |
5419 { | |
5420 #ifdef FEAT_VISUALEXTRA | |
5421 bdp->is_short = TRUE; | |
5422 #endif | |
5423 /* Alternative: include spaces to fill up the block. | |
5424 * Disadvantage: can lead to trailing spaces when the line is | |
5425 * short where the text is put */ | |
5426 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
5427 if (oap->op_type == OP_APPEND || virtual_op) | |
5428 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
593 | 5429 + oap->inclusive; |
7 | 5430 else |
5431 bdp->endspaces = 0; /* replace doesn't add characters */ | |
5432 } | |
5433 else if (bdp->end_vcol > oap->end_vcol) | |
5434 { | |
5435 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5436 if (!is_del && bdp->endspaces) | |
5437 { | |
5438 bdp->endspaces = incr - bdp->endspaces; | |
5439 if (pend != pstart) | |
5440 pend = prev_pend; | |
5441 } | |
5442 } | |
5443 } | |
5444 #ifdef FEAT_VISUALEXTRA | |
5445 bdp->end_char_vcols = incr; | |
5446 #endif | |
5447 if (is_del && bdp->startspaces) | |
5448 pstart = prev_pstart; | |
5449 bdp->textlen = (int)(pend - pstart); | |
5450 } | |
5451 bdp->textcol = (colnr_T) (pstart - line); | |
5452 bdp->textstart = pstart; | |
5453 } | |
5454 | |
5455 /* | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5456 * Handle the add/subtract operator. |
7 | 5457 */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5458 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5459 op_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5460 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5461 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
|
5462 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
|
5463 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5464 pos_T pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5465 struct block_def bd; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5466 int change_cnt = 0; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5467 linenr_T amount = Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5468 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5469 if (!VIsual_active) |
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 pos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5472 if (u_save_cursor() == FAIL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5473 return; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5474 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
|
5475 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5476 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
|
5477 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5478 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5479 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5480 int one_change; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5481 int length; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5482 pos_T startpos; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5483 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5484 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
|
5485 (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
|
5486 return; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5487 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5488 pos = oap->start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5489 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
|
5490 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5491 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
|
5492 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5493 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
|
5494 pos.col = bd.textcol; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5495 length = bd.textlen; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5496 } |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5497 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
|
5498 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5499 curwin->w_cursor.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5500 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5501 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
|
5502 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5503 else /* oap->motion_type == MCHAR */ |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5504 { |
12996
973a0037f4c3
patch 8.0.1374: CTRL-A does not work with an empty line
Christian Brabandt <cb@256bit.org>
parents:
12642
diff
changeset
|
5505 if (pos.lnum == oap->start.lnum && !oap->inclusive) |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5506 dec(&(oap->end)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5507 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
|
5508 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5509 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
|
5510 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5511 pos.col += oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5512 length -= oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5513 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5514 if (pos.lnum == oap->end.lnum) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5515 { |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5516 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
|
5517 if (oap->end.col >= length) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5518 oap->end.col = length - 1; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5519 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
|
5520 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5521 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5522 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
|
5523 if (one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5524 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5525 /* 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
|
5526 if (change_cnt == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5527 startpos = curbuf->b_op_start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5528 ++change_cnt; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5529 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5530 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5531 #ifdef FEAT_NETBEANS_INTG |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5532 if (netbeans_active() && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5533 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5534 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
|
5535 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5536 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
|
5537 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
|
5538 &ptr[pos.col], length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5539 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5540 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5541 if (g_cmd && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5542 amount += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5543 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5544 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5545 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
|
5546 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5547 if (!change_cnt && oap->is_VIsual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5548 /* 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
|
5549 redraw_curbuf_later(INVERTED); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5550 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5551 /* 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
|
5552 * position from do_addsub(). */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5553 if (change_cnt > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5554 curbuf->b_op_start = startpos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5555 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5556 if (change_cnt > p_report) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5557 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5558 if (change_cnt == 1) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5559 MSG(_("1 line changed")); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5560 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5561 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
|
5562 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5563 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5564 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5565 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5566 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5567 * 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
|
5568 * 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
|
5569 * |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5570 * 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
|
5571 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5572 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5573 do_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5574 int op_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5575 pos_T *pos, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5576 int length, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5577 linenr_T Prenum1) |
7 | 5578 { |
5579 int col; | |
5580 char_u *buf1; | |
5581 char_u buf2[NUMBUFLEN]; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5582 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
7 | 5583 static int hexupper = FALSE; /* 0xABC */ |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5584 uvarnumber_T n; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5585 uvarnumber_T oldn; |
7 | 5586 char_u *ptr; |
5587 int c; | |
5588 int todel; | |
5589 int dohex; | |
5590 int dooct; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5591 int dobin; |
7 | 5592 int doalp; |
5593 int firstdigit; | |
5594 int subtract; | |
6868 | 5595 int negative = FALSE; |
6891 | 5596 int was_positive = TRUE; |
6868 | 5597 int visual = VIsual_active; |
6921 | 5598 int did_change = FALSE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5599 pos_T save_cursor = curwin->w_cursor; |
6927 | 5600 int maxlen = 0; |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5601 pos_T startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5602 pos_T endpos; |
7 | 5603 |
5604 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
5605 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
|
5606 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
7 | 5607 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
5608 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5609 curwin->w_cursor = *pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5610 ptr = ml_get(pos->lnum); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5611 col = pos->col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5612 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5613 if (*ptr == NUL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5614 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5615 |
7 | 5616 /* |
5617 * First check if we are on a hexadecimal number, after the "0x". | |
5618 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5619 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5620 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5621 if (dobin) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5622 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
|
5623 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5624 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5625 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5626 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5627 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
|
5628 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5629 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5630 |
6868 | 5631 if (dohex) |
5632 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
|
5633 { |
6868 | 5634 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5635 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5636 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5637 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
|
5638 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5639 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5640 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5641 if ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5642 && dohex |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5643 && ! ((col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5644 && (ptr[col] == 'X' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5645 || ptr[col] == 'x') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5646 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5647 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5648 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5649 !(*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
|
5650 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5651 && vim_isxdigit(ptr[col + 1])))) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5652 { |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5653 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5654 /* 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
|
5655 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5656 col = pos->col; |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5657 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5658 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
|
5659 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5660 col--; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5661 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5662 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5663 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
|
5664 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5665 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5666 } |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5667 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5668 if (( dohex |
6868 | 5669 && col > 0 |
5670 && (ptr[col] == 'X' | |
5671 || ptr[col] == 'x') | |
5672 && ptr[col - 1] == '0' | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5673 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5674 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5675 !(*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
|
5676 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5677 && vim_isxdigit(ptr[col + 1])) || |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5678 ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5679 && col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5680 && (ptr[col] == 'B' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5681 || ptr[col] == 'b') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5682 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5683 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5684 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5685 !(*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
|
5686 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5687 && vim_isbdigit(ptr[col + 1]))) |
6868 | 5688 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5689 /* Found hexadecimal or binary number, move to its start. */ |
7 | 5690 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5691 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5692 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5693 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
|
5694 #endif |
6868 | 5695 } |
5696 else | |
7 | 5697 { |
6868 | 5698 /* |
5699 * Search forward and then backward to find the start of number. | |
5700 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5701 col = pos->col; |
6868 | 5702 |
5703 while (ptr[col] != NUL | |
5704 && !vim_isdigit(ptr[col]) | |
5705 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5706 col += MB_PTR2LEN(ptr + col); |
6868 | 5707 |
5708 while (col > 0 | |
5709 && vim_isdigit(ptr[col - 1]) | |
5710 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5711 { |
6868 | 5712 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5713 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5714 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5715 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
|
5716 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5717 } |
6868 | 5718 } |
5719 } | |
5720 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5721 if (visual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5722 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5723 while (ptr[col] != NUL && length > 0 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5724 && !vim_isdigit(ptr[col]) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5725 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5726 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5727 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
|
5728 |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5729 col += mb_len; |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5730 length -= mb_len; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5731 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5732 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5733 if (length == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5734 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5735 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5736 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
|
5737 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5738 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5739 !(*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
|
5740 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5741 ) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5742 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5743 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5744 was_positive = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5745 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5746 } |
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 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5749 * 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
|
5750 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5751 firstdigit = ptr[col]; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5752 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
|
5753 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5754 beep_flush(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5755 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5756 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5757 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5758 if (doalp && ASCII_ISALPHA(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5759 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5760 /* decrement or increment alphabetic character */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5761 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5762 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5763 if (CharOrd(firstdigit) < Prenum1) |
6927 | 5764 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5765 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5766 firstdigit = 'A'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5767 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5768 firstdigit = 'a'; |
6927 | 5769 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5770 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5771 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5772 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5773 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5774 firstdigit -= Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5775 #endif |
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 else |
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 if (26 - CharOrd(firstdigit) - 1 < Prenum1) |
6927 | 5780 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5781 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5782 firstdigit = 'Z'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5783 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5784 firstdigit = 'z'; |
6927 | 5785 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5786 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5787 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5788 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5789 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5790 firstdigit += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5791 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5792 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5793 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5794 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5795 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5796 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5797 (void)del_char(FALSE); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5798 ins_char(firstdigit); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5799 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5800 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5801 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5802 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5803 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5804 if (col > 0 && ptr[col - 1] == '-' |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5805 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5806 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5807 !(*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
|
5808 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5809 && !visual) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5810 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5811 /* negative number */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5812 --col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5813 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5814 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5815 /* get the number value (unsigned) */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5816 if (visual && VIsual_mode != 'V') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5817 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
|
5818 ? (int)STRLEN(ptr) - col |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5819 : length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5820 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5821 vim_str2nr(ptr + col, &pre, &length, |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5822 0 + (dobin ? STR2NR_BIN : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5823 + (dooct ? STR2NR_OCT : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5824 + (dohex ? STR2NR_HEX : 0), |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5825 NULL, &n, maxlen); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5826 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5827 /* 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
|
5828 if (pre && negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5829 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5830 ++col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5831 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5832 negative = FALSE; |
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 /* add or subtract */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5835 subtract = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5836 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5837 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5838 if (negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5839 subtract ^= TRUE; |
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 oldn = n; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5842 if (subtract) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5843 n -= (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5844 else |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5845 n += (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5846 /* handle wraparound for decimal numbers */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5847 if (!pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5848 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5849 if (subtract) |
6927 | 5850 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5851 if (n > oldn) |
6868 | 5852 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5853 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
|
5854 negative ^= TRUE; |
6868 | 5855 } |
7 | 5856 } |
5857 else | |
6868 | 5858 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5859 /* add */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5860 if (n < oldn) |
6868 | 5861 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5862 n = (n ^ (uvarnumber_T)-1); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5863 negative ^= TRUE; |
6868 | 5864 } |
6927 | 5865 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5866 if (n == 0) |
6868 | 5867 negative = FALSE; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5868 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5869 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5870 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
|
5871 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5872 /* need to remove the '-' */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5873 col--; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5874 length++; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5875 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5876 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5877 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5878 * Delete the old number. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5879 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5880 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5881 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5882 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5883 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5884 todel = length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5885 c = gchar_cursor(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5886 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5887 * 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
|
5888 * 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
|
5889 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5890 if (c == '-') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5891 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5892 while (todel-- > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5893 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5894 if (c < 0x100 && isalpha(c)) |
6868 | 5895 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5896 if (isupper(c)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5897 hexupper = TRUE; |
6868 | 5898 else |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5899 hexupper = FALSE; |
6891 | 5900 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5901 /* 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
|
5902 (void)del_char(FALSE); |
6868 | 5903 c = gchar_cursor(); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5904 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5905 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5906 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5907 * Prepare the leading characters in buf1[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5908 * 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
|
5909 * Allocate a bit too much. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5910 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5911 buf1 = alloc((unsigned)length + NUMBUFLEN); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5912 if (buf1 == NULL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5913 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5914 ptr = buf1; |
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
5915 if (negative && (!visual || was_positive)) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5916 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5917 *ptr++ = '-'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5918 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5919 if (pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5920 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5921 *ptr++ = '0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5922 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5923 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5924 if (pre == 'b' || pre == 'B' || |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5925 pre == 'x' || pre == 'X') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5926 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5927 *ptr++ = pre; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5928 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5929 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5930 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5931 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5932 * Put the number characters in buf2[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5933 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5934 if (pre == 'b' || pre == 'B') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5935 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5936 int i; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5937 int bit = 0; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5938 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
|
5939 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5940 /* leading zeros */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5941 for (bit = bits; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5942 if ((n >> (bit - 1)) & 0x1) break; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5943 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5944 for (i = 0; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5945 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
|
5946 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5947 buf2[i] = '\0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5948 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5949 else if (pre == 0) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5950 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
|
5951 else if (pre == '0') |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5952 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
|
5953 else if (pre && hexupper) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5954 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
|
5955 else |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5956 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
|
5957 length -= (int)STRLEN(buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5958 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5959 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5960 * 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
|
5961 * 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
|
5962 * Don't do this when |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5963 * 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
|
5964 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5965 if (firstdigit == '0' && !(dooct && pre == 0)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5966 while (length-- > 0) |
6868 | 5967 *ptr++ = '0'; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5968 *ptr = NUL; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5969 STRCAT(buf1, buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5970 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
|
5971 vim_free(buf1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5972 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5973 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
|
5974 --curwin->w_cursor.col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5975 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5976 |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5977 if (did_change) |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5978 { |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5979 /* set the '[ and '] marks */ |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5980 curbuf->b_op_start = startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5981 curbuf->b_op_end = endpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5982 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
|
5983 --curbuf->b_op_end.col; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5984 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5985 |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5986 theend: |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5987 if (visual) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5988 curwin->w_cursor = save_cursor; |
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5989 else if (did_change) |
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5990 curwin->w_set_curswant = TRUE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5991 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5992 return did_change; |
7 | 5993 } |
5994 | |
5995 #ifdef FEAT_VIMINFO | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5996 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5997 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
|
5998 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5999 #define REG_PREVIOUS 1 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6000 #define REG_EXEC 2 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6001 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6002 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6003 * 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
|
6004 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6005 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
6006 prepare_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6007 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6008 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
|
6009 * (int)sizeof(yankreg_T)); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6010 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6011 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6012 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
6013 finish_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6014 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6015 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6016 int j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6017 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6018 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6019 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6020 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
|
6021 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
|
6022 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6023 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
|
6024 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
|
6025 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
|
6026 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6027 vim_free(y_read_regs); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6028 y_read_regs = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6029 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6030 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6031 |
7 | 6032 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6033 read_viminfo_register(vir_T *virp, int force) |
7 | 6034 { |
6035 int eof; | |
6036 int do_it = TRUE; | |
6037 int size; | |
6038 int limit; | |
6039 int i; | |
6040 int set_prev = FALSE; | |
6041 char_u *str; | |
6042 char_u **array = NULL; | |
6508 | 6043 int new_type = MCHAR; /* init to shut up compiler */ |
6044 colnr_T new_width = 0; /* init to shut up compiler */ | |
7 | 6045 |
6046 /* We only get here (hopefully) if line[0] == '"' */ | |
6047 str = virp->vir_line + 1; | |
1893 | 6048 |
6049 /* If the line starts with "" this is the y_previous register. */ | |
7 | 6050 if (*str == '"') |
6051 { | |
6052 set_prev = TRUE; | |
6053 str++; | |
6054 } | |
1893 | 6055 |
7 | 6056 if (!ASCII_ISALNUM(*str) && *str != '-') |
6057 { | |
6058 if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line)) | |
6059 return TRUE; /* too many errors, pretend end-of-file */ | |
6060 do_it = FALSE; | |
6061 } | |
6062 get_yank_register(*str++, FALSE); | |
6063 if (!force && y_current->y_array != NULL) | |
6064 do_it = FALSE; | |
1893 | 6065 |
6066 if (*str == '@') | |
6067 { | |
6068 /* "x@: register x used for @@ */ | |
6069 if (force || execreg_lastc == NUL) | |
6070 execreg_lastc = str[-1]; | |
6071 } | |
6072 | |
7 | 6073 size = 0; |
6074 limit = 100; /* Optimized for registers containing <= 100 lines */ | |
6075 if (do_it) | |
6076 { | |
6462 | 6077 /* |
6078 * Build the new register in array[]. | |
6079 * y_array is kept as-is until done. | |
6080 * The "do_it" flag is reset when something is wrong, in which case | |
6081 * array[] needs to be freed. | |
6082 */ | |
7 | 6083 if (set_prev) |
6084 y_previous = y_current; | |
6462 | 6085 array = (char_u **)alloc((unsigned)(limit * sizeof(char_u *))); |
1893 | 6086 str = skipwhite(skiptowhite(str)); |
7 | 6087 if (STRNCMP(str, "CHAR", 4) == 0) |
6462 | 6088 new_type = MCHAR; |
7 | 6089 else if (STRNCMP(str, "BLOCK", 5) == 0) |
6462 | 6090 new_type = MBLOCK; |
7 | 6091 else |
6462 | 6092 new_type = MLINE; |
7 | 6093 /* get the block width; if it's missing we get a zero, which is OK */ |
6094 str = skipwhite(skiptowhite(str)); | |
6462 | 6095 new_width = getdigits(&str); |
7 | 6096 } |
6097 | |
6098 while (!(eof = viminfo_readline(virp)) | |
6099 && (virp->vir_line[0] == TAB || virp->vir_line[0] == '<')) | |
6100 { | |
6101 if (do_it) | |
6102 { | |
6462 | 6103 if (size == limit) |
7 | 6104 { |
6462 | 6105 char_u **new_array = (char_u **) |
7 | 6106 alloc((unsigned)(limit * 2 * sizeof(char_u *))); |
6462 | 6107 |
6108 if (new_array == NULL) | |
6109 { | |
6110 do_it = FALSE; | |
6111 break; | |
6112 } | |
7 | 6113 for (i = 0; i < limit; i++) |
6462 | 6114 new_array[i] = array[i]; |
7 | 6115 vim_free(array); |
6462 | 6116 array = new_array; |
7 | 6117 limit *= 2; |
6118 } | |
6119 str = viminfo_readstring(virp, 1, TRUE); | |
6120 if (str != NULL) | |
6121 array[size++] = str; | |
6122 else | |
6462 | 6123 /* error, don't store the result */ |
7 | 6124 do_it = FALSE; |
6125 } | |
6126 } | |
6508 | 6127 |
7 | 6128 if (do_it) |
6129 { | |
6462 | 6130 /* free y_array[] */ |
6131 for (i = 0; i < y_current->y_size; i++) | |
6132 vim_free(y_current->y_array[i]); | |
6133 vim_free(y_current->y_array); | |
6134 | |
6135 y_current->y_type = new_type; | |
6136 y_current->y_width = new_width; | |
6137 y_current->y_size = size; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6138 y_current->y_time_set = 0; |
7 | 6139 if (size == 0) |
6140 { | |
6141 y_current->y_array = NULL; | |
6142 } | |
6462 | 6143 else |
7 | 6144 { |
6462 | 6145 /* Move the lines from array[] to y_array[]. */ |
7 | 6146 y_current->y_array = |
6147 (char_u **)alloc((unsigned)(size * sizeof(char_u *))); | |
6148 for (i = 0; i < size; i++) | |
6462 | 6149 { |
6150 if (y_current->y_array == NULL) | |
6151 vim_free(array[i]); | |
6152 else | |
6153 y_current->y_array[i] = array[i]; | |
6154 } | |
7 | 6155 } |
6462 | 6156 } |
6157 else | |
6158 { | |
6159 /* Free array[] if it was filled. */ | |
6160 for (i = 0; i < size; i++) | |
6161 vim_free(array[i]); | |
6162 } | |
6163 vim_free(array); | |
6164 | |
7 | 6165 return eof; |
6166 } | |
6167 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6168 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6169 * 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
|
6170 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6171 void |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6172 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
|
6173 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6174 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
|
6175 int flags; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6176 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6177 int type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6178 int linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6179 int width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6180 time_t timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6181 yankreg_T *y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6182 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6183 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6184 /* Check the format: |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6185 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6186 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6187 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6188 if (values->ga_len < 6 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6189 || vp[0].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6190 || vp[1].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6191 || vp[2].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6192 || vp[3].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6193 || vp[4].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6194 || vp[5].bv_type != BVAL_NR) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6195 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6196 flags = vp[0].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6197 name = vp[1].bv_nr; |
9307
eb52a2670c96
commit https://github.com/vim/vim/commit/67e3720a9ddd8a9d2e8344358c28fa1f4196db0d
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
6198 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
|
6199 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6200 type = vp[2].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6201 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
|
6202 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6203 linecount = vp[3].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6204 if (values->ga_len < 6 + linecount) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6205 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6206 width = vp[4].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6207 if (width < 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6208 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6209 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6210 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6211 /* 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
|
6212 * 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
|
6213 y_ptr = &y_read_regs[name]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6214 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6215 y_ptr = &y_regs[name]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6216 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6217 /* 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
|
6218 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
|
6219 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
|
6220 && (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
|
6221 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6222 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6223 if (y_ptr->y_array != NULL) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6224 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
|
6225 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
|
6226 vim_free(y_ptr->y_array); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6227 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6228 if (y_read_regs == NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6229 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6230 if (flags & REG_PREVIOUS) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6231 y_previous = y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6232 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
|
6233 execreg_lastc = get_register_name(name); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6234 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6235 y_ptr->y_type = type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6236 y_ptr->y_width = width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6237 y_ptr->y_size = linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6238 y_ptr->y_time_set = timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6239 if (linecount == 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6240 y_ptr->y_array = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6241 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6242 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6243 y_ptr->y_array = |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6244 (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
|
6245 for (i = 0; i < linecount; i++) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6246 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6247 if (vp[i + 6].bv_allocated) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6248 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6249 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
|
6250 vp[i + 6].bv_string = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6251 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6252 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6253 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
|
6254 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6255 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6256 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6257 |
7 | 6258 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6259 write_viminfo_registers(FILE *fp) |
7 | 6260 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6261 int i, j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6262 char_u *type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6263 char_u c; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6264 int num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6265 int max_num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6266 int max_kbyte; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6267 long len; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6268 yankreg_T *y_ptr; |
7 | 6269 |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
6270 fputs(_("\n# Registers:\n"), fp); |
7 | 6271 |
6272 /* Get '<' value, use old '"' value if '<' is not found. */ | |
6273 max_num_lines = get_viminfo_parameter('<'); | |
6274 if (max_num_lines < 0) | |
6275 max_num_lines = get_viminfo_parameter('"'); | |
6276 if (max_num_lines == 0) | |
6277 return; | |
6278 max_kbyte = get_viminfo_parameter('s'); | |
6279 if (max_kbyte == 0) | |
6280 return; | |
1893 | 6281 |
7 | 6282 for (i = 0; i < NUM_REGISTERS; i++) |
6283 { | |
6284 #ifdef FEAT_CLIPBOARD | |
6285 /* Skip '*'/'+' register, we don't want them back next time */ | |
6286 if (i == STAR_REGISTER || i == PLUS_REGISTER) | |
6287 continue; | |
6288 #endif | |
6289 #ifdef FEAT_DND | |
6290 /* Neither do we want the '~' register */ | |
6291 if (i == TILDE_REGISTER) | |
6292 continue; | |
6293 #endif | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6294 /* 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
|
6295 * viminfo if it's newer. */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6296 if (y_read_regs != NULL |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6297 && 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
|
6298 && (y_regs[i].y_array == NULL || |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6299 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
|
6300 y_ptr = &y_read_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6301 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
|
6302 continue; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6303 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6304 y_ptr = &y_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6305 |
55 | 6306 /* Skip empty registers. */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6307 num_lines = y_ptr->y_size; |
55 | 6308 if (num_lines == 0 |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6309 || (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
|
6310 && *y_ptr->y_array[0] == NUL)) |
55 | 6311 continue; |
6312 | |
7 | 6313 if (max_kbyte > 0) |
6314 { | |
6315 /* Skip register if there is more text than the maximum size. */ | |
6316 len = 0; | |
6317 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
|
6318 len += (long)STRLEN(y_ptr->y_array[j]) + 1L; |
7 | 6319 if (len > (long)max_kbyte * 1024L) |
6320 continue; | |
6321 } | |
6322 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6323 switch (y_ptr->y_type) |
7 | 6324 { |
6325 case MLINE: | |
6326 type = (char_u *)"LINE"; | |
6327 break; | |
6328 case MCHAR: | |
6329 type = (char_u *)"CHAR"; | |
6330 break; | |
6331 case MBLOCK: | |
6332 type = (char_u *)"BLOCK"; | |
6333 break; | |
6334 default: | |
6335 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
|
6336 y_ptr->y_type); |
7 | 6337 emsg(IObuff); |
6338 type = (char_u *)"LINE"; | |
6339 break; | |
6340 } | |
6341 if (y_previous == &y_regs[i]) | |
6342 fprintf(fp, "\""); | |
6343 c = get_register_name(i); | |
1893 | 6344 fprintf(fp, "\"%c", c); |
6345 if (c == execreg_lastc) | |
6346 fprintf(fp, "@"); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6347 fprintf(fp, "\t%s\t%d\n", type, (int)y_ptr->y_width); |
7 | 6348 |
6349 /* If max_num_lines < 0, then we save ALL the lines in the register */ | |
6350 if (max_num_lines > 0 && num_lines > max_num_lines) | |
6351 num_lines = max_num_lines; | |
6352 for (j = 0; j < num_lines; j++) | |
6353 { | |
6354 putc('\t', fp); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6355 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
|
6356 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6357 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6358 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6359 int flags = 0; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6360 int remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6361 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6362 /* 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
|
6363 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6364 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6365 * 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
|
6366 * REG_EXEC - used for @@ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6367 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6368 if (y_previous == &y_regs[i]) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6369 flags |= REG_PREVIOUS; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6370 if (c == execreg_lastc) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6371 flags |= REG_EXEC; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6372 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
|
6373 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
|
6374 (long)y_ptr->y_time_set); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6375 /* 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
|
6376 remaining = LSIZE - 71; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6377 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
|
6378 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6379 putc(',', fp); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6380 --remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6381 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
|
6382 remaining); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6383 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6384 putc('\n', fp); |
7 | 6385 } |
6386 } | |
6387 } | |
6388 #endif /* FEAT_VIMINFO */ | |
6389 | |
6390 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
6391 /* | |
6392 * SELECTION / PRIMARY ('*') | |
6393 * | |
6394 * Text selection stuff that uses the GUI selection register '*'. When using a | |
6395 * GUI this may be text from another window, otherwise it is the last text we | |
6396 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
6397 * button performs the paste, otherwise you will need to do <"*p>. " | |
6398 * If not under X, it is synonymous with the clipboard register '+'. | |
6399 * | |
6400 * X CLIPBOARD ('+') | |
6401 * | |
6402 * Text selection stuff that uses the GUI clipboard register '+'. | |
6403 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
6404 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
6405 * otherwise you will need to do <"+p>. " | |
6406 * If not under X, it is synonymous with the selection register '*'. | |
6407 */ | |
6408 | |
6409 /* | |
6410 * 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
|
6411 * so that the text is still available after Vim has exited. X selections |
7 | 6412 * only exist while the owning application exists, so we write to the |
6413 * permanent (while X runs) store CUT_BUFFER0. | |
6414 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
6415 * 'permanent' of the two), otherwise the PRIMARY one. | |
6416 * For now, use a hard-coded sanity limit of 1Mb of data. | |
6417 */ | |
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
6418 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
7 | 6419 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6420 x11_export_final_selection(void) |
7 | 6421 { |
6422 Display *dpy; | |
6423 char_u *str = NULL; | |
6424 long_u len = 0; | |
6425 int motion_type = -1; | |
6426 | |
6427 # ifdef FEAT_GUI | |
6428 if (gui.in_use) | |
6429 dpy = X_DISPLAY; | |
6430 else | |
6431 # endif | |
6432 # ifdef FEAT_XCLIPBOARD | |
6433 dpy = xterm_dpy; | |
6434 # else | |
6435 return; | |
6436 # endif | |
6437 | |
6438 /* Get selection to export */ | |
6439 if (clip_plus.owned) | |
6440 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
6441 else if (clip_star.owned) | |
6442 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
6443 | |
6444 /* Check it's OK */ | |
6445 if (dpy != NULL && str != NULL && motion_type >= 0 | |
6446 && len < 1024*1024 && len > 0) | |
6447 { | |
1924 | 6448 #ifdef FEAT_MBYTE |
4201 | 6449 int ok = TRUE; |
6450 | |
1924 | 6451 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
6452 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
6453 * encoding conversion usually doesn't work, so keep the text as-is. | |
6454 */ | |
6455 if (has_mbyte) | |
6456 { | |
6457 vimconv_T vc; | |
6458 | |
6459 vc.vc_type = CONV_NONE; | |
6460 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
6461 { | |
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6462 int intlen = len; |
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6463 char_u *conv_str; |
2007 | 6464 |
4201 | 6465 vc.vc_fail = TRUE; |
2007 | 6466 conv_str = string_convert(&vc, str, &intlen); |
6467 len = intlen; | |
1924 | 6468 if (conv_str != NULL) |
6469 { | |
6470 vim_free(str); | |
6471 str = conv_str; | |
6472 } | |
4201 | 6473 else |
6474 { | |
6475 ok = FALSE; | |
6476 } | |
1924 | 6477 convert_setup(&vc, NULL, NULL); |
6478 } | |
4201 | 6479 else |
6480 { | |
6481 ok = FALSE; | |
6482 } | |
1924 | 6483 } |
4201 | 6484 |
6485 /* Do not store the string if conversion failed. Better to use any | |
6486 * other selection than garbled text. */ | |
6487 if (ok) | |
6488 #endif | |
6489 { | |
6490 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
6491 XFlush(dpy); | |
6492 } | |
7 | 6493 } |
6494 | |
6495 vim_free(str); | |
6496 } | |
6497 #endif | |
6498 | |
6499 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6500 clip_free_selection(VimClipboard *cbd) |
7 | 6501 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6502 yankreg_T *y_ptr = y_current; |
7 | 6503 |
6504 if (cbd == &clip_plus) | |
6505 y_current = &y_regs[PLUS_REGISTER]; | |
6506 else | |
6507 y_current = &y_regs[STAR_REGISTER]; | |
6508 free_yank_all(); | |
6509 y_current->y_size = 0; | |
6510 y_current = y_ptr; | |
6511 } | |
6512 | |
6513 /* | |
6514 * Get the selected text and put it in the gui selection register '*' or '+'. | |
6515 */ | |
6516 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6517 clip_get_selection(VimClipboard *cbd) |
7 | 6518 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6519 yankreg_T *old_y_previous, *old_y_current; |
7 | 6520 pos_T old_cursor; |
6521 pos_T old_visual; | |
6522 int old_visual_mode; | |
6523 colnr_T old_curswant; | |
6524 int old_set_curswant; | |
6525 pos_T old_op_start, old_op_end; | |
6526 oparg_T oa; | |
6527 cmdarg_T ca; | |
6528 | |
6529 if (cbd->owned) | |
6530 { | |
6531 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
6532 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
6533 return; | |
6534 | |
6535 /* Get the text between clip_star.start & clip_star.end */ | |
6536 old_y_previous = y_previous; | |
6537 old_y_current = y_current; | |
6538 old_cursor = curwin->w_cursor; | |
6539 old_curswant = curwin->w_curswant; | |
6540 old_set_curswant = curwin->w_set_curswant; | |
6541 old_op_start = curbuf->b_op_start; | |
6542 old_op_end = curbuf->b_op_end; | |
6543 old_visual = VIsual; | |
6544 old_visual_mode = VIsual_mode; | |
6545 clear_oparg(&oa); | |
6546 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
6547 oa.op_type = OP_YANK; | |
6548 vim_memset(&ca, 0, sizeof(ca)); | |
6549 ca.oap = &oa; | |
6550 ca.cmdchar = 'y'; | |
6551 ca.count1 = 1; | |
6552 ca.retval = CA_NO_ADJ_OP_END; | |
6553 do_pending_operator(&ca, 0, TRUE); | |
6554 y_previous = old_y_previous; | |
6555 y_current = old_y_current; | |
6556 curwin->w_cursor = old_cursor; | |
688 | 6557 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
7 | 6558 curwin->w_curswant = old_curswant; |
6559 curwin->w_set_curswant = old_set_curswant; | |
6560 curbuf->b_op_start = old_op_start; | |
6561 curbuf->b_op_end = old_op_end; | |
6562 VIsual = old_visual; | |
6563 VIsual_mode = old_visual_mode; | |
6564 } | |
11273
96d83cd2904a
patch 8.0.0522: Win32: when 'clipboard' is "unnamed" yyp does not work
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
6565 else if (!is_clipboard_needs_update()) |
7 | 6566 { |
6567 clip_free_selection(cbd); | |
6568 | |
6569 /* Try to get selected text from another window */ | |
6570 clip_gen_request_selection(cbd); | |
6571 } | |
6572 } | |
6573 | |
2896 | 6574 /* |
6575 * Convert from the GUI selection string into the '*'/'+' register. | |
6576 */ | |
7 | 6577 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6578 clip_yank_selection( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6579 int type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6580 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6581 long len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6582 VimClipboard *cbd) |
7 | 6583 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6584 yankreg_T *y_ptr; |
7 | 6585 |
6586 if (cbd == &clip_plus) | |
6587 y_ptr = &y_regs[PLUS_REGISTER]; | |
6588 else | |
6589 y_ptr = &y_regs[STAR_REGISTER]; | |
6590 | |
6591 clip_free_selection(cbd); | |
6592 | |
5798 | 6593 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
7 | 6594 } |
6595 | |
6596 /* | |
6597 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
6598 * with length *len. | |
6599 * Returns the motion type, or -1 for failure. | |
6600 */ | |
6601 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6602 clip_convert_selection(char_u **str, long_u *len, VimClipboard *cbd) |
7 | 6603 { |
6604 char_u *p; | |
6605 int lnum; | |
6606 int i, j; | |
6607 int_u eolsize; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6608 yankreg_T *y_ptr; |
7 | 6609 |
6610 if (cbd == &clip_plus) | |
6611 y_ptr = &y_regs[PLUS_REGISTER]; | |
6612 else | |
6613 y_ptr = &y_regs[STAR_REGISTER]; | |
6614 | |
6615 #ifdef USE_CRNL | |
6616 eolsize = 2; | |
6617 #else | |
6618 eolsize = 1; | |
6619 #endif | |
6620 | |
6621 *str = NULL; | |
6622 *len = 0; | |
6623 if (y_ptr->y_array == NULL) | |
6624 return -1; | |
6625 | |
6626 for (i = 0; i < y_ptr->y_size; i++) | |
6627 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
6628 | |
6629 /* | |
6630 * Don't want newline character at end of last line if we're in MCHAR mode. | |
6631 */ | |
6632 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
6633 *len -= eolsize; | |
6634 | |
6635 p = *str = lalloc(*len + 1, TRUE); /* add one to avoid zero */ | |
6636 if (p == NULL) | |
6637 return -1; | |
6638 lnum = 0; | |
6639 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
6640 { | |
6641 if (y_ptr->y_array[lnum][j] == '\n') | |
6642 p[i] = NUL; | |
6643 else if (y_ptr->y_array[lnum][j] == NUL) | |
6644 { | |
6645 #ifdef USE_CRNL | |
6646 p[i++] = '\r'; | |
6647 #endif | |
6648 #ifdef USE_CR | |
6649 p[i] = '\r'; | |
6650 #else | |
6651 p[i] = '\n'; | |
6652 #endif | |
6653 lnum++; | |
6654 j = -1; | |
6655 } | |
6656 else | |
6657 p[i] = y_ptr->y_array[lnum][j]; | |
6658 } | |
6659 return y_ptr->y_type; | |
6660 } | |
6661 | |
6662 | |
6663 /* | |
6664 * If we have written to a clipboard register, send the text to the clipboard. | |
6665 */ | |
6666 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6667 may_set_selection(void) |
7 | 6668 { |
6669 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
6670 { | |
6671 clip_own_selection(&clip_star); | |
6672 clip_gen_set_selection(&clip_star); | |
6673 } | |
6674 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
6675 { | |
6676 clip_own_selection(&clip_plus); | |
6677 clip_gen_set_selection(&clip_plus); | |
6678 } | |
6679 } | |
6680 | |
6681 #endif /* FEAT_CLIPBOARD || PROTO */ | |
6682 | |
6683 | |
6684 #if defined(FEAT_DND) || defined(PROTO) | |
6685 /* | |
6686 * Replace the contents of the '~' register with str. | |
6687 */ | |
6688 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6689 dnd_yank_drag_data(char_u *str, long len) |
7 | 6690 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6691 yankreg_T *curr; |
7 | 6692 |
6693 curr = y_current; | |
6694 y_current = &y_regs[TILDE_REGISTER]; | |
6695 free_yank_all(); | |
5798 | 6696 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
7 | 6697 y_current = curr; |
6698 } | |
6699 #endif | |
6700 | |
6701 | |
6702 #if defined(FEAT_EVAL) || defined(PROTO) | |
6703 /* | |
6704 * Return the type of a register. | |
6705 * Used for getregtype() | |
6706 * Returns MAUTO for error. | |
6707 */ | |
6708 char_u | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6709 get_reg_type(int regname, long *reglen) |
7 | 6710 { |
6711 switch (regname) | |
6712 { | |
6713 case '%': /* file name */ | |
6714 case '#': /* alternate file name */ | |
6715 case '=': /* expression */ | |
6716 case ':': /* last command line */ | |
6717 case '/': /* last search-pattern */ | |
6718 case '.': /* last inserted text */ | |
6719 #ifdef FEAT_SEARCHPATH | |
6720 case Ctrl_F: /* Filename under cursor */ | |
6721 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
6722 #endif | |
6723 case Ctrl_W: /* word under cursor */ | |
6724 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
6725 case '_': /* black hole: always empty */ | |
6726 return MCHAR; | |
6727 } | |
6728 | |
6729 #ifdef FEAT_CLIPBOARD | |
6730 regname = may_get_selection(regname); | |
6731 #endif | |
6732 | |
5596 | 6733 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
|
6734 return MAUTO; |
5596 | 6735 |
7 | 6736 get_yank_register(regname, FALSE); |
6737 | |
6738 if (y_current->y_array != NULL) | |
6739 { | |
6740 if (reglen != NULL && y_current->y_type == MBLOCK) | |
6741 *reglen = y_current->y_width; | |
6742 return y_current->y_type; | |
6743 } | |
6744 return MAUTO; | |
6745 } | |
6746 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
6747 static char_u *getreg_wrap_one_line(char_u *s, int flags); |
5796 | 6748 |
6749 /* | |
6750 * When "flags" has GREG_LIST return a list with text "s". | |
6751 * Otherwise just return "s". | |
6752 */ | |
6753 static char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6754 getreg_wrap_one_line(char_u *s, int flags) |
5796 | 6755 { |
6756 if (flags & GREG_LIST) | |
6757 { | |
6758 list_T *list = list_alloc(); | |
6759 | |
6760 if (list != NULL) | |
6761 { | |
6762 if (list_append_string(list, NULL, -1) == FAIL) | |
6763 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6764 list_free(list); |
5796 | 6765 return NULL; |
6766 } | |
6767 list->lv_first->li_tv.vval.v_string = s; | |
6768 } | |
6769 return (char_u *)list; | |
6770 } | |
6771 return s; | |
6772 } | |
6773 | |
7 | 6774 /* |
6775 * Return the contents of a register as a single allocated string. | |
6776 * Used for "@r" in expressions and for getreg(). | |
6777 * Returns NULL for error. | |
5796 | 6778 * Flags: |
6779 * GREG_NO_EXPR Do not allow expression register | |
6780 * GREG_EXPR_SRC For the expression register: return expression itself, | |
6781 * not the result of its evaluation. | |
6782 * GREG_LIST Return a list of lines in place of a single string. | |
7 | 6783 */ |
6784 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6785 get_reg_contents(int regname, int flags) |
7 | 6786 { |
6787 long i; | |
6788 char_u *retval; | |
6789 int allocated; | |
6790 long len; | |
6791 | |
6792 /* Don't allow using an expression register inside an expression */ | |
6793 if (regname == '=') | |
6794 { | |
5796 | 6795 if (flags & GREG_NO_EXPR) |
6796 return NULL; | |
6797 if (flags & GREG_EXPR_SRC) | |
6798 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
6799 return getreg_wrap_one_line(get_expr_line(), flags); | |
7 | 6800 } |
6801 | |
6802 if (regname == '@') /* "@@" is used for unnamed register */ | |
6803 regname = '"'; | |
6804 | |
6805 /* check for valid regname */ | |
6806 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
6807 return NULL; | |
6808 | |
6809 #ifdef FEAT_CLIPBOARD | |
6810 regname = may_get_selection(regname); | |
6811 #endif | |
6812 | |
6813 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
6814 { | |
6815 if (retval == NULL) | |
6816 return NULL; | |
5796 | 6817 if (allocated) |
6818 return getreg_wrap_one_line(retval, flags); | |
6819 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
7 | 6820 } |
6821 | |
6822 get_yank_register(regname, FALSE); | |
6823 if (y_current->y_array == NULL) | |
6824 return NULL; | |
6825 | |
5796 | 6826 if (flags & GREG_LIST) |
6827 { | |
6828 list_T *list = list_alloc(); | |
6829 int error = FALSE; | |
6830 | |
6831 if (list == NULL) | |
6832 return NULL; | |
6833 for (i = 0; i < y_current->y_size; ++i) | |
6834 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
6835 error = TRUE; | |
6836 if (error) | |
6837 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6838 list_free(list); |
5796 | 6839 return NULL; |
6840 } | |
6841 return (char_u *)list; | |
6842 } | |
6843 | |
7 | 6844 /* |
6845 * Compute length of resulting string. | |
6846 */ | |
6847 len = 0; | |
6848 for (i = 0; i < y_current->y_size; ++i) | |
6849 { | |
6850 len += (long)STRLEN(y_current->y_array[i]); | |
6851 /* | |
6852 * Insert a newline between lines and after last line if | |
6853 * y_type is MLINE. | |
6854 */ | |
6855 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6856 ++len; | |
6857 } | |
6858 | |
6859 retval = lalloc(len + 1, TRUE); | |
6860 | |
6861 /* | |
6862 * Copy the lines of the yank register into the string. | |
6863 */ | |
6864 if (retval != NULL) | |
6865 { | |
6866 len = 0; | |
6867 for (i = 0; i < y_current->y_size; ++i) | |
6868 { | |
6869 STRCPY(retval + len, y_current->y_array[i]); | |
6870 len += (long)STRLEN(retval + len); | |
6871 | |
6872 /* | |
6873 * Insert a NL between lines and after the last line if y_type is | |
6874 * MLINE. | |
6875 */ | |
6876 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6877 retval[len++] = '\n'; | |
6878 } | |
6879 retval[len] = NUL; | |
6880 } | |
6881 | |
6882 return retval; | |
6883 } | |
6884 | |
5798 | 6885 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6886 init_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6887 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6888 yankreg_T **old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6889 yankreg_T **old_y_current, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6890 int must_append, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6891 int *yank_type UNUSED) |
5798 | 6892 { |
6893 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
6894 { | |
6895 emsg_invreg(name); | |
6896 return FAIL; | |
6897 } | |
6898 | |
6899 /* Don't want to change the current (unnamed) register */ | |
6900 *old_y_previous = y_previous; | |
6901 *old_y_current = y_current; | |
6902 | |
6903 get_yank_register(name, TRUE); | |
6904 if (!y_append && !must_append) | |
6905 free_yank_all(); | |
6906 return OK; | |
6907 } | |
6908 | |
6909 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6910 finish_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6911 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6912 yankreg_T *old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6913 yankreg_T *old_y_current) |
5798 | 6914 { |
6915 # ifdef FEAT_CLIPBOARD | |
6916 /* Send text of clipboard register to the clipboard. */ | |
6917 may_set_selection(); | |
6918 # endif | |
6919 | |
6920 /* ':let @" = "val"' should change the meaning of the "" register */ | |
6921 if (name != '"') | |
6922 y_previous = old_y_previous; | |
6923 y_current = old_y_current; | |
6924 } | |
6925 | |
7 | 6926 /* |
6927 * Store string "str" in register "name". | |
6928 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
6929 * If "must_append" is TRUE, always append to the register. Otherwise append | |
6930 * if "name" is an uppercase letter. | |
6931 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
6932 * Careful: 'str' is modified, you may have to use a copy! | |
6933 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
6934 */ | |
6935 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6936 write_reg_contents( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6937 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6938 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6939 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6940 int must_append) |
7 | 6941 { |
6942 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
6943 } | |
6944 | |
6945 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6946 write_reg_contents_lst( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6947 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6948 char_u **strings, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6949 int maxlen UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6950 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6951 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6952 long block_len) |
5798 | 6953 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6954 yankreg_T *old_y_previous, *old_y_current; |
5798 | 6955 |
6956 if (name == '/' | |
6957 #ifdef FEAT_EVAL | |
6958 || name == '=' | |
6959 #endif | |
6960 ) | |
6961 { | |
6962 char_u *s; | |
6963 | |
6964 if (strings[0] == NULL) | |
6965 s = (char_u *)""; | |
6966 else if (strings[1] != NULL) | |
6967 { | |
6968 EMSG(_("E883: search pattern and expression register may not " | |
6969 "contain two or more lines")); | |
6970 return; | |
6971 } | |
6972 else | |
6973 s = strings[0]; | |
6974 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
6975 return; | |
6976 } | |
6977 | |
6978 if (name == '_') /* black hole: nothing to do */ | |
6979 return; | |
6980 | |
6981 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
6982 &yank_type) == FAIL) | |
6983 return; | |
6984 | |
6985 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
6986 | |
6987 finish_write_reg(name, old_y_previous, old_y_current); | |
6988 } | |
6989 | |
6990 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6991 write_reg_contents_ex( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6992 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6993 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6994 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6995 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6996 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6997 long block_len) |
7 | 6998 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6999 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
|
7000 long len; |
7 | 7001 |
336 | 7002 if (maxlen >= 0) |
7003 len = maxlen; | |
7004 else | |
7005 len = (long)STRLEN(str); | |
7006 | |
7 | 7007 /* Special case: '/' search pattern */ |
7008 if (name == '/') | |
7009 { | |
7010 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
7011 return; | |
7012 } | |
7013 | |
6557 | 7014 if (name == '#') |
7015 { | |
7016 buf_T *buf; | |
7017 | |
7018 if (VIM_ISDIGIT(*str)) | |
7019 { | |
7020 int num = atoi((char *)str); | |
7021 | |
7022 buf = buflist_findnr(num); | |
7023 if (buf == NULL) | |
7024 EMSGN(_(e_nobufnr), (long)num); | |
7025 } | |
7026 else | |
7027 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
7028 TRUE, FALSE, FALSE)); | |
7029 if (buf == NULL) | |
7030 return; | |
7031 curwin->w_alt_fnum = buf->b_fnum; | |
7032 return; | |
7033 } | |
7034 | |
336 | 7035 #ifdef FEAT_EVAL |
7036 if (name == '=') | |
7037 { | |
7038 char_u *p, *s; | |
7039 | |
7040 p = vim_strnsave(str, (int)len); | |
7041 if (p == NULL) | |
7042 return; | |
7043 if (must_append) | |
7044 { | |
7045 s = concat_str(get_expr_line_src(), p); | |
7046 vim_free(p); | |
7047 p = s; | |
7048 } | |
7049 set_expr_line(p); | |
7050 return; | |
7051 } | |
7052 #endif | |
7053 | |
7 | 7054 if (name == '_') /* black hole: nothing to do */ |
7055 return; | |
7056 | |
5798 | 7057 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
7058 &yank_type) == FAIL) | |
7059 return; | |
7060 | |
7061 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
7062 | |
7063 finish_write_reg(name, old_y_previous, old_y_current); | |
7 | 7064 } |
7065 #endif /* FEAT_EVAL */ | |
7066 | |
7067 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
7068 /* | |
7069 * Put a string into a register. When the register is not empty, the string | |
7070 * is appended. | |
7071 */ | |
7072 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7073 str_to_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7074 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
|
7075 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
|
7076 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
|
7077 long len, /* length of string */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7078 long blocklen, /* width of Visual block */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7079 int str_list) /* TRUE if str is char_u ** */ |
7 | 7080 { |
2896 | 7081 int type; /* MCHAR, MLINE or MBLOCK */ |
7 | 7082 int lnum; |
7083 long start; | |
7084 long i; | |
7085 int extra; | |
7086 int newlines; /* number of lines added */ | |
7087 int extraline = 0; /* extra line at the end */ | |
7088 int append = FALSE; /* append to last line in register */ | |
7089 char_u *s; | |
5798 | 7090 char_u **ss; |
7 | 7091 char_u **pp; |
7092 long maxlen; | |
7093 | |
2000 | 7094 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
7 | 7095 y_ptr->y_size = 0; |
7096 | |
2896 | 7097 if (yank_type == MAUTO) |
5798 | 7098 type = ((str_list || (len > 0 && (str[len - 1] == NL |
7099 || str[len - 1] == CAR))) | |
2896 | 7100 ? MLINE : MCHAR); |
7101 else | |
7102 type = yank_type; | |
7103 | |
7 | 7104 /* |
7105 * Count the number of lines within the string | |
7106 */ | |
7107 newlines = 0; | |
5798 | 7108 if (str_list) |
7109 { | |
7110 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
7 | 7111 ++newlines; |
5798 | 7112 } |
7113 else | |
7114 { | |
7115 for (i = 0; i < len; i++) | |
7116 if (str[i] == '\n') | |
7117 ++newlines; | |
7118 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
7119 { | |
7120 extraline = 1; | |
7121 ++newlines; /* count extra newline at the end */ | |
7122 } | |
7123 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
7124 { | |
7125 append = TRUE; | |
7126 --newlines; /* uncount newline when appending first line */ | |
7127 } | |
7 | 7128 } |
7129 | |
6807 | 7130 /* Without any lines make the register empty. */ |
7131 if (y_ptr->y_size + newlines == 0) | |
7132 { | |
7133 vim_free(y_ptr->y_array); | |
7134 y_ptr->y_array = NULL; | |
7135 return; | |
7136 } | |
7137 | |
7 | 7138 /* |
7139 * Allocate an array to hold the pointers to the new register lines. | |
7140 * If the register was not empty, move the existing lines to the new array. | |
7141 */ | |
7142 pp = (char_u **)lalloc_clear((y_ptr->y_size + newlines) | |
7143 * sizeof(char_u *), TRUE); | |
7144 if (pp == NULL) /* out of memory */ | |
7145 return; | |
7146 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
7147 pp[lnum] = y_ptr->y_array[lnum]; | |
7148 vim_free(y_ptr->y_array); | |
7149 y_ptr->y_array = pp; | |
7150 maxlen = 0; | |
7151 | |
7152 /* | |
7153 * Find the end of each line and save it into the array. | |
7154 */ | |
5798 | 7155 if (str_list) |
7156 { | |
7157 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
7 | 7158 { |
5856 | 7159 i = (long)STRLEN(*ss); |
5798 | 7160 pp[lnum] = vim_strnsave(*ss, i); |
7161 if (i > maxlen) | |
7162 maxlen = i; | |
7 | 7163 } |
5798 | 7164 } |
7165 else | |
7166 { | |
7167 for (start = 0; start < len + extraline; start += i + 1) | |
7 | 7168 { |
5798 | 7169 for (i = start; i < len; ++i) /* find the end of the line */ |
7170 if (str[i] == '\n') | |
7171 break; | |
7172 i -= start; /* i is now length of line */ | |
7173 if (i > maxlen) | |
7174 maxlen = i; | |
7175 if (append) | |
7176 { | |
7177 --lnum; | |
7178 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
7179 } | |
7180 else | |
7181 extra = 0; | |
7182 s = alloc((unsigned)(i + extra + 1)); | |
7183 if (s == NULL) | |
7184 break; | |
7185 if (extra) | |
7186 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
7187 if (append) | |
7188 vim_free(y_ptr->y_array[lnum]); | |
7189 if (i) | |
7190 mch_memmove(s + extra, str + start, (size_t)i); | |
7191 extra += i; | |
7192 s[extra] = NUL; | |
7193 y_ptr->y_array[lnum++] = s; | |
7194 while (--extra >= 0) | |
7195 { | |
7196 if (*s == NUL) | |
7197 *s = '\n'; /* replace NUL with newline */ | |
7198 ++s; | |
7199 } | |
7200 append = FALSE; /* only first line is appended */ | |
7 | 7201 } |
7202 } | |
7203 y_ptr->y_type = type; | |
7204 y_ptr->y_size = lnum; | |
7205 if (type == MBLOCK) | |
7206 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
7207 else | |
7208 y_ptr->y_width = 0; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7209 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7210 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
|
7211 #endif |
7 | 7212 } |
7213 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
7214 | |
7215 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7216 clear_oparg(oparg_T *oap) |
7 | 7217 { |
7218 vim_memset(oap, 0, sizeof(oparg_T)); | |
7219 } | |
7220 | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7221 static varnumber_T line_count_info(char_u *line, varnumber_T *wc, varnumber_T *cc, varnumber_T limit, int eol_size); |
7 | 7222 |
7223 /* | |
161 | 7224 * Count the number of bytes, characters and "words" in a line. |
7 | 7225 * |
7226 * "Words" are counted by looking for boundaries between non-space and | |
7227 * space characters. (it seems to produce results that match 'wc'.) | |
7228 * | |
161 | 7229 * Return value is byte count; word count for the line is added to "*wc". |
7230 * Char count is added to "*cc". | |
7 | 7231 * |
7232 * The function will only examine the first "limit" characters in the | |
7233 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
7234 * case, eol_size will be added to the character count to account for | |
7235 * the size of the EOL character. | |
7236 */ | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7237 static varnumber_T |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7238 line_count_info( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7239 char_u *line, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7240 varnumber_T *wc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7241 varnumber_T *cc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7242 varnumber_T limit, |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7243 int eol_size) |
7 | 7244 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7245 varnumber_T i; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7246 varnumber_T words = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7247 varnumber_T chars = 0; |
7 | 7248 int is_word = 0; |
7249 | |
3626 | 7250 for (i = 0; i < limit && line[i] != NUL; ) |
7 | 7251 { |
7252 if (is_word) | |
7253 { | |
7254 if (vim_isspace(line[i])) | |
7255 { | |
7256 words++; | |
7257 is_word = 0; | |
7258 } | |
7259 } | |
7260 else if (!vim_isspace(line[i])) | |
7261 is_word = 1; | |
161 | 7262 ++chars; |
7263 #ifdef FEAT_MBYTE | |
474 | 7264 i += (*mb_ptr2len)(line + i); |
161 | 7265 #else |
7266 ++i; | |
7267 #endif | |
7 | 7268 } |
7269 | |
7270 if (is_word) | |
7271 words++; | |
7272 *wc += words; | |
7273 | |
7274 /* Add eol_size if the end of line was reached before hitting limit. */ | |
2996 | 7275 if (i < limit && line[i] == NUL) |
161 | 7276 { |
7 | 7277 i += eol_size; |
161 | 7278 chars += eol_size; |
7279 } | |
7280 *cc += chars; | |
7 | 7281 return i; |
7282 } | |
7283 | |
7284 /* | |
7285 * Give some info about the position of the cursor (for "g CTRL-G"). | |
7286 * In Visual mode, give some info about the selected region. (In this case, | |
7287 * 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
|
7288 * When "dict" is not NULL store the info there instead of showing it. |
7 | 7289 */ |
7290 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7291 cursor_pos_info(dict_T *dict) |
7 | 7292 { |
7293 char_u *p; | |
274 | 7294 char_u buf1[50]; |
7295 char_u buf2[40]; | |
7 | 7296 linenr_T lnum; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7297 varnumber_T byte_count = 0; |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7298 #ifdef FEAT_MBYTE |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7299 varnumber_T bom_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7300 #endif |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7301 varnumber_T byte_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7302 varnumber_T char_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7303 varnumber_T char_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7304 varnumber_T word_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7305 varnumber_T word_count_cursor = 0; |
7 | 7306 int eol_size; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7307 varnumber_T last_check = 100000L; |
7 | 7308 long line_count_selected = 0; |
7309 pos_T min_pos, max_pos; | |
7310 oparg_T oparg; | |
7311 struct block_def bd; | |
7312 | |
7313 /* | |
7314 * Compute the length of the file in characters. | |
7315 */ | |
7316 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
7317 { | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7318 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7319 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7320 MSG(_(no_lines_msg)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7321 return; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7322 } |
7 | 7323 } |
7324 else | |
7325 { | |
7326 if (get_fileformat(curbuf) == EOL_DOS) | |
7327 eol_size = 2; | |
7328 else | |
7329 eol_size = 1; | |
7330 | |
7331 if (VIsual_active) | |
7332 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
7333 if (LT_POS(VIsual, curwin->w_cursor)) |
7 | 7334 { |
7335 min_pos = VIsual; | |
7336 max_pos = curwin->w_cursor; | |
7337 } | |
7338 else | |
7339 { | |
7340 min_pos = curwin->w_cursor; | |
7341 max_pos = VIsual; | |
7342 } | |
7343 if (*p_sel == 'e' && max_pos.col > 0) | |
7344 --max_pos.col; | |
7345 | |
7346 if (VIsual_mode == Ctrl_V) | |
7347 { | |
1866 | 7348 #ifdef FEAT_LINEBREAK |
7349 char_u * saved_sbr = p_sbr; | |
7350 | |
7351 /* Make 'sbr' empty for a moment to get the correct size. */ | |
7352 p_sbr = empty_option; | |
7353 #endif | |
7 | 7354 oparg.is_VIsual = 1; |
7355 oparg.block_mode = TRUE; | |
7356 oparg.op_type = OP_NOP; | |
7357 getvcols(curwin, &min_pos, &max_pos, | |
688 | 7358 &oparg.start_vcol, &oparg.end_vcol); |
1866 | 7359 #ifdef FEAT_LINEBREAK |
7360 p_sbr = saved_sbr; | |
7361 #endif | |
688 | 7362 if (curwin->w_curswant == MAXCOL) |
7363 oparg.end_vcol = MAXCOL; | |
7 | 7364 /* Swap the start, end vcol if needed */ |
7365 if (oparg.end_vcol < oparg.start_vcol) | |
7366 { | |
7367 oparg.end_vcol += oparg.start_vcol; | |
7368 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
7369 oparg.end_vcol -= oparg.start_vcol; | |
7370 } | |
7371 } | |
7372 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
7373 } | |
7374 | |
7375 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
7376 { | |
7377 /* Check for a CTRL-C every 100000 characters. */ | |
161 | 7378 if (byte_count > last_check) |
7 | 7379 { |
7380 ui_breakcheck(); | |
7381 if (got_int) | |
7382 return; | |
161 | 7383 last_check = byte_count + 100000L; |
7 | 7384 } |
7385 | |
7386 /* Do extra processing for VIsual mode. */ | |
7387 if (VIsual_active | |
7388 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
7389 { | |
45 | 7390 char_u *s = NULL; |
7391 long len = 0L; | |
7392 | |
7 | 7393 switch (VIsual_mode) |
7394 { | |
7395 case Ctrl_V: | |
5735 | 7396 #ifdef FEAT_VIRTUALEDIT |
7 | 7397 virtual_op = virtual_active(); |
5735 | 7398 #endif |
7 | 7399 block_prep(&oparg, &bd, lnum, 0); |
5735 | 7400 #ifdef FEAT_VIRTUALEDIT |
7 | 7401 virtual_op = MAYBE; |
5735 | 7402 #endif |
45 | 7403 s = bd.textstart; |
7404 len = (long)bd.textlen; | |
7 | 7405 break; |
7406 case 'V': | |
45 | 7407 s = ml_get(lnum); |
7408 len = MAXCOL; | |
7 | 7409 break; |
7410 case 'v': | |
7411 { | |
7412 colnr_T start_col = (lnum == min_pos.lnum) | |
7413 ? min_pos.col : 0; | |
7414 colnr_T end_col = (lnum == max_pos.lnum) | |
7415 ? max_pos.col - start_col + 1 : MAXCOL; | |
7416 | |
45 | 7417 s = ml_get(lnum) + start_col; |
7418 len = end_col; | |
7 | 7419 } |
7420 break; | |
7421 } | |
45 | 7422 if (s != NULL) |
7423 { | |
161 | 7424 byte_count_cursor += line_count_info(s, &word_count_cursor, |
7425 &char_count_cursor, len, eol_size); | |
45 | 7426 if (lnum == curbuf->b_ml.ml_line_count |
7427 && !curbuf->b_p_eol | |
6933 | 7428 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
50 | 7429 && (long)STRLEN(s) < len) |
161 | 7430 byte_count_cursor -= eol_size; |
45 | 7431 } |
7 | 7432 } |
7433 else | |
7434 { | |
7435 /* In non-visual mode, check for the line the cursor is on */ | |
7436 if (lnum == curwin->w_cursor.lnum) | |
7437 { | |
7438 word_count_cursor += word_count; | |
161 | 7439 char_count_cursor += char_count; |
7440 byte_count_cursor = byte_count + | |
7441 line_count_info(ml_get(lnum), | |
7442 &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
|
7443 (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
|
7444 eol_size); |
7 | 7445 } |
7446 } | |
7447 /* Add to the running totals */ | |
161 | 7448 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
|
7449 &char_count, (varnumber_T)MAXCOL, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7450 eol_size); |
7 | 7451 } |
7452 | |
7453 /* Correction for when last line doesn't have an EOL. */ | |
6933 | 7454 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
161 | 7455 byte_count -= eol_size; |
7 | 7456 |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7457 if (dict == NULL) |
7 | 7458 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7459 if (VIsual_active) |
7 | 7460 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7461 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
|
7462 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7463 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
|
7464 &max_pos.col); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7465 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
|
7466 (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
|
7467 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7468 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7469 buf1[0] = NUL; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7470 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7471 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
|
7472 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7473 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7474 _("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
|
7475 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7476 (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
|
7477 word_count_cursor, word_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7478 byte_count_cursor, byte_count); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7479 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7480 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7481 _("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
|
7482 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7483 (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
|
7484 word_count_cursor, word_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7485 char_count_cursor, char_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7486 byte_count_cursor, byte_count); |
7 | 7487 } |
7488 else | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7489 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7490 p = ml_get_curline(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7491 validate_virtcol(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7492 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
|
7493 (int)curwin->w_virtcol + 1); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7494 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
|
7495 linetabsize(p)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7496 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7497 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
|
7498 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7499 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7500 _("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
|
7501 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7502 (long)curwin->w_cursor.lnum, |
7 | 7503 (long)curbuf->b_ml.ml_line_count, |
7504 word_count_cursor, word_count, | |
161 | 7505 byte_count_cursor, byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7506 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7507 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7508 _("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
|
7509 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7510 (long)curwin->w_cursor.lnum, |
161 | 7511 (long)curbuf->b_ml.ml_line_count, |
7512 word_count_cursor, word_count, | |
7513 char_count_cursor, char_count, | |
7514 byte_count_cursor, byte_count); | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7515 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7516 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7517 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7518 #ifdef FEAT_MBYTE |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7519 bom_count = bomb_size(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7520 if (bom_count > 0) |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7521 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
|
7522 _("(+%ld for BOM)"), bom_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7523 #endif |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7524 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7525 { |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7526 /* 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
|
7527 p = p_shm; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7528 p_shm = (char_u *)""; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7529 msg(IObuff); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7530 p_shm = p; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7531 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7532 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7533 #if defined(FEAT_EVAL) |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7534 if (dict != NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7535 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7536 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
|
7537 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
|
7538 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
|
7539 # ifdef FEAT_MBYTE |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7540 + bom_count |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7541 # endif |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7542 , NULL); |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7543 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
|
7544 byte_count_cursor, NULL); |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7545 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
|
7546 char_count_cursor, NULL); |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7547 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
|
7548 word_count_cursor, NULL); |
7 | 7549 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7550 #endif |
7 | 7551 } |