Mercurial > vim
annotate src/ops.c @ 11614:f62e103bb674
Added tag v8.0.0689 for changeset 7428a08c2f680016ccaf97c28f027fd7d5145f2a
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 29 Jun 2017 22:30:04 +0200 |
parents | 72b20190dce6 |
children | b9928ef8632f |
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 */ | |
399 total = amount * p_sw; | |
400 oldp = ml_get_curline(); | |
401 | |
402 if (!left) | |
403 { | |
404 /* | |
405 * 1. Get start vcol | |
406 * 2. Total ws vcols | |
407 * 3. Divvy into TABs & spp | |
408 * 4. Construct new string | |
409 */ | |
410 total += bd.pre_whitesp; /* all virtual WS upto & incl a split TAB */ | |
411 ws_vcol = bd.start_vcol - bd.pre_whitesp; | |
412 if (bd.startspaces) | |
413 { | |
414 #ifdef FEAT_MBYTE | |
415 if (has_mbyte) | |
8399
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
416 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
417 if ((*mb_ptr2len)(bd.textstart) == 1) |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
418 ++bd.textstart; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
419 else |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
420 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
421 ws_vcol = 0; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
422 bd.startspaces = 0; |
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 } |
1995 | 425 else |
426 #endif | |
427 ++bd.textstart; | |
7 | 428 } |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
429 for ( ; VIM_ISWHITE(*bd.textstart); ) |
7 | 430 { |
5995 | 431 /* TODO: is passing bd.textstart for start of the line OK? */ |
432 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, | |
433 (colnr_T)(bd.start_vcol)); | |
7 | 434 total += incr; |
435 bd.start_vcol += incr; | |
436 } | |
437 /* OK, now total=all the VWS reqd, and textstart points at the 1st | |
438 * non-ws char in the block. */ | |
439 if (!curbuf->b_p_et) | |
440 i = ((ws_vcol % p_ts) + total) / p_ts; /* number of tabs */ | |
441 if (i) | |
442 j = ((ws_vcol % p_ts) + total) % p_ts; /* number of spp */ | |
443 else | |
444 j = total; | |
445 /* if we're splitting a TAB, allow for it */ | |
446 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0); | |
447 len = (int)STRLEN(bd.textstart) + 1; | |
448 newp = alloc_check((unsigned)(bd.textcol + i + j + len)); | |
449 if (newp == NULL) | |
450 return; | |
451 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len)); | |
452 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
6929 | 453 vim_memset(newp + bd.textcol, TAB, (size_t)i); |
454 vim_memset(newp + bd.textcol + i, ' ', (size_t)j); | |
7 | 455 /* the end */ |
456 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len); | |
457 } | |
458 else /* left */ | |
459 { | |
1839 | 460 colnr_T destination_col; /* column to which text in block will |
461 be shifted */ | |
462 char_u *verbatim_copy_end; /* end of the part of the line which is | |
463 copied verbatim */ | |
464 colnr_T verbatim_copy_width;/* the (displayed) width of this part | |
465 of line */ | |
466 unsigned fill; /* nr of spaces that replace a TAB */ | |
467 unsigned new_line_len; /* the length of the line after the | |
468 block shift */ | |
469 size_t block_space_width; | |
470 size_t shift_amount; | |
471 char_u *non_white = bd.textstart; | |
472 colnr_T non_white_col; | |
473 | |
474 /* | |
475 * Firstly, let's find the first non-whitespace character that is | |
476 * displayed after the block's start column and the character's column | |
477 * number. Also, let's calculate the width of all the whitespace | |
478 * characters that are displayed in the block and precede the searched | |
479 * non-whitespace character. | |
480 */ | |
481 | |
482 /* If "bd.startspaces" is set, "bd.textstart" points to the character, | |
483 * the part of which is displayed at the block's beginning. Let's start | |
484 * searching from the next character. */ | |
485 if (bd.startspaces) | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
486 MB_PTR_ADV(non_white); |
1839 | 487 |
488 /* The character's column is in "bd.start_vcol". */ | |
489 non_white_col = bd.start_vcol; | |
490 | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
491 while (VIM_ISWHITE(*non_white)) |
7 | 492 { |
5995 | 493 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col); |
1839 | 494 non_white_col += incr; |
7 | 495 } |
1839 | 496 |
497 block_space_width = non_white_col - oap->start_vcol; | |
498 /* We will shift by "total" or "block_space_width", whichever is less. | |
499 */ | |
1860 | 500 shift_amount = (block_space_width < (size_t)total |
501 ? block_space_width : (size_t)total); | |
1839 | 502 |
503 /* The column to which we will shift the text. */ | |
1860 | 504 destination_col = (colnr_T)(non_white_col - shift_amount); |
1839 | 505 |
506 /* Now let's find out how much of the beginning of the line we can | |
507 * reuse without modification. */ | |
508 verbatim_copy_end = bd.textstart; | |
509 verbatim_copy_width = bd.start_vcol; | |
510 | |
511 /* If "bd.startspaces" is set, "bd.textstart" points to the character | |
512 * preceding the block. We have to subtract its width to obtain its | |
513 * column number. */ | |
514 if (bd.startspaces) | |
515 verbatim_copy_width -= bd.start_char_vcols; | |
516 while (verbatim_copy_width < destination_col) | |
7 | 517 { |
5995 | 518 char_u *line = verbatim_copy_end; |
519 | |
520 /* TODO: is passing verbatim_copy_end for start of the line OK? */ | |
521 incr = lbr_chartabsize(line, verbatim_copy_end, | |
522 verbatim_copy_width); | |
1839 | 523 if (verbatim_copy_width + incr > destination_col) |
524 break; | |
525 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
|
526 MB_PTR_ADV(verbatim_copy_end); |
7 | 527 } |
528 | |
1839 | 529 /* If "destination_col" is different from the width of the initial |
530 * part of the line that will be copied, it means we encountered a tab | |
531 * character, which we will have to partly replace with spaces. */ | |
532 fill = destination_col - verbatim_copy_width; | |
533 | |
534 /* The replacement line will consist of: | |
535 * - the beginning of the original line up to "verbatim_copy_end", | |
536 * - "fill" number of spaces, | |
537 * - the rest of the line, pointed to by non_white. */ | |
538 new_line_len = (unsigned)(verbatim_copy_end - oldp) | |
539 + fill | |
540 + (unsigned)STRLEN(non_white) + 1; | |
541 | |
542 newp = alloc_check(new_line_len); | |
7 | 543 if (newp == NULL) |
544 return; | |
1839 | 545 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); |
6929 | 546 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill); |
1839 | 547 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); |
7 | 548 } |
549 /* replace the line */ | |
550 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
551 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol); | |
552 State = oldstate; | |
553 curwin->w_cursor.col = oldcol; | |
554 #ifdef FEAT_RIGHTLEFT | |
555 p_ri = old_p_ri; | |
556 #endif | |
557 } | |
558 #endif | |
559 | |
560 #ifdef FEAT_VISUALEXTRA | |
561 /* | |
562 * Insert string "s" (b_insert ? before : after) block :AKelly | |
563 * Caller must prepare for undo. | |
564 */ | |
565 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
566 block_insert( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
567 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
568 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
569 int b_insert, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
570 struct block_def *bdp) |
7 | 571 { |
572 int p_ts; | |
573 int count = 0; /* extra spaces to replace a cut TAB */ | |
574 int spaces = 0; /* non-zero if cutting a TAB */ | |
575 colnr_T offset; /* pointer along new line */ | |
576 unsigned s_len; /* STRLEN(s) */ | |
577 char_u *newp, *oldp; /* new, old lines */ | |
578 linenr_T lnum; /* loop var */ | |
579 int oldstate = State; | |
580 | |
581 State = INSERT; /* don't want REPLACE for State */ | |
582 s_len = (unsigned)STRLEN(s); | |
583 | |
584 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) | |
585 { | |
586 block_prep(oap, bdp, lnum, TRUE); | |
587 if (bdp->is_short && b_insert) | |
588 continue; /* OP_INSERT, line ends before block start */ | |
589 | |
590 oldp = ml_get(lnum); | |
591 | |
592 if (b_insert) | |
593 { | |
594 p_ts = bdp->start_char_vcols; | |
595 spaces = bdp->startspaces; | |
596 if (spaces != 0) | |
597 count = p_ts - 1; /* we're cutting a TAB */ | |
598 offset = bdp->textcol; | |
599 } | |
600 else /* append */ | |
601 { | |
602 p_ts = bdp->end_char_vcols; | |
603 if (!bdp->is_short) /* spaces = padding after block */ | |
604 { | |
605 spaces = (bdp->endspaces ? p_ts - bdp->endspaces : 0); | |
606 if (spaces != 0) | |
607 count = p_ts - 1; /* we're cutting a TAB */ | |
608 offset = bdp->textcol + bdp->textlen - (spaces != 0); | |
609 } | |
610 else /* spaces = padding to block edge */ | |
611 { | |
612 /* if $ used, just append to EOL (ie spaces==0) */ | |
613 if (!bdp->is_MAX) | |
614 spaces = (oap->end_vcol - bdp->end_vcol) + 1; | |
615 count = spaces; | |
616 offset = bdp->textcol + bdp->textlen; | |
617 } | |
618 } | |
619 | |
6140 | 620 #ifdef FEAT_MBYTE |
621 if (has_mbyte && spaces > 0) | |
622 { | |
6460 | 623 int off; |
624 | |
6140 | 625 /* Avoid starting halfway a multi-byte character. */ |
626 if (b_insert) | |
627 { | |
6460 | 628 off = (*mb_head_off)(oldp, oldp + offset + spaces); |
6140 | 629 } |
630 else | |
631 { | |
6460 | 632 off = (*mb_off_next)(oldp, oldp + offset); |
6140 | 633 offset += off; |
634 } | |
6460 | 635 spaces -= off; |
636 count -= off; | |
6140 | 637 } |
638 #endif | |
639 | |
7 | 640 newp = alloc_check((unsigned)(STRLEN(oldp)) + s_len + count + 1); |
641 if (newp == NULL) | |
642 continue; | |
643 | |
644 /* copy up to shifted part */ | |
645 mch_memmove(newp, oldp, (size_t)(offset)); | |
646 oldp += offset; | |
647 | |
648 /* insert pre-padding */ | |
6929 | 649 vim_memset(newp + offset, ' ', (size_t)spaces); |
7 | 650 |
651 /* copy the new text */ | |
652 mch_memmove(newp + offset + spaces, s, (size_t)s_len); | |
653 offset += s_len; | |
654 | |
655 if (spaces && !bdp->is_short) | |
656 { | |
657 /* insert post-padding */ | |
6929 | 658 vim_memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces)); |
7 | 659 /* We're splitting a TAB, don't copy it. */ |
660 oldp++; | |
661 /* We allowed for that TAB, remember this now */ | |
662 count++; | |
663 } | |
664 | |
665 if (spaces > 0) | |
666 offset += count; | |
1622 | 667 STRMOVE(newp + offset, oldp); |
7 | 668 |
669 ml_replace(lnum, newp, FALSE); | |
670 | |
671 if (lnum == oap->end.lnum) | |
672 { | |
673 /* Set "']" mark to the end of the block instead of the end of | |
674 * the insert in the first line. */ | |
675 curbuf->b_op_end.lnum = oap->end.lnum; | |
676 curbuf->b_op_end.col = offset; | |
677 } | |
678 } /* for all lnum */ | |
679 | |
680 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
681 | |
682 State = oldstate; | |
683 } | |
684 #endif | |
685 | |
686 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(PROTO) | |
687 /* | |
688 * op_reindent - handle reindenting a block of lines. | |
689 */ | |
690 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
691 op_reindent(oparg_T *oap, int (*how)(void)) |
7 | 692 { |
693 long i; | |
694 char_u *l; | |
6971 | 695 int amount; |
7 | 696 linenr_T first_changed = 0; |
697 linenr_T last_changed = 0; | |
698 linenr_T start_lnum = curwin->w_cursor.lnum; | |
699 | |
216 | 700 /* Don't even try when 'modifiable' is off. */ |
701 if (!curbuf->b_p_ma) | |
702 { | |
703 EMSG(_(e_modifiable)); | |
704 return; | |
705 } | |
706 | |
7 | 707 for (i = oap->line_count; --i >= 0 && !got_int; ) |
708 { | |
709 /* it's a slow thing to do, so give feedback so there's no worry that | |
710 * the computer's just hung. */ | |
711 | |
712 if (i > 1 | |
713 && (i % 50 == 0 || i == oap->line_count - 1) | |
714 && oap->line_count > p_report) | |
715 smsg((char_u *)_("%ld lines to indent... "), i); | |
716 | |
717 /* | |
718 * Be vi-compatible: For lisp indenting the first line is not | |
719 * indented, unless there is only one line. | |
720 */ | |
721 #ifdef FEAT_LISP | |
722 if (i != oap->line_count - 1 || oap->line_count == 1 | |
723 || how != get_lisp_indent) | |
724 #endif | |
725 { | |
726 l = skipwhite(ml_get_curline()); | |
727 if (*l == NUL) /* empty or blank line */ | |
6971 | 728 amount = 0; |
7 | 729 else |
6971 | 730 amount = how(); /* get the indent for this line */ |
731 | |
732 if (amount >= 0 && set_indent(amount, SIN_UNDO)) | |
7 | 733 { |
734 /* did change the indent, call changed_lines() later */ | |
735 if (first_changed == 0) | |
736 first_changed = curwin->w_cursor.lnum; | |
737 last_changed = curwin->w_cursor.lnum; | |
738 } | |
739 } | |
740 ++curwin->w_cursor.lnum; | |
1550 | 741 curwin->w_cursor.col = 0; /* make sure it's valid */ |
7 | 742 } |
743 | |
744 /* put cursor on first non-blank of indented line */ | |
745 curwin->w_cursor.lnum = start_lnum; | |
746 beginline(BL_SOL | BL_FIX); | |
747 | |
748 /* Mark changed lines so that they will be redrawn. When Visual | |
749 * highlighting was present, need to continue until the last line. When | |
750 * there is no change still need to remove the Visual highlighting. */ | |
751 if (last_changed != 0) | |
752 changed_lines(first_changed, 0, | |
753 oap->is_VIsual ? start_lnum + oap->line_count : | |
754 last_changed + 1, 0L); | |
755 else if (oap->is_VIsual) | |
756 redraw_curbuf_later(INVERTED); | |
757 | |
758 if (oap->line_count > p_report) | |
759 { | |
760 i = oap->line_count - (i + 1); | |
761 if (i == 1) | |
762 MSG(_("1 line indented ")); | |
763 else | |
764 smsg((char_u *)_("%ld lines indented "), i); | |
765 } | |
766 /* set '[ and '] marks */ | |
767 curbuf->b_op_start = oap->start; | |
768 curbuf->b_op_end = oap->end; | |
769 } | |
770 #endif /* defined(FEAT_LISP) || defined(FEAT_CINDENT) */ | |
771 | |
772 #if defined(FEAT_EVAL) || defined(PROTO) | |
773 /* | |
774 * Keep the last expression line here, for repeating. | |
775 */ | |
776 static char_u *expr_line = NULL; | |
777 | |
778 /* | |
779 * Get an expression for the "\"=expr1" or "CTRL-R =expr1" | |
780 * Returns '=' when OK, NUL otherwise. | |
781 */ | |
782 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
783 get_expr_register(void) |
7 | 784 { |
785 char_u *new_line; | |
786 | |
787 new_line = getcmdline('=', 0L, 0); | |
788 if (new_line == NULL) | |
789 return NUL; | |
790 if (*new_line == NUL) /* use previous line */ | |
791 vim_free(new_line); | |
792 else | |
793 set_expr_line(new_line); | |
794 return '='; | |
795 } | |
796 | |
797 /* | |
798 * Set the expression for the '=' register. | |
799 * Argument must be an allocated string. | |
800 */ | |
801 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
802 set_expr_line(char_u *new_line) |
7 | 803 { |
804 vim_free(expr_line); | |
805 expr_line = new_line; | |
806 } | |
807 | |
808 /* | |
809 * Get the result of the '=' register expression. | |
810 * Returns a pointer to allocated memory, or NULL for failure. | |
811 */ | |
812 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
813 get_expr_line(void) |
7 | 814 { |
815 char_u *expr_copy; | |
816 char_u *rv; | |
994 | 817 static int nested = 0; |
7 | 818 |
819 if (expr_line == NULL) | |
820 return NULL; | |
821 | |
822 /* Make a copy of the expression, because evaluating it may cause it to be | |
823 * changed. */ | |
824 expr_copy = vim_strsave(expr_line); | |
825 if (expr_copy == NULL) | |
826 return NULL; | |
827 | |
994 | 828 /* When we are invoked recursively limit the evaluation to 10 levels. |
829 * Then return the string as-is. */ | |
830 if (nested >= 10) | |
831 return expr_copy; | |
832 | |
833 ++nested; | |
714 | 834 rv = eval_to_string(expr_copy, NULL, TRUE); |
994 | 835 --nested; |
7 | 836 vim_free(expr_copy); |
837 return rv; | |
838 } | |
283 | 839 |
840 /* | |
841 * Get the '=' register expression itself, without evaluating it. | |
842 */ | |
843 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
844 get_expr_line_src(void) |
283 | 845 { |
846 if (expr_line == NULL) | |
847 return NULL; | |
848 return vim_strsave(expr_line); | |
849 } | |
7 | 850 #endif /* FEAT_EVAL */ |
851 | |
852 /* | |
853 * Check if 'regname' is a valid name of a yank register. | |
854 * Note: There is no check for 0 (default register), caller should do this | |
855 */ | |
856 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
857 valid_yank_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
858 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
859 int writing) /* if TRUE check for writable registers */ |
7 | 860 { |
861 if ( (regname > 0 && ASCII_ISALNUM(regname)) | |
862 || (!writing && vim_strchr((char_u *) | |
863 #ifdef FEAT_EVAL | |
6557 | 864 "/.%:=" |
7 | 865 #else |
6557 | 866 "/.%:" |
7 | 867 #endif |
868 , regname) != NULL) | |
6557 | 869 || regname == '#' |
7 | 870 || regname == '"' |
871 || regname == '-' | |
872 || regname == '_' | |
873 #ifdef FEAT_CLIPBOARD | |
874 || regname == '*' | |
875 || regname == '+' | |
876 #endif | |
877 #ifdef FEAT_DND | |
878 || (!writing && regname == '~') | |
879 #endif | |
880 ) | |
881 return TRUE; | |
882 return FALSE; | |
883 } | |
884 | |
885 /* | |
886 * Set y_current and y_append, according to the value of "regname". | |
887 * Cannot handle the '_' register. | |
140 | 888 * Must only be called with a valid register name! |
7 | 889 * |
890 * If regname is 0 and writing, use register 0 | |
891 * If regname is 0 and reading, use previous register | |
892 */ | |
15 | 893 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
894 get_yank_register(int regname, int writing) |
7 | 895 { |
896 int i; | |
897 | |
898 y_append = FALSE; | |
899 if ((regname == 0 || regname == '"') && !writing && y_previous != NULL) | |
900 { | |
901 y_current = y_previous; | |
902 return; | |
903 } | |
904 i = regname; | |
905 if (VIM_ISDIGIT(i)) | |
906 i -= '0'; | |
907 else if (ASCII_ISLOWER(i)) | |
908 i = CharOrdLow(i) + 10; | |
909 else if (ASCII_ISUPPER(i)) | |
910 { | |
911 i = CharOrdUp(i) + 10; | |
912 y_append = TRUE; | |
913 } | |
914 else if (regname == '-') | |
915 i = DELETION_REGISTER; | |
916 #ifdef FEAT_CLIPBOARD | |
917 /* When selection is not available, use register 0 instead of '*' */ | |
918 else if (clip_star.available && regname == '*') | |
919 i = STAR_REGISTER; | |
920 /* When clipboard is not available, use register 0 instead of '+' */ | |
921 else if (clip_plus.available && regname == '+') | |
922 i = PLUS_REGISTER; | |
923 #endif | |
924 #ifdef FEAT_DND | |
925 else if (!writing && regname == '~') | |
926 i = TILDE_REGISTER; | |
927 #endif | |
928 else /* not 0-9, a-z, A-Z or '-': use register 0 */ | |
929 i = 0; | |
930 y_current = &(y_regs[i]); | |
931 if (writing) /* remember the register we write into for do_put() */ | |
932 y_previous = y_current; | |
933 } | |
934 | |
15 | 935 #if defined(FEAT_CLIPBOARD) || defined(PROTO) |
7 | 936 /* |
937 * When "regname" is a clipboard register, obtain the selection. If it's not | |
938 * available return zero, otherwise return "regname". | |
939 */ | |
15 | 940 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
941 may_get_selection(int regname) |
7 | 942 { |
943 if (regname == '*') | |
944 { | |
945 if (!clip_star.available) | |
946 regname = 0; | |
947 else | |
948 clip_get_selection(&clip_star); | |
949 } | |
950 else if (regname == '+') | |
951 { | |
952 if (!clip_plus.available) | |
953 regname = 0; | |
954 else | |
955 clip_get_selection(&clip_plus); | |
956 } | |
957 return regname; | |
958 } | |
959 #endif | |
960 | |
961 /* | |
962 * Obtain the contents of a "normal" register. The register is made empty. | |
963 * The returned pointer has allocated memory, use put_register() later. | |
964 */ | |
965 void * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
966 get_register( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
967 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
968 int copy) /* make a copy, if FALSE make register empty. */ |
7 | 969 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
970 yankreg_T *reg; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
971 int i; |
7 | 972 |
973 #ifdef FEAT_CLIPBOARD | |
974 /* When Visual area changed, may have to update selection. Obtain the | |
975 * selection too. */ | |
1435 | 976 if (name == '*' && clip_star.available) |
7 | 977 { |
3674 | 978 if (clip_isautosel_star()) |
979 clip_update_selection(&clip_star); | |
980 may_get_selection(name); | |
981 } | |
982 if (name == '+' && clip_plus.available) | |
983 { | |
984 if (clip_isautosel_plus()) | |
985 clip_update_selection(&clip_plus); | |
7 | 986 may_get_selection(name); |
987 } | |
988 #endif | |
989 | |
990 get_yank_register(name, 0); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
991 reg = (yankreg_T *)alloc((unsigned)sizeof(yankreg_T)); |
7 | 992 if (reg != NULL) |
993 { | |
994 *reg = *y_current; | |
995 if (copy) | |
996 { | |
997 /* If we run out of memory some or all of the lines are empty. */ | |
998 if (reg->y_size == 0) | |
999 reg->y_array = NULL; | |
1000 else | |
1001 reg->y_array = (char_u **)alloc((unsigned)(sizeof(char_u *) | |
1002 * reg->y_size)); | |
1003 if (reg->y_array != NULL) | |
1004 { | |
1005 for (i = 0; i < reg->y_size; ++i) | |
1006 reg->y_array[i] = vim_strsave(y_current->y_array[i]); | |
1007 } | |
1008 } | |
1009 else | |
1010 y_current->y_array = NULL; | |
1011 } | |
1012 return (void *)reg; | |
1013 } | |
1014 | |
1015 /* | |
1451 | 1016 * Put "reg" into register "name". Free any previous contents and "reg". |
7 | 1017 */ |
1018 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1019 put_register(int name, void *reg) |
7 | 1020 { |
1021 get_yank_register(name, 0); | |
1022 free_yank_all(); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1023 *y_current = *(yankreg_T *)reg; |
1451 | 1024 vim_free(reg); |
7 | 1025 |
5735 | 1026 #ifdef FEAT_CLIPBOARD |
7 | 1027 /* Send text written to clipboard register to the clipboard. */ |
1028 may_set_selection(); | |
5735 | 1029 #endif |
7 | 1030 } |
4209 | 1031 |
1032 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1033 free_register(void *reg) |
4209 | 1034 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1035 yankreg_T tmp; |
4209 | 1036 |
1037 tmp = *y_current; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1038 *y_current = *(yankreg_T *)reg; |
4209 | 1039 free_yank_all(); |
1040 vim_free(reg); | |
1041 *y_current = tmp; | |
1042 } | |
7 | 1043 |
1044 #if defined(FEAT_MOUSE) || defined(PROTO) | |
1045 /* | |
1046 * return TRUE if the current yank register has type MLINE | |
1047 */ | |
1048 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1049 yank_register_mline(int regname) |
7 | 1050 { |
1051 if (regname != 0 && !valid_yank_reg(regname, FALSE)) | |
1052 return FALSE; | |
1053 if (regname == '_') /* black hole is always empty */ | |
1054 return FALSE; | |
1055 get_yank_register(regname, FALSE); | |
1056 return (y_current->y_type == MLINE); | |
1057 } | |
1058 #endif | |
1059 | |
1060 /* | |
1157 | 1061 * Start or stop recording into a yank register. |
7 | 1062 * |
1157 | 1063 * Return FAIL for failure, OK otherwise. |
7 | 1064 */ |
1065 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1066 do_record(int c) |
7 | 1067 { |
1157 | 1068 char_u *p; |
1069 static int regname; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1070 yankreg_T *old_y_previous, *old_y_current; |
1157 | 1071 int retval; |
7 | 1072 |
1073 if (Recording == FALSE) /* start recording */ | |
1074 { | |
1075 /* registers 0-9, a-z and " are allowed */ | |
1076 if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) | |
1077 retval = FAIL; | |
1078 else | |
1079 { | |
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7011
diff
changeset
|
1080 Recording = c; |
7 | 1081 showmode(); |
1082 regname = c; | |
1083 retval = OK; | |
1084 } | |
1085 } | |
1086 else /* stop recording */ | |
1087 { | |
1088 /* | |
1157 | 1089 * Get the recorded key hits. K_SPECIAL and CSI will be escaped, this |
1090 * needs to be removed again to put it in a register. exec_reg then | |
1091 * adds the escaping back later. | |
7 | 1092 */ |
1093 Recording = FALSE; | |
1094 MSG(""); | |
1095 p = get_recorded(); | |
1096 if (p == NULL) | |
1097 retval = FAIL; | |
1098 else | |
1099 { | |
1081 | 1100 /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ |
1101 vim_unescape_csi(p); | |
1102 | |
7 | 1103 /* |
1104 * We don't want to change the default register here, so save and | |
1105 * restore the current register name. | |
1106 */ | |
1107 old_y_previous = y_previous; | |
1108 old_y_current = y_current; | |
1109 | |
1110 retval = stuff_yank(regname, p); | |
1111 | |
1112 y_previous = old_y_previous; | |
1113 y_current = old_y_current; | |
1114 } | |
1115 } | |
1116 return retval; | |
1117 } | |
1118 | |
1119 /* | |
1120 * Stuff string "p" into yank register "regname" as a single line (append if | |
1121 * uppercase). "p" must have been alloced. | |
1122 * | |
1123 * return FAIL for failure, OK otherwise | |
1124 */ | |
1125 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1126 stuff_yank(int regname, char_u *p) |
7 | 1127 { |
1128 char_u *lp; | |
1129 char_u **pp; | |
1130 | |
1131 /* check for read-only register */ | |
1132 if (regname != 0 && !valid_yank_reg(regname, TRUE)) | |
1133 { | |
1134 vim_free(p); | |
1135 return FAIL; | |
1136 } | |
1137 if (regname == '_') /* black hole: don't do anything */ | |
1138 { | |
1139 vim_free(p); | |
1140 return OK; | |
1141 } | |
1142 get_yank_register(regname, TRUE); | |
1143 if (y_append && y_current->y_array != NULL) | |
1144 { | |
1145 pp = &(y_current->y_array[y_current->y_size - 1]); | |
1146 lp = lalloc((long_u)(STRLEN(*pp) + STRLEN(p) + 1), TRUE); | |
1147 if (lp == NULL) | |
1148 { | |
1149 vim_free(p); | |
1150 return FAIL; | |
1151 } | |
1152 STRCPY(lp, *pp); | |
1153 STRCAT(lp, p); | |
1154 vim_free(p); | |
1155 vim_free(*pp); | |
1156 *pp = lp; | |
1157 } | |
1158 else | |
1159 { | |
1160 free_yank_all(); | |
1161 if ((y_current->y_array = | |
1162 (char_u **)alloc((unsigned)sizeof(char_u *))) == NULL) | |
1163 { | |
1164 vim_free(p); | |
1165 return FAIL; | |
1166 } | |
1167 y_current->y_array[0] = p; | |
1168 y_current->y_size = 1; | |
1169 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
|
1170 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1171 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
|
1172 #endif |
7 | 1173 } |
1174 return OK; | |
1175 } | |
1176 | |
1893 | 1177 static int execreg_lastc = NUL; |
1178 | |
7 | 1179 /* |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1180 * Execute a yank register: copy it into the stuff buffer. |
7 | 1181 * |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1182 * Return FAIL for failure, OK otherwise. |
7 | 1183 */ |
1184 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1185 do_execreg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1186 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1187 int colon, /* insert ':' before each line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1188 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
|
1189 int silent) /* set "silent" flag in typeahead buffer */ |
7 | 1190 { |
1191 long i; | |
1192 char_u *p; | |
1193 int retval = OK; | |
1194 int remap; | |
1195 | |
1196 if (regname == '@') /* repeat previous one */ | |
168 | 1197 { |
1893 | 1198 if (execreg_lastc == NUL) |
168 | 1199 { |
1200 EMSG(_("E748: No previously used register")); | |
1201 return FAIL; | |
1202 } | |
1893 | 1203 regname = execreg_lastc; |
168 | 1204 } |
7 | 1205 /* check for valid regname */ |
1206 if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) | |
168 | 1207 { |
1208 emsg_invreg(regname); | |
7 | 1209 return FAIL; |
168 | 1210 } |
1893 | 1211 execreg_lastc = regname; |
7 | 1212 |
1213 #ifdef FEAT_CLIPBOARD | |
1214 regname = may_get_selection(regname); | |
1215 #endif | |
1216 | |
1217 if (regname == '_') /* black hole: don't stuff anything */ | |
1218 return OK; | |
1219 | |
1220 #ifdef FEAT_CMDHIST | |
1221 if (regname == ':') /* use last command line */ | |
1222 { | |
1223 if (last_cmdline == NULL) | |
1224 { | |
1225 EMSG(_(e_nolastcmd)); | |
1226 return FAIL; | |
1227 } | |
1228 vim_free(new_last_cmdline); /* don't keep the cmdline containing @: */ | |
1229 new_last_cmdline = NULL; | |
16 | 1230 /* Escape all control characters with a CTRL-V */ |
1231 p = vim_strsave_escaped_ext(last_cmdline, | |
20 | 1232 (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 | 1233 if (p != NULL) |
480 | 1234 { |
1235 /* When in Visual mode "'<,'>" will be prepended to the command. | |
1236 * Remove it when it's already there. */ | |
1237 if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) | |
1077 | 1238 retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); |
480 | 1239 else |
1077 | 1240 retval = put_in_typebuf(p, TRUE, TRUE, silent); |
480 | 1241 } |
16 | 1242 vim_free(p); |
7 | 1243 } |
1244 #endif | |
1245 #ifdef FEAT_EVAL | |
1246 else if (regname == '=') | |
1247 { | |
1248 p = get_expr_line(); | |
1249 if (p == NULL) | |
1250 return FAIL; | |
1077 | 1251 retval = put_in_typebuf(p, TRUE, colon, silent); |
7 | 1252 vim_free(p); |
1253 } | |
1254 #endif | |
1255 else if (regname == '.') /* use last inserted text */ | |
1256 { | |
1257 p = get_last_insert_save(); | |
1258 if (p == NULL) | |
1259 { | |
1260 EMSG(_(e_noinstext)); | |
1261 return FAIL; | |
1262 } | |
1077 | 1263 retval = put_in_typebuf(p, FALSE, colon, silent); |
7 | 1264 vim_free(p); |
1265 } | |
1266 else | |
1267 { | |
1268 get_yank_register(regname, FALSE); | |
1269 if (y_current->y_array == NULL) | |
1270 return FAIL; | |
1271 | |
1272 /* Disallow remaping for ":@r". */ | |
1273 remap = colon ? REMAP_NONE : REMAP_YES; | |
1274 | |
1275 /* | |
1276 * Insert lines into typeahead buffer, from last one to first one. | |
1277 */ | |
1034 | 1278 put_reedit_in_typebuf(silent); |
7 | 1279 for (i = y_current->y_size; --i >= 0; ) |
1280 { | |
1077 | 1281 char_u *escaped; |
1282 | |
7 | 1283 /* insert NL between lines and after last line if type is MLINE */ |
1284 if (y_current->y_type == MLINE || i < y_current->y_size - 1 | |
1285 || addcr) | |
1286 { | |
1034 | 1287 if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) |
7 | 1288 return FAIL; |
1289 } | |
1077 | 1290 escaped = vim_strsave_escape_csi(y_current->y_array[i]); |
1291 if (escaped == NULL) | |
1292 return FAIL; | |
1293 retval = ins_typebuf(escaped, remap, 0, TRUE, silent); | |
1294 vim_free(escaped); | |
1295 if (retval == FAIL) | |
7 | 1296 return FAIL; |
1034 | 1297 if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) |
7 | 1298 == FAIL) |
1299 return FAIL; | |
1300 } | |
1301 Exec_reg = TRUE; /* disable the 'q' command */ | |
1302 } | |
1303 return retval; | |
1304 } | |
1305 | |
1306 /* | |
1307 * If "restart_edit" is not zero, put it in the typeahead buffer, so that it's | |
1308 * used only after other typeahead has been processed. | |
1309 */ | |
1310 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1311 put_reedit_in_typebuf(int silent) |
7 | 1312 { |
1313 char_u buf[3]; | |
1314 | |
1315 if (restart_edit != NUL) | |
1316 { | |
1317 if (restart_edit == 'V') | |
1318 { | |
1319 buf[0] = 'g'; | |
1320 buf[1] = 'R'; | |
1321 buf[2] = NUL; | |
1322 } | |
1323 else | |
1324 { | |
1325 buf[0] = restart_edit == 'I' ? 'i' : restart_edit; | |
1326 buf[1] = NUL; | |
1327 } | |
1034 | 1328 if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK) |
7 | 1329 restart_edit = NUL; |
1330 } | |
1331 } | |
1332 | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1333 /* |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1334 * 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
|
1335 * executed again. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1336 * 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
|
1337 * no remapping. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1338 */ |
7 | 1339 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1340 put_in_typebuf( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1341 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1342 int esc, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1343 int colon, /* add ':' before the line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1344 int silent) |
7 | 1345 { |
1346 int retval = OK; | |
1347 | |
1034 | 1348 put_reedit_in_typebuf(silent); |
7 | 1349 if (colon) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1350 retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent); |
7 | 1351 if (retval == OK) |
1077 | 1352 { |
1353 char_u *p; | |
1354 | |
1355 if (esc) | |
1356 p = vim_strsave_escape_csi(s); | |
1357 else | |
1358 p = s; | |
1359 if (p == NULL) | |
1360 retval = FAIL; | |
1361 else | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1362 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
|
1363 0, TRUE, silent); |
1077 | 1364 if (esc) |
1365 vim_free(p); | |
1366 } | |
7 | 1367 if (colon && retval == OK) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1368 retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent); |
7 | 1369 return retval; |
1370 } | |
1371 | |
1372 /* | |
1373 * Insert a yank register: copy it into the Read buffer. | |
1374 * Used by CTRL-R command and middle mouse button in insert mode. | |
1375 * | |
1376 * return FAIL for failure, OK otherwise | |
1377 */ | |
1378 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1379 insert_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1380 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1381 int literally) /* insert literally, not as if typed */ |
7 | 1382 { |
1383 long i; | |
1384 int retval = OK; | |
1385 char_u *arg; | |
1386 int allocated; | |
1387 | |
1388 /* | |
1389 * It is possible to get into an endless loop by having CTRL-R a in | |
1390 * register a and then, in insert mode, doing CTRL-R a. | |
1391 * If you hit CTRL-C, the loop will be broken here. | |
1392 */ | |
1393 ui_breakcheck(); | |
1394 if (got_int) | |
1395 return FAIL; | |
1396 | |
1397 /* check for valid regname */ | |
1398 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
1399 return FAIL; | |
1400 | |
1401 #ifdef FEAT_CLIPBOARD | |
1402 regname = may_get_selection(regname); | |
1403 #endif | |
1404 | |
1405 if (regname == '.') /* insert last inserted text */ | |
1406 retval = stuff_inserted(NUL, 1L, TRUE); | |
1407 else if (get_spec_reg(regname, &arg, &allocated, TRUE)) | |
1408 { | |
1409 if (arg == NULL) | |
1410 return FAIL; | |
1411 stuffescaped(arg, literally); | |
1412 if (allocated) | |
1413 vim_free(arg); | |
1414 } | |
1415 else /* name or number register */ | |
1416 { | |
1417 get_yank_register(regname, FALSE); | |
1418 if (y_current->y_array == NULL) | |
1419 retval = FAIL; | |
1420 else | |
1421 { | |
1422 for (i = 0; i < y_current->y_size; ++i) | |
1423 { | |
1424 stuffescaped(y_current->y_array[i], literally); | |
1425 /* | |
1426 * Insert a newline between lines and after last line if | |
1427 * y_type is MLINE. | |
1428 */ | |
1429 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
1430 stuffcharReadbuff('\n'); | |
1431 } | |
1432 } | |
1433 } | |
1434 | |
1435 return retval; | |
1436 } | |
1437 | |
1438 /* | |
1439 * Stuff a string into the typeahead buffer, such that edit() will insert it | |
1440 * literally ("literally" TRUE) or interpret is as typed characters. | |
1441 */ | |
1442 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1443 stuffescaped(char_u *arg, int literally) |
7 | 1444 { |
1445 int c; | |
1446 char_u *start; | |
1447 | |
1448 while (*arg != NUL) | |
1449 { | |
1450 /* Stuff a sequence of normal ASCII characters, that's fast. Also | |
1451 * stuff K_SPECIAL to get the effect of a special key when "literally" | |
1452 * is TRUE. */ | |
1453 start = arg; | |
1454 while ((*arg >= ' ' | |
1455 #ifndef EBCDIC | |
1456 && *arg < DEL /* EBCDIC: chars above space are normal */ | |
1457 #endif | |
1458 ) | |
1459 || (*arg == K_SPECIAL && !literally)) | |
1460 ++arg; | |
1461 if (arg > start) | |
1462 stuffReadbuffLen(start, (long)(arg - start)); | |
1463 | |
1464 /* stuff a single special character */ | |
1465 if (*arg != NUL) | |
1466 { | |
1467 #ifdef FEAT_MBYTE | |
1468 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
|
1469 c = mb_cptr2char_adv(&arg); |
7 | 1470 else |
1471 #endif | |
1472 c = *arg++; | |
1473 if (literally && ((c < ' ' && c != TAB) || c == DEL)) | |
1474 stuffcharReadbuff(Ctrl_V); | |
1475 stuffcharReadbuff(c); | |
1476 } | |
1477 } | |
1478 } | |
1479 | |
1480 /* | |
1157 | 1481 * If "regname" is a special register, return TRUE and store a pointer to its |
1482 * value in "argp". | |
7 | 1483 */ |
15 | 1484 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1485 get_spec_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1486 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1487 char_u **argp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1488 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
|
1489 int errmsg) /* give error message when failing */ |
7 | 1490 { |
1491 int cnt; | |
1492 | |
1493 *argp = NULL; | |
1494 *allocated = FALSE; | |
1495 switch (regname) | |
1496 { | |
1497 case '%': /* file name */ | |
1498 if (errmsg) | |
1499 check_fname(); /* will give emsg if not set */ | |
1500 *argp = curbuf->b_fname; | |
1501 return TRUE; | |
1502 | |
1503 case '#': /* alternate file name */ | |
1504 *argp = getaltfname(errmsg); /* may give emsg if not set */ | |
1505 return TRUE; | |
1506 | |
1507 #ifdef FEAT_EVAL | |
1508 case '=': /* result of expression */ | |
1509 *argp = get_expr_line(); | |
1510 *allocated = TRUE; | |
1511 return TRUE; | |
1512 #endif | |
1513 | |
1514 case ':': /* last command line */ | |
1515 if (last_cmdline == NULL && errmsg) | |
1516 EMSG(_(e_nolastcmd)); | |
1517 *argp = last_cmdline; | |
1518 return TRUE; | |
1519 | |
1520 case '/': /* last search-pattern */ | |
1521 if (last_search_pat() == NULL && errmsg) | |
1522 EMSG(_(e_noprevre)); | |
1523 *argp = last_search_pat(); | |
1524 return TRUE; | |
1525 | |
1526 case '.': /* last inserted text */ | |
1527 *argp = get_last_insert_save(); | |
1528 *allocated = TRUE; | |
1529 if (*argp == NULL && errmsg) | |
1530 EMSG(_(e_noinstext)); | |
1531 return TRUE; | |
1532 | |
1533 #ifdef FEAT_SEARCHPATH | |
1534 case Ctrl_F: /* Filename under cursor */ | |
1535 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
1536 if (!errmsg) | |
1537 return FALSE; | |
1538 *argp = file_name_at_cursor(FNAME_MESS | FNAME_HYP | |
681 | 1539 | (regname == Ctrl_P ? FNAME_EXP : 0), 1L, NULL); |
7 | 1540 *allocated = TRUE; |
1541 return TRUE; | |
1542 #endif | |
1543 | |
1544 case Ctrl_W: /* word under cursor */ | |
1545 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
1546 if (!errmsg) | |
1547 return FALSE; | |
1548 cnt = find_ident_under_cursor(argp, regname == Ctrl_W | |
1549 ? (FIND_IDENT|FIND_STRING) : FIND_STRING); | |
1550 *argp = cnt ? vim_strnsave(*argp, cnt) : NULL; | |
1551 *allocated = TRUE; | |
1552 return TRUE; | |
1553 | |
1554 case '_': /* black hole: always empty */ | |
1555 *argp = (char_u *)""; | |
1556 return TRUE; | |
1557 } | |
1558 | |
1559 return FALSE; | |
1560 } | |
1561 | |
1562 /* | |
15 | 1563 * Paste a yank register into the command line. |
1564 * Only for non-special registers. | |
1565 * Used by CTRL-R command in command-line mode | |
7 | 1566 * insert_reg() can't be used here, because special characters from the |
1567 * register contents will be interpreted as commands. | |
1568 * | |
1569 * return FAIL for failure, OK otherwise | |
1570 */ | |
1571 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1572 cmdline_paste_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1573 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1574 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
|
1575 int remcr) /* don't add CR characters */ |
7 | 1576 { |
1577 long i; | |
1578 | |
1579 get_yank_register(regname, FALSE); | |
1580 if (y_current->y_array == NULL) | |
1581 return FAIL; | |
1582 | |
1583 for (i = 0; i < y_current->y_size; ++i) | |
1584 { | |
1585 cmdline_paste_str(y_current->y_array[i], literally); | |
1586 | |
1015 | 1587 /* 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
|
1588 * 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
|
1589 if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr) |
7 | 1590 cmdline_paste_str((char_u *)"\r", literally); |
1591 | |
1592 /* Check for CTRL-C, in case someone tries to paste a few thousand | |
1593 * lines and gets bored. */ | |
1594 ui_breakcheck(); | |
1595 if (got_int) | |
1596 return FAIL; | |
1597 } | |
1598 return OK; | |
1599 } | |
1600 | |
1601 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
1602 /* | |
1603 * Adjust the register name pointed to with "rp" for the clipboard being | |
1604 * used always and the clipboard being available. | |
1605 */ | |
1606 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1607 adjust_clip_reg(int *rp) |
7 | 1608 { |
2654 | 1609 /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', |
1610 * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ | |
6116 | 1611 if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0)) |
1612 { | |
1613 if (clip_unnamed != 0) | |
1614 *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
2654 | 1615 ? '+' : '*'; |
6116 | 1616 else |
1617 *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
1618 ? '+' : '*'; | |
1619 } | |
7 | 1620 if (!clip_star.available && *rp == '*') |
1621 *rp = 0; | |
1622 if (!clip_plus.available && *rp == '+') | |
1623 *rp = 0; | |
1624 } | |
1625 #endif | |
1626 | |
1627 /* | |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1628 * 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
|
1629 */ |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1630 void |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1631 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
|
1632 { |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1633 int n; |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1634 |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1635 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
|
1636 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
|
1637 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
|
1638 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
|
1639 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
|
1640 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
|
1641 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
|
1642 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
|
1643 } |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1644 |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1645 /* |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1646 * Handle a delete operation. |
7 | 1647 * |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1648 * Return FAIL if undo failed, OK otherwise. |
7 | 1649 */ |
1650 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1651 op_delete(oparg_T *oap) |
7 | 1652 { |
1653 int n; | |
1654 linenr_T lnum; | |
1655 char_u *ptr; | |
1656 char_u *newp, *oldp; | |
1657 struct block_def bd; | |
1658 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
1659 int did_yank = FALSE; | |
3782 | 1660 int orig_regname = oap->regname; |
7 | 1661 |
1662 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
1663 return OK; | |
1664 | |
1665 /* Nothing to delete, return here. Do prepare undo, for op_change(). */ | |
1666 if (oap->empty) | |
1667 return u_save_cursor(); | |
1668 | |
1669 if (!curbuf->b_p_ma) | |
1670 { | |
1671 EMSG(_(e_modifiable)); | |
1672 return FAIL; | |
1673 } | |
1674 | |
1675 #ifdef FEAT_CLIPBOARD | |
1676 adjust_clip_reg(&oap->regname); | |
1677 #endif | |
1678 | |
1679 #ifdef FEAT_MBYTE | |
1680 if (has_mbyte) | |
1681 mb_adjust_opend(oap); | |
1682 #endif | |
1683 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1684 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1685 * 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
|
1686 * 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
|
1687 * 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
|
1688 */ |
7 | 1689 if ( oap->motion_type == MCHAR |
1690 && !oap->is_VIsual | |
50 | 1691 && !oap->block_mode |
7 | 1692 && oap->line_count > 1 |
3254 | 1693 && oap->motion_force == NUL |
7 | 1694 && oap->op_type == OP_DELETE) |
1695 { | |
2957 | 1696 ptr = ml_get(oap->end.lnum) + oap->end.col; |
1697 if (*ptr != NUL) | |
1698 ptr += oap->inclusive; | |
7 | 1699 ptr = skipwhite(ptr); |
1700 if (*ptr == NUL && inindent(0)) | |
1701 oap->motion_type = MLINE; | |
1702 } | |
1703 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1704 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1705 * 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
|
1706 * 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
|
1707 */ |
7 | 1708 if ( oap->motion_type == MCHAR |
1709 && oap->line_count == 1 | |
1710 && oap->op_type == OP_DELETE | |
1711 && *ml_get(oap->start.lnum) == NUL) | |
1712 { | |
1713 /* | |
446 | 1714 * It's an error to operate on an empty region, when 'E' included in |
7 | 1715 * 'cpoptions' (Vi compatible). |
1716 */ | |
446 | 1717 #ifdef FEAT_VIRTUALEDIT |
1718 if (virtual_op) | |
1719 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
1720 * marks as if it happened. */ | |
1721 goto setmarks; | |
1722 #endif | |
7 | 1723 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
1724 beep_flush(); | |
1725 return OK; | |
1726 } | |
1727 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1728 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1729 * 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
|
1730 * 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
|
1731 * 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
|
1732 */ |
7 | 1733 if (oap->regname != '_') |
1734 { | |
1735 if (oap->regname != 0) | |
1736 { | |
1737 /* check for read-only register */ | |
1738 if (!valid_yank_reg(oap->regname, TRUE)) | |
1739 { | |
1740 beep_flush(); | |
1741 return OK; | |
1742 } | |
1743 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
1744 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
1745 did_yank = TRUE; | |
1746 } | |
1747 | |
1748 /* | |
1749 * Put deleted text into register 1 and shift number registers if the | |
1750 * delete contains a line break, or when a regname has been specified. | |
3782 | 1751 * Use the register name from before adjust_clip_reg() may have |
1752 * changed it. | |
7 | 1753 */ |
3782 | 1754 if (orig_regname != 0 || oap->motion_type == MLINE |
7 | 1755 || oap->line_count > 1 || oap->use_reg_one) |
1756 { | |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1757 shift_delete_registers(); |
7 | 1758 if (op_yank(oap, TRUE, FALSE) == OK) |
1759 did_yank = TRUE; | |
1760 } | |
1761 | |
3468 | 1762 /* Yank into small delete register when no named register specified |
1763 * and the delete is within one line. */ | |
1764 if (( | |
1765 #ifdef FEAT_CLIPBOARD | |
3584 | 1766 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
1767 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
3468 | 1768 #endif |
1769 oap->regname == 0) && oap->motion_type != MLINE | |
7 | 1770 && oap->line_count == 1) |
1771 { | |
1772 oap->regname = '-'; | |
1773 get_yank_register(oap->regname, TRUE); | |
1774 if (op_yank(oap, TRUE, FALSE) == OK) | |
1775 did_yank = TRUE; | |
1776 oap->regname = 0; | |
1777 } | |
1778 | |
1779 /* | |
1780 * If there's too much stuff to fit in the yank register, then get a | |
1781 * confirmation before doing the delete. This is crude, but simple. | |
1782 * And it avoids doing a delete of something we can't put back if we | |
1783 * want. | |
1784 */ | |
1785 if (!did_yank) | |
1786 { | |
1787 int msg_silent_save = msg_silent; | |
1788 | |
1789 msg_silent = 0; /* must display the prompt */ | |
1790 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
1791 msg_silent = msg_silent_save; | |
1792 if (n != 'y') | |
1793 { | |
1794 EMSG(_(e_abort)); | |
1795 return FAIL; | |
1796 } | |
1797 } | |
1798 } | |
1799 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1800 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1801 * 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
|
1802 */ |
7 | 1803 if (oap->block_mode) |
1804 { | |
1805 if (u_save((linenr_T)(oap->start.lnum - 1), | |
1806 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
1807 return FAIL; | |
1808 | |
1809 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
1810 { | |
1811 block_prep(oap, &bd, lnum, TRUE); | |
1812 if (bd.textlen == 0) /* nothing to delete */ | |
1813 continue; | |
1814 | |
1815 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
1816 if (lnum == curwin->w_cursor.lnum) | |
1817 { | |
1818 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
1819 # ifdef FEAT_VIRTUALEDIT | |
1820 curwin->w_cursor.coladd = 0; | |
1821 # endif | |
1822 } | |
1823 | |
1824 /* n == number of chars deleted | |
1825 * If we delete a TAB, it may be replaced by several characters. | |
1826 * Thus the number of characters may increase! | |
1827 */ | |
1828 n = bd.textlen - bd.startspaces - bd.endspaces; | |
1829 oldp = ml_get(lnum); | |
1830 newp = alloc_check((unsigned)STRLEN(oldp) + 1 - n); | |
1831 if (newp == NULL) | |
1832 continue; | |
1833 /* copy up to deleted part */ | |
1834 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
1835 /* insert spaces */ | |
6929 | 1836 vim_memset(newp + bd.textcol, ' ', |
7 | 1837 (size_t)(bd.startspaces + bd.endspaces)); |
1838 /* copy the part after the deleted part */ | |
1839 oldp += bd.textcol + bd.textlen; | |
1622 | 1840 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
7 | 1841 /* replace the line */ |
1842 ml_replace(lnum, newp, FALSE); | |
1843 } | |
1844 | |
1845 check_cursor_col(); | |
1846 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
1847 oap->end.lnum + 1, 0L); | |
1848 oap->line_count = 0; /* no lines deleted */ | |
1849 } | |
5735 | 1850 else if (oap->motion_type == MLINE) |
7 | 1851 { |
1852 if (oap->op_type == OP_CHANGE) | |
1853 { | |
1854 /* Delete the lines except the first one. Temporarily move the | |
1855 * cursor to the next line. Save the current line number, if the | |
1856 * last line is deleted it may be changed. | |
1857 */ | |
1858 if (oap->line_count > 1) | |
1859 { | |
1860 lnum = curwin->w_cursor.lnum; | |
1861 ++curwin->w_cursor.lnum; | |
1862 del_lines((long)(oap->line_count - 1), TRUE); | |
1863 curwin->w_cursor.lnum = lnum; | |
1864 } | |
1865 if (u_save_cursor() == FAIL) | |
1866 return FAIL; | |
1867 if (curbuf->b_p_ai) /* don't delete indent */ | |
1868 { | |
1869 beginline(BL_WHITE); /* cursor on first non-white */ | |
1870 did_ai = TRUE; /* delete the indent when ESC hit */ | |
1871 ai_col = curwin->w_cursor.col; | |
1872 } | |
1873 else | |
1874 beginline(0); /* cursor in column 0 */ | |
1875 truncate_line(FALSE); /* delete the rest of the line */ | |
1876 /* leave cursor past last char in line */ | |
1877 if (oap->line_count > 1) | |
1878 u_clearline(); /* "U" command not possible after "2cc" */ | |
1879 } | |
1880 else | |
1881 { | |
1882 del_lines(oap->line_count, TRUE); | |
1883 beginline(BL_WHITE | BL_FIX); | |
1884 u_clearline(); /* "U" command not possible after "dd" */ | |
1885 } | |
1886 } | |
1887 else | |
1888 { | |
1889 #ifdef FEAT_VIRTUALEDIT | |
1890 if (virtual_op) | |
1891 { | |
1892 int endcol = 0; | |
1893 | |
1894 /* For virtualedit: break the tabs that are partly included. */ | |
1895 if (gchar_pos(&oap->start) == '\t') | |
1896 { | |
1897 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
1898 return FAIL; | |
1899 if (oap->line_count == 1) | |
1900 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
1901 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
1902 oap->start = curwin->w_cursor; | |
1903 if (oap->line_count == 1) | |
1904 { | |
1905 coladvance(endcol); | |
1906 oap->end.col = curwin->w_cursor.col; | |
1907 oap->end.coladd = curwin->w_cursor.coladd; | |
1908 curwin->w_cursor = oap->start; | |
1909 } | |
1910 } | |
1911 | |
1912 /* Break a tab only when it's included in the area. */ | |
1913 if (gchar_pos(&oap->end) == '\t' | |
1914 && (int)oap->end.coladd < oap->inclusive) | |
1915 { | |
1916 /* save last line for undo */ | |
1917 if (u_save((linenr_T)(oap->end.lnum - 1), | |
1918 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
1919 return FAIL; | |
1920 curwin->w_cursor = oap->end; | |
1921 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
1922 oap->end = curwin->w_cursor; | |
1923 curwin->w_cursor = oap->start; | |
1924 } | |
1925 } | |
1926 #endif | |
1927 | |
1928 if (oap->line_count == 1) /* delete characters within one line */ | |
1929 { | |
1930 if (u_save_cursor() == FAIL) /* save line for undo */ | |
1931 return FAIL; | |
1932 | |
1933 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
5735 | 1934 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
7 | 1935 && oap->op_type == OP_CHANGE |
1936 && oap->end.lnum == curwin->w_cursor.lnum | |
5735 | 1937 && !oap->is_VIsual) |
7 | 1938 display_dollar(oap->end.col - !oap->inclusive); |
1939 | |
1940 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
1941 | |
1942 #ifdef FEAT_VIRTUALEDIT | |
1943 if (virtual_op) | |
1944 { | |
1945 /* fix up things for virtualedit-delete: | |
1946 * break the tabs which are going to get in our way | |
1947 */ | |
1948 char_u *curline = ml_get_curline(); | |
1949 int len = (int)STRLEN(curline); | |
1950 | |
1951 if (oap->end.coladd != 0 | |
1952 && (int)oap->end.col >= len - 1 | |
1953 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
1954 n++; | |
1955 /* Delete at least one char (e.g, when on a control char). */ | |
1956 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
1957 n = 1; | |
1958 | |
1959 /* When deleted a char in the line, reset coladd. */ | |
1960 if (gchar_cursor() != NUL) | |
1961 curwin->w_cursor.coladd = 0; | |
1962 } | |
1963 #endif | |
6826 | 1964 (void)del_bytes((long)n, !virtual_op, |
1965 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
7 | 1966 } |
1967 else /* delete characters between lines */ | |
1968 { | |
1969 pos_T curpos; | |
1970 | |
1971 /* save deleted and changed lines for undo */ | |
1972 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
1973 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
1974 return FAIL; | |
1975 | |
1976 truncate_line(TRUE); /* delete from cursor to end of line */ | |
1977 | |
1978 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
1979 ++curwin->w_cursor.lnum; | |
1980 del_lines((long)(oap->line_count - 2), FALSE); | |
1981 | |
6826 | 1982 /* delete from start of line until op_end */ |
2957 | 1983 n = (oap->end.col + 1 - !oap->inclusive); |
6826 | 1984 curwin->w_cursor.col = 0; |
1985 (void)del_bytes((long)n, !virtual_op, | |
1986 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
1987 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
1988 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
7 | 1989 } |
1990 } | |
1991 | |
1992 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
1993 | |
446 | 1994 #ifdef FEAT_VIRTUALEDIT |
1995 setmarks: | |
1996 #endif | |
7 | 1997 if (oap->block_mode) |
1998 { | |
1999 curbuf->b_op_end.lnum = oap->end.lnum; | |
2000 curbuf->b_op_end.col = oap->start.col; | |
2001 } | |
2002 else | |
2003 curbuf->b_op_end = oap->start; | |
2004 curbuf->b_op_start = oap->start; | |
2005 | |
2006 return OK; | |
2007 } | |
2008 | |
2009 #ifdef FEAT_MBYTE | |
2010 /* | |
2011 * Adjust end of operating area for ending on a multi-byte character. | |
2012 * Used for deletion. | |
2013 */ | |
2014 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2015 mb_adjust_opend(oparg_T *oap) |
7 | 2016 { |
2017 char_u *p; | |
2018 | |
2019 if (oap->inclusive) | |
2020 { | |
2021 p = ml_get(oap->end.lnum); | |
2022 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
2023 } | |
2024 } | |
2025 #endif | |
2026 | |
2027 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
2028 /* | |
2029 * Replace a whole area with one character. | |
2030 */ | |
2031 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2032 op_replace(oparg_T *oap, int c) |
7 | 2033 { |
2034 int n, numc; | |
2035 #ifdef FEAT_MBYTE | |
2036 int num_chars; | |
2037 #endif | |
2038 char_u *newp, *oldp; | |
2039 size_t oldlen; | |
2040 struct block_def bd; | |
5428 | 2041 char_u *after_p = NULL; |
2042 int had_ctrl_v_cr = (c == -1 || c == -2); | |
7 | 2043 |
2044 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
2045 return OK; /* nothing to do */ | |
2046 | |
5428 | 2047 if (had_ctrl_v_cr) |
2048 c = (c == -1 ? '\r' : '\n'); | |
2049 | |
7 | 2050 #ifdef FEAT_MBYTE |
2051 if (has_mbyte) | |
2052 mb_adjust_opend(oap); | |
2053 #endif | |
2054 | |
2055 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2056 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2057 return FAIL; | |
2058 | |
2059 /* | |
2060 * block mode replace | |
2061 */ | |
2062 if (oap->block_mode) | |
2063 { | |
2064 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2065 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
2066 { | |
1982 | 2067 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
7 | 2068 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
2069 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
2070 continue; /* nothing to replace */ | |
2071 | |
2072 /* n == number of extra chars required | |
2073 * If we split a TAB, it may be replaced by several characters. | |
2074 * Thus the number of characters may increase! | |
2075 */ | |
2076 #ifdef FEAT_VIRTUALEDIT | |
2077 /* If the range starts in virtual space, count the initial | |
2078 * coladd offset as part of "startspaces" */ | |
2079 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
2080 { | |
2081 pos_T vpos; | |
2082 | |
1982 | 2083 vpos.lnum = curwin->w_cursor.lnum; |
7 | 2084 getvpos(&vpos, oap->start_vcol); |
2085 bd.startspaces += vpos.coladd; | |
2086 n = bd.startspaces; | |
2087 } | |
2088 else | |
2089 #endif | |
2090 /* allow for pre spaces */ | |
2091 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
2092 | |
2093 /* allow for post spp */ | |
2094 n += (bd.endspaces | |
2095 #ifdef FEAT_VIRTUALEDIT | |
2096 && !bd.is_oneChar | |
2097 #endif | |
2098 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
2099 /* Figure out how many characters to replace. */ | |
2100 numc = oap->end_vcol - oap->start_vcol + 1; | |
2101 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
2102 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
2103 | |
2104 #ifdef FEAT_MBYTE | |
2105 /* A double-wide character can be replaced only up to half the | |
2106 * times. */ | |
2107 if ((*mb_char2cells)(c) > 1) | |
2108 { | |
2109 if ((numc & 1) && !bd.is_short) | |
2110 { | |
2111 ++bd.endspaces; | |
2112 ++n; | |
2113 } | |
2114 numc = numc / 2; | |
2115 } | |
2116 | |
2117 /* Compute bytes needed, move character count to num_chars. */ | |
2118 num_chars = numc; | |
2119 numc *= (*mb_char2len)(c); | |
2120 #endif | |
2121 /* oldlen includes textlen, so don't double count */ | |
2122 n += numc - bd.textlen; | |
2123 | |
2124 oldp = ml_get_curline(); | |
2125 oldlen = STRLEN(oldp); | |
2126 newp = alloc_check((unsigned)oldlen + 1 + n); | |
2127 if (newp == NULL) | |
2128 continue; | |
2129 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
2130 /* copy up to deleted part */ | |
2131 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2132 oldp += bd.textcol + bd.textlen; | |
2133 /* insert pre-spaces */ | |
6929 | 2134 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
7 | 2135 /* insert replacement chars CHECK FOR ALLOCATED SPACE */ |
5428 | 2136 /* -1/-2 is used for entering CR literally. */ |
2137 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) | |
7 | 2138 { |
5428 | 2139 #ifdef FEAT_MBYTE |
2140 if (has_mbyte) | |
2141 { | |
2142 n = (int)STRLEN(newp); | |
2143 while (--num_chars >= 0) | |
2144 n += (*mb_char2bytes)(c, newp + n); | |
2145 } | |
2146 else | |
2147 #endif | |
6929 | 2148 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
5428 | 2149 if (!bd.is_short) |
2150 { | |
2151 /* insert post-spaces */ | |
6929 | 2152 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
5428 | 2153 /* copy the part after the changed part */ |
2154 STRMOVE(newp + STRLEN(newp), oldp); | |
2155 } | |
7 | 2156 } |
2157 else | |
2158 { | |
5428 | 2159 /* Replacing with \r or \n means splitting the line. */ |
5475 | 2160 after_p = alloc_check( |
2161 (unsigned)(oldlen + 1 + n - STRLEN(newp))); | |
5428 | 2162 if (after_p != NULL) |
2163 STRMOVE(after_p, oldp); | |
7 | 2164 } |
2165 /* replace the line */ | |
2166 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
5428 | 2167 if (after_p != NULL) |
2168 { | |
2169 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
2170 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
2171 oap->end.lnum++; | |
2172 vim_free(after_p); | |
2173 } | |
7 | 2174 } |
2175 } | |
2176 else | |
2177 { | |
2178 /* | |
2179 * MCHAR and MLINE motion replace. | |
2180 */ | |
2181 if (oap->motion_type == MLINE) | |
2182 { | |
2183 oap->start.col = 0; | |
2184 curwin->w_cursor.col = 0; | |
2185 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2186 if (oap->end.col) | |
2187 --oap->end.col; | |
2188 } | |
2189 else if (!oap->inclusive) | |
2190 dec(&(oap->end)); | |
2191 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2192 while (LTOREQ_POS(curwin->w_cursor, oap->end)) |
7 | 2193 { |
2194 n = gchar_cursor(); | |
2195 if (n != NUL) | |
2196 { | |
2197 #ifdef FEAT_MBYTE | |
2198 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
2199 { | |
2200 /* This is slow, but it handles replacing a single-byte | |
2201 * with a multi-byte and the other way around. */ | |
4203 | 2202 if (curwin->w_cursor.lnum == oap->end.lnum) |
2203 oap->end.col += (*mb_char2len)(c) - (*mb_char2len)(n); | |
7 | 2204 n = State; |
2205 State = REPLACE; | |
2206 ins_char(c); | |
2207 State = n; | |
2208 /* Backup to the replaced character. */ | |
2209 dec_cursor(); | |
2210 } | |
2211 else | |
2212 #endif | |
2213 { | |
2214 #ifdef FEAT_VIRTUALEDIT | |
2215 if (n == TAB) | |
2216 { | |
2217 int end_vcol = 0; | |
2218 | |
2219 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2220 { | |
2221 /* oap->end has to be recalculated when | |
2222 * the tab breaks */ | |
2223 end_vcol = getviscol2(oap->end.col, | |
2224 oap->end.coladd); | |
2225 } | |
2226 coladvance_force(getviscol()); | |
2227 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2228 getvpos(&oap->end, end_vcol); | |
2229 } | |
2230 #endif | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2231 PCHAR(curwin->w_cursor, c); |
7 | 2232 } |
2233 } | |
2234 #ifdef FEAT_VIRTUALEDIT | |
2235 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
2236 { | |
2237 int virtcols = oap->end.coladd; | |
2238 | |
2239 if (curwin->w_cursor.lnum == oap->start.lnum | |
2240 && oap->start.col == oap->end.col && oap->start.coladd) | |
2241 virtcols -= oap->start.coladd; | |
2242 | |
2243 /* oap->end has been trimmed so it's effectively inclusive; | |
2244 * as a result an extra +1 must be counted so we don't | |
2245 * trample the NUL byte. */ | |
2246 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
2247 curwin->w_cursor.col -= (virtcols + 1); | |
2248 for (; virtcols >= 0; virtcols--) | |
2249 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2250 PCHAR(curwin->w_cursor, c); |
7 | 2251 if (inc(&curwin->w_cursor) == -1) |
2252 break; | |
2253 } | |
2254 } | |
2255 #endif | |
2256 | |
2257 /* Advance to next character, stop at the end of the file. */ | |
2258 if (inc_cursor() == -1) | |
2259 break; | |
2260 } | |
2261 } | |
2262 | |
2263 curwin->w_cursor = oap->start; | |
2264 check_cursor(); | |
2265 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
2266 | |
2267 /* Set "'[" and "']" marks. */ | |
2268 curbuf->b_op_start = oap->start; | |
2269 curbuf->b_op_end = oap->end; | |
2270 | |
2271 return OK; | |
2272 } | |
2273 #endif | |
2274 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2275 static int swapchars(int op_type, pos_T *pos, int length); |
1525 | 2276 |
7 | 2277 /* |
2278 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
2279 */ | |
2280 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2281 op_tilde(oparg_T *oap) |
7 | 2282 { |
2283 pos_T pos; | |
2284 struct block_def bd; | |
1528 | 2285 int did_change = FALSE; |
7 | 2286 |
2287 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2288 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2289 return; | |
2290 | |
2291 pos = oap->start; | |
2292 if (oap->block_mode) /* Visual block mode */ | |
2293 { | |
2294 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
2295 { | |
1766 | 2296 int one_change; |
2297 | |
7 | 2298 block_prep(oap, &bd, pos.lnum, FALSE); |
2299 pos.col = bd.textcol; | |
1766 | 2300 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
2301 did_change |= one_change; | |
1525 | 2302 |
5735 | 2303 #ifdef FEAT_NETBEANS_INTG |
2210 | 2304 if (netbeans_active() && one_change) |
7 | 2305 { |
2306 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2307 | |
33 | 2308 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
2309 (long)bd.textlen); | |
7 | 2310 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
2210 | 2311 &ptr[bd.textcol], bd.textlen); |
7 | 2312 } |
5735 | 2313 #endif |
7 | 2314 } |
2315 if (did_change) | |
2316 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
2317 } | |
2318 else /* not block mode */ | |
2319 { | |
2320 if (oap->motion_type == MLINE) | |
2321 { | |
2322 oap->start.col = 0; | |
2323 pos.col = 0; | |
2324 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2325 if (oap->end.col) | |
2326 --oap->end.col; | |
2327 } | |
2328 else if (!oap->inclusive) | |
2329 dec(&(oap->end)); | |
2330 | |
1528 | 2331 if (pos.lnum == oap->end.lnum) |
2332 did_change = swapchars(oap->op_type, &pos, | |
2333 oap->end.col - pos.col + 1); | |
2334 else | |
2335 for (;;) | |
2336 { | |
2337 did_change |= swapchars(oap->op_type, &pos, | |
2338 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
2339 (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
|
2340 if (LTOREQ_POS(oap->end, pos) || inc(&pos) == -1) |
1528 | 2341 break; |
2342 } | |
7 | 2343 if (did_change) |
2344 { | |
2345 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
2346 0L); | |
2347 #ifdef FEAT_NETBEANS_INTG | |
2210 | 2348 if (netbeans_active() && did_change) |
7 | 2349 { |
2350 char_u *ptr; | |
2351 int count; | |
2352 | |
2353 pos = oap->start; | |
2354 while (pos.lnum < oap->end.lnum) | |
2355 { | |
2356 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
835 | 2357 count = (int)STRLEN(ptr) - pos.col; |
33 | 2358 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2359 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2360 &ptr[pos.col], count); |
7 | 2361 pos.col = 0; |
2362 pos.lnum++; | |
2363 } | |
2364 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2365 count = oap->end.col - pos.col + 1; | |
33 | 2366 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2367 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2368 &ptr[pos.col], count); |
7 | 2369 } |
2370 #endif | |
2371 } | |
2372 } | |
2373 | |
2374 if (!did_change && oap->is_VIsual) | |
2375 /* No change: need to remove the Visual selection */ | |
2376 redraw_curbuf_later(INVERTED); | |
2377 | |
2378 /* | |
2379 * Set '[ and '] marks. | |
2380 */ | |
2381 curbuf->b_op_start = oap->start; | |
2382 curbuf->b_op_end = oap->end; | |
2383 | |
2384 if (oap->line_count > p_report) | |
2385 { | |
2386 if (oap->line_count == 1) | |
2387 MSG(_("1 line changed")); | |
2388 else | |
2389 smsg((char_u *)_("%ld lines changed"), oap->line_count); | |
2390 } | |
2391 } | |
2392 | |
2393 /* | |
1525 | 2394 * Invoke swapchar() on "length" bytes at position "pos". |
2395 * "pos" is advanced to just after the changed characters. | |
2396 * "length" is rounded up to include the whole last multi-byte character. | |
2397 * Also works correctly when the number of bytes changes. | |
2398 * Returns TRUE if some character was changed. | |
2399 */ | |
2400 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2401 swapchars(int op_type, pos_T *pos, int length) |
1525 | 2402 { |
2403 int todo; | |
2404 int did_change = 0; | |
2405 | |
2406 for (todo = length; todo > 0; --todo) | |
2407 { | |
2408 # ifdef FEAT_MBYTE | |
2409 if (has_mbyte) | |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2410 { |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2411 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2412 |
1525 | 2413 /* we're counting bytes, not characters */ |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2414 if (len > 0) |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2415 todo -= len - 1; |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2416 } |
1525 | 2417 # endif |
2418 did_change |= swapchar(op_type, pos); | |
2419 if (inc(pos) == -1) /* at end of file */ | |
2420 break; | |
2421 } | |
2422 return did_change; | |
2423 } | |
2424 | |
2425 /* | |
7 | 2426 * If op_type == OP_UPPER: make uppercase, |
2427 * if op_type == OP_LOWER: make lowercase, | |
2428 * if op_type == OP_ROT13: do rot13 encoding, | |
2429 * else swap case of character at 'pos' | |
2430 * returns TRUE when something actually changed. | |
2431 */ | |
2432 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2433 swapchar(int op_type, pos_T *pos) |
7 | 2434 { |
2435 int c; | |
2436 int nc; | |
2437 | |
2438 c = gchar_pos(pos); | |
2439 | |
2440 /* Only do rot13 encoding for ASCII characters. */ | |
2441 if (c >= 0x80 && op_type == OP_ROT13) | |
2442 return FALSE; | |
2443 | |
2444 #ifdef FEAT_MBYTE | |
1525 | 2445 if (op_type == OP_UPPER && c == 0xdf |
2446 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
493 | 2447 { |
2448 pos_T sp = curwin->w_cursor; | |
2449 | |
2450 /* Special handling of German sharp s: change to "SS". */ | |
2451 curwin->w_cursor = *pos; | |
2452 del_char(FALSE); | |
2453 ins_char('S'); | |
2454 ins_char('S'); | |
2455 curwin->w_cursor = sp; | |
2456 inc(pos); | |
2457 } | |
2458 | |
7 | 2459 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
2460 return FALSE; | |
2461 #endif | |
2462 nc = c; | |
2463 if (MB_ISLOWER(c)) | |
2464 { | |
2465 if (op_type == OP_ROT13) | |
2466 nc = ROT13(c, 'a'); | |
2467 else if (op_type != OP_LOWER) | |
2468 nc = MB_TOUPPER(c); | |
2469 } | |
2470 else if (MB_ISUPPER(c)) | |
2471 { | |
2472 if (op_type == OP_ROT13) | |
2473 nc = ROT13(c, 'A'); | |
2474 else if (op_type != OP_UPPER) | |
2475 nc = MB_TOLOWER(c); | |
2476 } | |
2477 if (nc != c) | |
2478 { | |
2479 #ifdef FEAT_MBYTE | |
2480 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
2481 { | |
2482 pos_T sp = curwin->w_cursor; | |
2483 | |
2484 curwin->w_cursor = *pos; | |
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2485 /* 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
|
2486 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
7 | 2487 ins_char(nc); |
2488 curwin->w_cursor = sp; | |
2489 } | |
2490 else | |
2491 #endif | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2492 PCHAR(*pos, nc); |
7 | 2493 return TRUE; |
2494 } | |
2495 return FALSE; | |
2496 } | |
2497 | |
2498 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
2499 /* | |
2500 * op_insert - Insert and append operators for Visual mode. | |
2501 */ | |
2502 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2503 op_insert(oparg_T *oap, long count1) |
7 | 2504 { |
2505 long ins_len, pre_textlen = 0; | |
2506 char_u *firstline, *ins_text; | |
2507 struct block_def bd; | |
2508 int i; | |
6579 | 2509 pos_T t1; |
7 | 2510 |
2511 /* edit() changes this - record it for OP_APPEND */ | |
2512 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2513 | |
2514 /* vis block is still marked. Get rid of it now. */ | |
2515 curwin->w_cursor.lnum = oap->start.lnum; | |
2516 update_screen(INVERTED); | |
2517 | |
2518 if (oap->block_mode) | |
2519 { | |
2520 #ifdef FEAT_VIRTUALEDIT | |
2521 /* When 'virtualedit' is used, need to insert the extra spaces before | |
2522 * doing block_prep(). When only "block" is used, virtual edit is | |
2523 * already disabled, but still need it when calling | |
2524 * coladvance_force(). */ | |
2525 if (curwin->w_cursor.coladd > 0) | |
2526 { | |
2527 int old_ve_flags = ve_flags; | |
2528 | |
2529 ve_flags = VE_ALL; | |
2530 if (u_save_cursor() == FAIL) | |
2531 return; | |
2532 coladvance_force(oap->op_type == OP_APPEND | |
2533 ? oap->end_vcol + 1 : getviscol()); | |
2534 if (oap->op_type == OP_APPEND) | |
2535 --curwin->w_cursor.col; | |
2536 ve_flags = old_ve_flags; | |
2537 } | |
2538 #endif | |
2539 /* Get the info about the block before entering the text */ | |
2540 block_prep(oap, &bd, oap->start.lnum, TRUE); | |
2541 firstline = ml_get(oap->start.lnum) + bd.textcol; | |
2542 if (oap->op_type == OP_APPEND) | |
2543 firstline += bd.textlen; | |
2544 pre_textlen = (long)STRLEN(firstline); | |
2545 } | |
2546 | |
2547 if (oap->op_type == OP_APPEND) | |
2548 { | |
2549 if (oap->block_mode | |
2550 #ifdef FEAT_VIRTUALEDIT | |
2551 && curwin->w_cursor.coladd == 0 | |
2552 #endif | |
2553 ) | |
2554 { | |
2555 /* Move the cursor to the character right of the block. */ | |
2556 curwin->w_set_curswant = TRUE; | |
2557 while (*ml_get_cursor() != NUL | |
2558 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
2559 ++curwin->w_cursor.col; | |
2560 if (bd.is_short && !bd.is_MAX) | |
2561 { | |
2562 /* First line was too short, make it longer and adjust the | |
2563 * values in "bd". */ | |
2564 if (u_save_cursor() == FAIL) | |
2565 return; | |
2566 for (i = 0; i < bd.endspaces; ++i) | |
2567 ins_char(' '); | |
2568 bd.textlen += bd.endspaces; | |
2569 } | |
2570 } | |
2571 else | |
2572 { | |
2573 curwin->w_cursor = oap->end; | |
893 | 2574 check_cursor_col(); |
7 | 2575 |
2576 /* 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
|
2577 if (!LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2578 && oap->start_vcol != oap->end_vcol) |
2579 inc_cursor(); | |
2580 } | |
2581 } | |
2582 | |
6579 | 2583 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
|
2584 (void)edit(NUL, FALSE, (linenr_T)count1); |
7 | 2585 |
6579 | 2586 /* When a tab was inserted, and the characters in front of the tab |
2587 * have been converted to a tab as well, the column of the cursor | |
2588 * might have actually been reduced, so need to adjust here. */ | |
2589 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
|
2590 && LT_POS(curbuf->b_op_start_orig, t1)) |
6579 | 2591 oap->start = curbuf->b_op_start_orig; |
2592 | |
1477 | 2593 /* If user has moved off this line, we don't know what to do, so do |
2594 * nothing. | |
2595 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
2596 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
7 | 2597 return; |
2598 | |
2599 if (oap->block_mode) | |
2600 { | |
2601 struct block_def bd2; | |
2602 | |
5471 | 2603 /* The user may have moved the cursor before inserting something, try |
2604 * to adjust the block for that. */ | |
5680 | 2605 if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX) |
5471 | 2606 { |
2607 if (oap->op_type == OP_INSERT | |
5730 | 2608 && oap->start.col |
2609 #ifdef FEAT_VIRTUALEDIT | |
2610 + oap->start.coladd | |
2611 #endif | |
2612 != curbuf->b_op_start_orig.col | |
2613 #ifdef FEAT_VIRTUALEDIT | |
2614 + curbuf->b_op_start_orig.coladd | |
2615 #endif | |
2616 ) | |
5471 | 2617 { |
6579 | 2618 int t = getviscol2(curbuf->b_op_start_orig.col, |
2619 curbuf->b_op_start_orig.coladd); | |
5680 | 2620 oap->start.col = curbuf->b_op_start_orig.col; |
6579 | 2621 pre_textlen -= t - oap->start_vcol; |
2622 oap->start_vcol = t; | |
5471 | 2623 } |
2624 else if (oap->op_type == OP_APPEND | |
5730 | 2625 && oap->end.col |
2626 #ifdef FEAT_VIRTUALEDIT | |
2627 + oap->end.coladd | |
2628 #endif | |
2629 >= curbuf->b_op_start_orig.col | |
2630 #ifdef FEAT_VIRTUALEDIT | |
2631 + curbuf->b_op_start_orig.coladd | |
2632 #endif | |
2633 ) | |
5471 | 2634 { |
6579 | 2635 int t = getviscol2(curbuf->b_op_start_orig.col, |
2636 curbuf->b_op_start_orig.coladd); | |
5680 | 2637 oap->start.col = curbuf->b_op_start_orig.col; |
5471 | 2638 /* reset pre_textlen to the value of OP_INSERT */ |
2639 pre_textlen += bd.textlen; | |
6579 | 2640 pre_textlen -= t - oap->start_vcol; |
2641 oap->start_vcol = t; | |
5471 | 2642 oap->op_type = OP_INSERT; |
2643 } | |
2644 } | |
2645 | |
7 | 2646 /* |
2647 * Spaces and tabs in the indent may have changed to other spaces and | |
1392 | 2648 * tabs. Get the starting column again and correct the length. |
7 | 2649 * Don't do this when "$" used, end-of-line will have changed. |
2650 */ | |
2651 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
2652 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
2653 { | |
2654 if (oap->op_type == OP_APPEND) | |
2655 { | |
2656 pre_textlen += bd2.textlen - bd.textlen; | |
2657 if (bd2.endspaces) | |
2658 --bd2.textlen; | |
2659 } | |
2660 bd.textcol = bd2.textcol; | |
2661 bd.textlen = bd2.textlen; | |
2662 } | |
2663 | |
2664 /* | |
2665 * Subsequent calls to ml_get() flush the firstline data - take a | |
2666 * copy of the required string. | |
2667 */ | |
2668 firstline = ml_get(oap->start.lnum) + bd.textcol; | |
2669 if (oap->op_type == OP_APPEND) | |
2670 firstline += bd.textlen; | |
3421 | 2671 if (pre_textlen >= 0 |
2672 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
7 | 2673 { |
2674 ins_text = vim_strnsave(firstline, (int)ins_len); | |
2675 if (ins_text != NULL) | |
2676 { | |
2677 /* block handled here */ | |
2678 if (u_save(oap->start.lnum, | |
2679 (linenr_T)(oap->end.lnum + 1)) == OK) | |
2680 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
2681 &bd); | |
2682 | |
2683 curwin->w_cursor.col = oap->start.col; | |
2684 check_cursor(); | |
2685 vim_free(ins_text); | |
2686 } | |
2687 } | |
2688 } | |
2689 } | |
2690 #endif | |
2691 | |
2692 /* | |
2693 * op_change - handle a change operation | |
2694 * | |
2695 * return TRUE if edit() returns because of a CTRL-O command | |
2696 */ | |
2697 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2698 op_change(oparg_T *oap) |
7 | 2699 { |
2700 colnr_T l; | |
2701 int retval; | |
2702 #ifdef FEAT_VISUALEXTRA | |
2703 long offset; | |
2704 linenr_T linenr; | |
1392 | 2705 long ins_len; |
2706 long pre_textlen = 0; | |
2707 long pre_indent = 0; | |
7 | 2708 char_u *firstline; |
2709 char_u *ins_text, *newp, *oldp; | |
2710 struct block_def bd; | |
2711 #endif | |
2712 | |
2713 l = oap->start.col; | |
2714 if (oap->motion_type == MLINE) | |
2715 { | |
2716 l = 0; | |
2717 #ifdef FEAT_SMARTINDENT | |
2718 if (!p_paste && curbuf->b_p_si | |
2719 # ifdef FEAT_CINDENT | |
2720 && !curbuf->b_p_cin | |
2721 # endif | |
2722 ) | |
2723 can_si = TRUE; /* It's like opening a new line, do si */ | |
2724 #endif | |
2725 } | |
2726 | |
2727 /* First delete the text in the region. In an empty buffer only need to | |
2728 * save for undo */ | |
2729 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
2730 { | |
2731 if (u_save_cursor() == FAIL) | |
2732 return FALSE; | |
2733 } | |
2734 else if (op_delete(oap) == FAIL) | |
2735 return FALSE; | |
2736 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2737 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2738 && !virtual_op) |
2739 inc_cursor(); | |
2740 | |
2741 #ifdef FEAT_VISUALEXTRA | |
2742 /* check for still on same line (<CR> in inserted text meaningless) */ | |
2743 /* skip blank lines too */ | |
2744 if (oap->block_mode) | |
2745 { | |
2746 # ifdef FEAT_VIRTUALEDIT | |
2747 /* Add spaces before getting the current line length. */ | |
2748 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
2749 || gchar_cursor() == NUL)) | |
2750 coladvance_force(getviscol()); | |
2751 # endif | |
1392 | 2752 firstline = ml_get(oap->start.lnum); |
2753 pre_textlen = (long)STRLEN(firstline); | |
2754 pre_indent = (long)(skipwhite(firstline) - firstline); | |
7 | 2755 bd.textcol = curwin->w_cursor.col; |
2756 } | |
2757 #endif | |
2758 | |
2759 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
2760 if (oap->motion_type == MLINE) | |
2761 fix_indent(); | |
2762 #endif | |
2763 | |
2764 retval = edit(NUL, FALSE, (linenr_T)1); | |
2765 | |
2766 #ifdef FEAT_VISUALEXTRA | |
2767 /* | |
39 | 2768 * In Visual block mode, handle copying the new text to all lines of the |
7 | 2769 * block. |
1477 | 2770 * Don't repeat the insert when Insert mode ended with CTRL-C. |
7 | 2771 */ |
1477 | 2772 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
7 | 2773 { |
1392 | 2774 /* Auto-indenting may have changed the indent. If the cursor was past |
2775 * the indent, exclude that indent change from the inserted text. */ | |
7 | 2776 firstline = ml_get(oap->start.lnum); |
1403 | 2777 if (bd.textcol > (colnr_T)pre_indent) |
7 | 2778 { |
1392 | 2779 long new_indent = (long)(skipwhite(firstline) - firstline); |
2780 | |
2781 pre_textlen += new_indent - pre_indent; | |
2782 bd.textcol += new_indent - pre_indent; | |
2783 } | |
2784 | |
2785 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
2786 if (ins_len > 0) | |
2787 { | |
2788 /* Subsequent calls to ml_get() flush the firstline data - take a | |
2789 * copy of the inserted text. */ | |
7 | 2790 if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL) |
2791 { | |
419 | 2792 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
7 | 2793 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
2794 linenr++) | |
2795 { | |
2796 block_prep(oap, &bd, linenr, TRUE); | |
2797 if (!bd.is_short || virtual_op) | |
2798 { | |
2799 # ifdef FEAT_VIRTUALEDIT | |
2800 pos_T vpos; | |
2801 | |
2802 /* If the block starts in virtual space, count the | |
2803 * initial coladd offset as part of "startspaces" */ | |
2804 if (bd.is_short) | |
2805 { | |
1982 | 2806 vpos.lnum = linenr; |
7 | 2807 (void)getvpos(&vpos, oap->start_vcol); |
2808 } | |
2809 else | |
2810 vpos.coladd = 0; | |
2811 # endif | |
2812 oldp = ml_get(linenr); | |
2813 newp = alloc_check((unsigned)(STRLEN(oldp) | |
2814 # ifdef FEAT_VIRTUALEDIT | |
2815 + vpos.coladd | |
2816 # endif | |
2817 + ins_len + 1)); | |
2818 if (newp == NULL) | |
2819 continue; | |
2820 /* copy up to block start */ | |
2821 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2822 offset = bd.textcol; | |
2823 # ifdef FEAT_VIRTUALEDIT | |
6929 | 2824 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
7 | 2825 offset += vpos.coladd; |
2826 # endif | |
2827 mch_memmove(newp + offset, ins_text, (size_t)ins_len); | |
2828 offset += ins_len; | |
2829 oldp += bd.textcol; | |
1622 | 2830 STRMOVE(newp + offset, oldp); |
7 | 2831 ml_replace(linenr, newp, FALSE); |
2832 } | |
2833 } | |
2834 check_cursor(); | |
2835 | |
2836 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
2837 } | |
2838 vim_free(ins_text); | |
2839 } | |
2840 } | |
2841 #endif | |
2842 | |
2843 return retval; | |
2844 } | |
2845 | |
2846 /* | |
2847 * set all the yank registers to empty (called from main()) | |
2848 */ | |
2849 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2850 init_yank(void) |
7 | 2851 { |
2852 int i; | |
2853 | |
2854 for (i = 0; i < NUM_REGISTERS; ++i) | |
2855 y_regs[i].y_array = NULL; | |
2856 } | |
2857 | |
356 | 2858 #if defined(EXITFREE) || defined(PROTO) |
2859 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2860 clear_registers(void) |
356 | 2861 { |
2862 int i; | |
2863 | |
2864 for (i = 0; i < NUM_REGISTERS; ++i) | |
2865 { | |
2866 y_current = &y_regs[i]; | |
2867 if (y_current->y_array != NULL) | |
2868 free_yank_all(); | |
2869 } | |
2870 } | |
2871 #endif | |
2872 | |
7 | 2873 /* |
2874 * Free "n" lines from the current yank register. | |
2875 * Called for normal freeing and in case of error. | |
2876 */ | |
2877 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2878 free_yank(long n) |
7 | 2879 { |
2880 if (y_current->y_array != NULL) | |
2881 { | |
2882 long i; | |
2883 | |
2884 for (i = n; --i >= 0; ) | |
2885 { | |
2886 #ifdef AMIGA /* only for very slow machines */ | |
2887 if ((i & 1023) == 1023) /* this may take a while */ | |
2888 { | |
2889 /* | |
2890 * This message should never cause a hit-return message. | |
2891 * Overwrite this message with any next message. | |
2892 */ | |
2893 ++no_wait_return; | |
2894 smsg((char_u *)_("freeing %ld lines"), i + 1); | |
2895 --no_wait_return; | |
2896 msg_didout = FALSE; | |
2897 msg_col = 0; | |
2898 } | |
2899 #endif | |
2900 vim_free(y_current->y_array[i]); | |
2901 } | |
2902 vim_free(y_current->y_array); | |
2903 y_current->y_array = NULL; | |
2904 #ifdef AMIGA | |
2905 if (n >= 1000) | |
2906 MSG(""); | |
2907 #endif | |
2908 } | |
2909 } | |
2910 | |
2911 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2912 free_yank_all(void) |
7 | 2913 { |
2914 free_yank(y_current->y_size); | |
2915 } | |
2916 | |
2917 /* | |
2918 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
2919 * If we are to append (uppercase register), we first yank into a new yank | |
2920 * register and then concatenate the old and the new one (so we keep the old | |
2921 * one in case of out-of-memory). | |
2922 * | |
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
2923 * Return FAIL for failure, OK otherwise. |
7 | 2924 */ |
2925 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2926 op_yank(oparg_T *oap, int deleting, int mess) |
7 | 2927 { |
2928 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
|
2929 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
|
2930 yankreg_T newreg; /* new yank register when appending */ |
7 | 2931 char_u **new_ptr; |
2932 linenr_T lnum; /* current line number */ | |
2933 long j; | |
2934 int yanktype = oap->motion_type; | |
2935 long yanklines = oap->line_count; | |
2936 linenr_T yankendlnum = oap->end.lnum; | |
2937 char_u *p; | |
2938 char_u *pnew; | |
2939 struct block_def bd; | |
2658 | 2940 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
2654 | 2941 int did_star = FALSE; |
2658 | 2942 #endif |
7 | 2943 |
2944 /* check for read-only register */ | |
2945 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
2946 { | |
2947 beep_flush(); | |
2948 return FAIL; | |
2949 } | |
2950 if (oap->regname == '_') /* black hole: nothing to do */ | |
2951 return OK; | |
2952 | |
2953 #ifdef FEAT_CLIPBOARD | |
2954 if (!clip_star.available && oap->regname == '*') | |
2955 oap->regname = 0; | |
2956 else if (!clip_plus.available && oap->regname == '+') | |
2957 oap->regname = 0; | |
2958 #endif | |
2959 | |
2960 if (!deleting) /* op_delete() already set y_current */ | |
2961 get_yank_register(oap->regname, TRUE); | |
2962 | |
2963 curr = y_current; | |
2964 /* append to existing contents */ | |
2965 if (y_append && y_current->y_array != NULL) | |
2966 y_current = &newreg; | |
2967 else | |
2968 free_yank_all(); /* free previously yanked lines */ | |
2969 | |
593 | 2970 /* |
2971 * If the cursor was in column 1 before and after the movement, and the | |
2972 * operator is not inclusive, the yank is always linewise. | |
2973 */ | |
7 | 2974 if ( oap->motion_type == MCHAR |
2975 && oap->start.col == 0 | |
2976 && !oap->inclusive | |
2977 && (!oap->is_VIsual || *p_sel == 'o') | |
50 | 2978 && !oap->block_mode |
7 | 2979 && oap->end.col == 0 |
2980 && yanklines > 1) | |
2981 { | |
2982 yanktype = MLINE; | |
2983 --yankendlnum; | |
2984 --yanklines; | |
2985 } | |
2986 | |
2987 y_current->y_size = yanklines; | |
2988 y_current->y_type = yanktype; /* set the yank register type */ | |
2989 y_current->y_width = 0; | |
2990 y_current->y_array = (char_u **)lalloc_clear((long_u)(sizeof(char_u *) * | |
2991 yanklines), TRUE); | |
2992 if (y_current->y_array == NULL) | |
2993 { | |
2994 y_current = curr; | |
2995 return FAIL; | |
2996 } | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
2997 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
2998 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
|
2999 #endif |
7 | 3000 |
3001 y_idx = 0; | |
3002 lnum = oap->start.lnum; | |
3003 | |
3004 if (oap->block_mode) | |
3005 { | |
3006 /* Visual block mode */ | |
3007 y_current->y_type = MBLOCK; /* set the yank register type */ | |
3008 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
3009 | |
3010 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
3011 y_current->y_width--; | |
3012 } | |
3013 | |
3014 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
3015 { | |
3016 switch (y_current->y_type) | |
3017 { | |
3018 case MBLOCK: | |
3019 block_prep(oap, &bd, lnum, FALSE); | |
3020 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3021 goto fail; | |
3022 break; | |
3023 | |
3024 case MLINE: | |
3025 if ((y_current->y_array[y_idx] = | |
3026 vim_strsave(ml_get(lnum))) == NULL) | |
3027 goto fail; | |
3028 break; | |
3029 | |
3030 case MCHAR: | |
3031 { | |
3032 colnr_T startcol = 0, endcol = MAXCOL; | |
3033 #ifdef FEAT_VIRTUALEDIT | |
3034 int is_oneChar = FALSE; | |
3035 colnr_T cs, ce; | |
3036 #endif | |
3037 p = ml_get(lnum); | |
3038 bd.startspaces = 0; | |
3039 bd.endspaces = 0; | |
3040 | |
3041 if (lnum == oap->start.lnum) | |
3042 { | |
3043 startcol = oap->start.col; | |
3044 #ifdef FEAT_VIRTUALEDIT | |
3045 if (virtual_op) | |
3046 { | |
3047 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
3048 if (ce != cs && oap->start.coladd > 0) | |
3049 { | |
3050 /* Part of a tab selected -- but don't | |
3051 * double-count it. */ | |
3052 bd.startspaces = (ce - cs + 1) | |
3053 - oap->start.coladd; | |
3054 startcol++; | |
3055 } | |
3056 } | |
3057 #endif | |
3058 } | |
3059 | |
3060 if (lnum == oap->end.lnum) | |
3061 { | |
3062 endcol = oap->end.col; | |
3063 #ifdef FEAT_VIRTUALEDIT | |
3064 if (virtual_op) | |
3065 { | |
3066 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
3067 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
3068 # ifdef FEAT_MBYTE | |
3069 /* Don't add space for double-wide | |
3070 * char; endcol will be on last byte | |
3071 * of multi-byte char. */ | |
3072 && (*mb_head_off)(p, p + endcol) == 0 | |
3073 # endif | |
3074 )) | |
3075 { | |
3076 if (oap->start.lnum == oap->end.lnum | |
3077 && oap->start.col == oap->end.col) | |
3078 { | |
3079 /* Special case: inside a single char */ | |
3080 is_oneChar = TRUE; | |
3081 bd.startspaces = oap->end.coladd | |
3082 - oap->start.coladd + oap->inclusive; | |
3083 endcol = startcol; | |
3084 } | |
3085 else | |
3086 { | |
3087 bd.endspaces = oap->end.coladd | |
3088 + oap->inclusive; | |
3089 endcol -= oap->inclusive; | |
3090 } | |
3091 } | |
3092 } | |
3093 #endif | |
3094 } | |
3510 | 3095 if (endcol == MAXCOL) |
3096 endcol = (colnr_T)STRLEN(p); | |
7 | 3097 if (startcol > endcol |
3098 #ifdef FEAT_VIRTUALEDIT | |
3099 || is_oneChar | |
3100 #endif | |
3101 ) | |
3102 bd.textlen = 0; | |
3103 else | |
3104 { | |
3105 bd.textlen = endcol - startcol + oap->inclusive; | |
3106 } | |
3107 bd.textstart = p + startcol; | |
3108 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3109 goto fail; | |
3110 break; | |
3111 } | |
3112 /* NOTREACHED */ | |
3113 } | |
3114 } | |
3115 | |
3116 if (curr != y_current) /* append the new block to the old block */ | |
3117 { | |
3118 new_ptr = (char_u **)lalloc((long_u)(sizeof(char_u *) * | |
3119 (curr->y_size + y_current->y_size)), TRUE); | |
3120 if (new_ptr == NULL) | |
3121 goto fail; | |
3122 for (j = 0; j < curr->y_size; ++j) | |
3123 new_ptr[j] = curr->y_array[j]; | |
3124 vim_free(curr->y_array); | |
3125 curr->y_array = new_ptr; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3126 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3127 curr->y_time_set = vim_time(); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3128 #endif |
7 | 3129 |
3130 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
3131 curr->y_type = MLINE; | |
3132 | |
164 | 3133 /* Concatenate the last line of the old block with the first line of |
3134 * the new block, unless being Vi compatible. */ | |
3135 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
7 | 3136 { |
3137 pnew = lalloc((long_u)(STRLEN(curr->y_array[curr->y_size - 1]) | |
3138 + STRLEN(y_current->y_array[0]) + 1), TRUE); | |
3139 if (pnew == NULL) | |
3140 { | |
3141 y_idx = y_current->y_size - 1; | |
3142 goto fail; | |
3143 } | |
3144 STRCPY(pnew, curr->y_array[--j]); | |
3145 STRCAT(pnew, y_current->y_array[0]); | |
3146 vim_free(curr->y_array[j]); | |
3147 vim_free(y_current->y_array[0]); | |
3148 curr->y_array[j++] = pnew; | |
3149 y_idx = 1; | |
3150 } | |
3151 else | |
3152 y_idx = 0; | |
3153 while (y_idx < y_current->y_size) | |
3154 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
3155 curr->y_size = j; | |
3156 vim_free(y_current->y_array); | |
3157 y_current = curr; | |
3158 } | |
5981 | 3159 if (curwin->w_p_rnu) |
3160 redraw_later(SOME_VALID); /* cursor moved to start */ | |
7 | 3161 if (mess) /* Display message about yank? */ |
3162 { | |
3163 if (yanktype == MCHAR | |
3164 && !oap->block_mode | |
3165 && yanklines == 1) | |
3166 yanklines = 0; | |
3167 /* Some versions of Vi use ">=" here, some don't... */ | |
3168 if (yanklines > p_report) | |
3169 { | |
3170 /* redisplay now, so message is not deleted */ | |
3171 update_topline_redraw(); | |
3172 if (yanklines == 1) | |
205 | 3173 { |
3174 if (oap->block_mode) | |
3175 MSG(_("block of 1 line yanked")); | |
3176 else | |
3177 MSG(_("1 line yanked")); | |
3178 } | |
3179 else if (oap->block_mode) | |
3180 smsg((char_u *)_("block of %ld lines yanked"), yanklines); | |
7 | 3181 else |
3182 smsg((char_u *)_("%ld lines yanked"), yanklines); | |
3183 } | |
3184 } | |
3185 | |
3186 /* | |
3187 * Set "'[" and "']" marks. | |
3188 */ | |
3189 curbuf->b_op_start = oap->start; | |
3190 curbuf->b_op_end = oap->end; | |
5735 | 3191 if (yanktype == MLINE && !oap->block_mode) |
36 | 3192 { |
3193 curbuf->b_op_start.col = 0; | |
3194 curbuf->b_op_end.col = MAXCOL; | |
3195 } | |
7 | 3196 |
3197 #ifdef FEAT_CLIPBOARD | |
3198 /* | |
3199 * If we were yanking to the '*' register, send result to clipboard. | |
3200 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
3201 * to the '*' register. | |
3202 */ | |
3203 if (clip_star.available | |
3204 && (curr == &(y_regs[STAR_REGISTER]) | |
2654 | 3205 || (!deleting && oap->regname == 0 |
6116 | 3206 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
7 | 3207 { |
3208 if (curr != &(y_regs[STAR_REGISTER])) | |
3209 /* Copy the text from register 0 to the clipboard register. */ | |
3210 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3211 | |
3212 clip_own_selection(&clip_star); | |
3213 clip_gen_set_selection(&clip_star); | |
2658 | 3214 # ifdef FEAT_X11 |
2654 | 3215 did_star = TRUE; |
2658 | 3216 # endif |
7 | 3217 } |
3218 | |
3219 # ifdef FEAT_X11 | |
3220 /* | |
3221 * If we were yanking to the '+' register, send result to selection. | |
3222 * Also copy to the '*' register, in case auto-select is off. | |
3223 */ | |
2654 | 3224 if (clip_plus.available |
3225 && (curr == &(y_regs[PLUS_REGISTER]) | |
3226 || (!deleting && oap->regname == 0 | |
6116 | 3227 && ((clip_unnamed | clip_unnamed_saved) & |
3228 CLIP_UNNAMED_PLUS)))) | |
7 | 3229 { |
2654 | 3230 if (curr != &(y_regs[PLUS_REGISTER])) |
3231 /* Copy the text from register 0 to the clipboard register. */ | |
3232 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
3233 | |
7 | 3234 clip_own_selection(&clip_plus); |
3235 clip_gen_set_selection(&clip_plus); | |
3674 | 3236 if (!clip_isautosel_star() && !did_star |
3237 && curr == &(y_regs[PLUS_REGISTER])) | |
7 | 3238 { |
3239 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3240 clip_own_selection(&clip_star); | |
3241 clip_gen_set_selection(&clip_star); | |
3242 } | |
3243 } | |
3244 # endif | |
3245 #endif | |
3246 | |
3247 return OK; | |
3248 | |
3249 fail: /* free the allocated lines */ | |
3250 free_yank(y_idx + 1); | |
3251 y_current = curr; | |
3252 return FAIL; | |
3253 } | |
3254 | |
3255 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3256 yank_copy_line(struct block_def *bd, long y_idx) |
7 | 3257 { |
3258 char_u *pnew; | |
3259 | |
3260 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
3261 == NULL) | |
3262 return FAIL; | |
3263 y_current->y_array[y_idx] = pnew; | |
6929 | 3264 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
7 | 3265 pnew += bd->startspaces; |
3266 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
3267 pnew += bd->textlen; | |
6929 | 3268 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
7 | 3269 pnew += bd->endspaces; |
3270 *pnew = NUL; | |
3271 return OK; | |
3272 } | |
3273 | |
3274 #ifdef FEAT_CLIPBOARD | |
3275 /* | |
3276 * Make a copy of the y_current register to register "reg". | |
3277 */ | |
3278 static void | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3279 copy_yank_reg(yankreg_T *reg) |
7 | 3280 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3281 yankreg_T *curr = y_current; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3282 long j; |
7 | 3283 |
3284 y_current = reg; | |
3285 free_yank_all(); | |
3286 *y_current = *curr; | |
3287 y_current->y_array = (char_u **)lalloc_clear( | |
3288 (long_u)(sizeof(char_u *) * y_current->y_size), TRUE); | |
3289 if (y_current->y_array == NULL) | |
3290 y_current->y_size = 0; | |
3291 else | |
3292 for (j = 0; j < y_current->y_size; ++j) | |
3293 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
3294 { | |
3295 free_yank(j); | |
3296 y_current->y_size = 0; | |
3297 break; | |
3298 } | |
3299 y_current = curr; | |
3300 } | |
3301 #endif | |
3302 | |
3303 /* | |
140 | 3304 * Put contents of register "regname" into the text. |
3305 * Caller must check "regname" to be valid! | |
3306 * "flags": PUT_FIXINDENT make indent look nice | |
3307 * PUT_CURSEND leave cursor after end of new text | |
3308 * PUT_LINE force linewise put (":put") | |
7 | 3309 */ |
3310 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3311 do_put( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3312 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3313 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
|
3314 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3315 int flags) |
7 | 3316 { |
3317 char_u *ptr; | |
3318 char_u *newp, *oldp; | |
3319 int yanklen; | |
3320 int totlen = 0; /* init for gcc */ | |
3321 linenr_T lnum; | |
3322 colnr_T col; | |
3323 long i; /* index in y_array[] */ | |
3324 int y_type; | |
3325 long y_size; | |
3326 int oldlen; | |
3327 long y_width = 0; | |
3328 colnr_T vcol; | |
3329 int delcount; | |
3330 int incr = 0; | |
3331 long j; | |
3332 struct block_def bd; | |
3333 char_u **y_array = NULL; | |
3334 long nr_lines = 0; | |
3335 pos_T new_cursor; | |
3336 int indent; | |
3337 int orig_indent = 0; /* init for gcc */ | |
3338 int indent_diff = 0; /* init for gcc */ | |
3339 int first_indent = TRUE; | |
3340 int lendiff = 0; | |
3341 pos_T old_pos; | |
3342 char_u *insert_string = NULL; | |
3343 int allocated = FALSE; | |
3344 long cnt; | |
3345 | |
3346 #ifdef FEAT_CLIPBOARD | |
3347 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
3348 adjust_clip_reg(®name); | |
3349 (void)may_get_selection(regname); | |
3350 #endif | |
3351 | |
3352 if (flags & PUT_FIXINDENT) | |
3353 orig_indent = get_indent(); | |
3354 | |
3355 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3356 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3357 | |
3358 /* | |
3359 * Using inserted text works differently, because the register includes | |
3360 * special characters (newlines, etc.). | |
3361 */ | |
3362 if (regname == '.') | |
3363 { | |
10494
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3364 if (VIsual_active) |
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3365 stuffcharReadbuff(VIsual_mode); |
7 | 3366 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : |
3367 (count == -1 ? 'O' : 'i')), count, FALSE); | |
3368 /* Putting the text is done later, so can't really move the cursor to | |
3369 * the next character. Use "l" to simulate it. */ | |
3370 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
3371 stuffcharReadbuff('l'); | |
3372 return; | |
3373 } | |
3374 | |
3375 /* | |
3376 * For special registers '%' (file name), '#' (alternate file name) and | |
3377 * ':' (last command line), etc. we have to create a fake yank register. | |
3378 */ | |
3379 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
3380 { | |
3381 if (insert_string == NULL) | |
3382 return; | |
3383 } | |
3384 | |
4005 | 3385 #ifdef FEAT_AUTOCMD |
3386 /* Autocommands may be executed when saving lines for undo, which may make | |
3387 * y_array invalid. Start undo now to avoid that. */ | |
3388 u_save(curwin->w_cursor.lnum, curwin->w_cursor.lnum + 1); | |
3389 #endif | |
3390 | |
7 | 3391 if (insert_string != NULL) |
3392 { | |
3393 y_type = MCHAR; | |
3394 #ifdef FEAT_EVAL | |
3395 if (regname == '=') | |
3396 { | |
3397 /* For the = register we need to split the string at NL | |
3093 | 3398 * characters. |
3399 * Loop twice: count the number of lines and save them. */ | |
7 | 3400 for (;;) |
3401 { | |
3402 y_size = 0; | |
3403 ptr = insert_string; | |
3404 while (ptr != NULL) | |
3405 { | |
3406 if (y_array != NULL) | |
3407 y_array[y_size] = ptr; | |
3408 ++y_size; | |
3409 ptr = vim_strchr(ptr, '\n'); | |
3410 if (ptr != NULL) | |
3411 { | |
3412 if (y_array != NULL) | |
3413 *ptr = NUL; | |
3414 ++ptr; | |
3093 | 3415 /* A trailing '\n' makes the register linewise. */ |
7 | 3416 if (*ptr == NUL) |
3417 { | |
3418 y_type = MLINE; | |
3419 break; | |
3420 } | |
3421 } | |
3422 } | |
3423 if (y_array != NULL) | |
3424 break; | |
3425 y_array = (char_u **)alloc((unsigned) | |
3426 (y_size * sizeof(char_u *))); | |
3427 if (y_array == NULL) | |
3428 goto end; | |
3429 } | |
3430 } | |
3431 else | |
3432 #endif | |
3433 { | |
3434 y_size = 1; /* use fake one-line yank register */ | |
3435 y_array = &insert_string; | |
3436 } | |
3437 } | |
3438 else | |
3439 { | |
3440 get_yank_register(regname, FALSE); | |
3441 | |
3442 y_type = y_current->y_type; | |
3443 y_width = y_current->y_width; | |
3444 y_size = y_current->y_size; | |
3445 y_array = y_current->y_array; | |
3446 } | |
3447 | |
3448 if (y_type == MLINE) | |
3449 { | |
3450 if (flags & PUT_LINE_SPLIT) | |
3451 { | |
6845 | 3452 char_u *p; |
3453 | |
7 | 3454 /* "p" or "P" in Visual mode: split the lines to put the text in |
3455 * between. */ | |
3456 if (u_save_cursor() == FAIL) | |
3457 goto end; | |
6845 | 3458 p = ml_get_cursor(); |
3459 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
|
3460 MB_PTR_ADV(p); |
6845 | 3461 ptr = vim_strsave(p); |
7 | 3462 if (ptr == NULL) |
3463 goto end; | |
3464 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
3465 vim_free(ptr); | |
3466 | |
6845 | 3467 oldp = ml_get_curline(); |
3468 p = oldp + curwin->w_cursor.col; | |
3469 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
|
3470 MB_PTR_ADV(p); |
6845 | 3471 ptr = vim_strnsave(oldp, p - oldp); |
7 | 3472 if (ptr == NULL) |
3473 goto end; | |
3474 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
3475 ++nr_lines; | |
3476 dir = FORWARD; | |
3477 } | |
3478 if (flags & PUT_LINE_FORWARD) | |
3479 { | |
3480 /* Must be "p" for a Visual block, put lines below the block. */ | |
692 | 3481 curwin->w_cursor = curbuf->b_visual.vi_end; |
7 | 3482 dir = FORWARD; |
3483 } | |
3484 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3485 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3486 } | |
3487 | |
3488 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
3489 y_type = MLINE; | |
3490 | |
3491 if (y_size == 0 || y_array == NULL) | |
3492 { | |
3493 EMSG2(_("E353: Nothing in register %s"), | |
3494 regname == 0 ? (char_u *)"\"" : transchar(regname)); | |
3495 goto end; | |
3496 } | |
3497 | |
3498 if (y_type == MBLOCK) | |
3499 { | |
3500 lnum = curwin->w_cursor.lnum + y_size + 1; | |
3501 if (lnum > curbuf->b_ml.ml_line_count) | |
3502 lnum = curbuf->b_ml.ml_line_count + 1; | |
3503 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
3504 goto end; | |
3505 } | |
5735 | 3506 else if (y_type == MLINE) |
7 | 3507 { |
3508 lnum = curwin->w_cursor.lnum; | |
3509 #ifdef FEAT_FOLDING | |
3510 /* Correct line number for closed fold. Don't move the cursor yet, | |
3511 * u_save() uses it. */ | |
3512 if (dir == BACKWARD) | |
3513 (void)hasFolding(lnum, &lnum, NULL); | |
3514 else | |
3515 (void)hasFolding(lnum, NULL, &lnum); | |
3516 #endif | |
3517 if (dir == FORWARD) | |
3518 ++lnum; | |
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3519 /* 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
|
3520 * 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
|
3521 if ((BUFEMPTY() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
7 | 3522 goto end; |
3523 #ifdef FEAT_FOLDING | |
3524 if (dir == FORWARD) | |
3525 curwin->w_cursor.lnum = lnum - 1; | |
3526 else | |
3527 curwin->w_cursor.lnum = lnum; | |
3528 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
3529 #endif | |
3530 } | |
3531 else if (u_save_cursor() == FAIL) | |
3532 goto end; | |
3533 | |
3534 yanklen = (int)STRLEN(y_array[0]); | |
3535 | |
3536 #ifdef FEAT_VIRTUALEDIT | |
3537 if (ve_flags == VE_ALL && y_type == MCHAR) | |
3538 { | |
3539 if (gchar_cursor() == TAB) | |
3540 { | |
3541 /* Don't need to insert spaces when "p" on the last position of a | |
3542 * tab or "P" on the first position. */ | |
3543 if (dir == FORWARD | |
3544 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
3545 : curwin->w_cursor.coladd > 0) | |
3546 coladvance_force(getviscol()); | |
3547 else | |
3548 curwin->w_cursor.coladd = 0; | |
3549 } | |
3550 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
3551 coladvance_force(getviscol() + (dir == FORWARD)); | |
3552 } | |
3553 #endif | |
3554 | |
3555 lnum = curwin->w_cursor.lnum; | |
3556 col = curwin->w_cursor.col; | |
3557 | |
3558 /* | |
3559 * Block mode | |
3560 */ | |
3561 if (y_type == MBLOCK) | |
3562 { | |
10664
94db9c08e206
patch 8.0.0222: blockwise put on multi-byte character misplaced
Christian Brabandt <cb@256bit.org>
parents:
10494
diff
changeset
|
3563 int c = gchar_cursor(); |
7 | 3564 colnr_T endcol2 = 0; |
3565 | |
3566 if (dir == FORWARD && c != NUL) | |
3567 { | |
3568 #ifdef FEAT_VIRTUALEDIT | |
3569 if (ve_flags == VE_ALL) | |
3570 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3571 else | |
3572 #endif | |
3573 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
3574 | |
3575 #ifdef FEAT_MBYTE | |
3576 if (has_mbyte) | |
3577 /* move to start of next multi-byte character */ | |
474 | 3578 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
7 | 3579 else |
3580 #endif | |
3581 #ifdef FEAT_VIRTUALEDIT | |
3582 if (c != TAB || ve_flags != VE_ALL) | |
3583 #endif | |
3584 ++curwin->w_cursor.col; | |
3585 ++col; | |
3586 } | |
3587 else | |
3588 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3589 | |
3590 #ifdef FEAT_VIRTUALEDIT | |
3591 col += curwin->w_cursor.coladd; | |
1304 | 3592 if (ve_flags == VE_ALL |
3593 && (curwin->w_cursor.coladd > 0 | |
3594 || endcol2 == curwin->w_cursor.col)) | |
7 | 3595 { |
3596 if (dir == FORWARD && c == NUL) | |
3597 ++col; | |
3598 if (dir != FORWARD && c != NUL) | |
3599 ++curwin->w_cursor.col; | |
3600 if (c == TAB) | |
3601 { | |
3602 if (dir == BACKWARD && curwin->w_cursor.col) | |
3603 curwin->w_cursor.col--; | |
3604 if (dir == FORWARD && col - 1 == endcol2) | |
3605 curwin->w_cursor.col++; | |
3606 } | |
3607 } | |
3608 curwin->w_cursor.coladd = 0; | |
3609 #endif | |
699 | 3610 bd.textcol = 0; |
7 | 3611 for (i = 0; i < y_size; ++i) |
3612 { | |
3613 int spaces; | |
3614 char shortline; | |
3615 | |
3616 bd.startspaces = 0; | |
3617 bd.endspaces = 0; | |
3618 vcol = 0; | |
3619 delcount = 0; | |
3620 | |
3621 /* add a new line */ | |
3622 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
3623 { | |
3624 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
3625 (colnr_T)1, FALSE) == FAIL) | |
3626 break; | |
3627 ++nr_lines; | |
3628 } | |
3629 /* get the old line and advance to the position to insert at */ | |
3630 oldp = ml_get_curline(); | |
3631 oldlen = (int)STRLEN(oldp); | |
3632 for (ptr = oldp; vcol < col && *ptr; ) | |
3633 { | |
3634 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 3635 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
7 | 3636 vcol += incr; |
3637 } | |
3638 bd.textcol = (colnr_T)(ptr - oldp); | |
3639 | |
3640 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
3641 | |
3642 if (vcol < col) /* line too short, padd with spaces */ | |
3643 bd.startspaces = col - vcol; | |
3644 else if (vcol > col) | |
3645 { | |
3646 bd.endspaces = vcol - col; | |
3647 bd.startspaces = incr - bd.endspaces; | |
3648 --bd.textcol; | |
3649 delcount = 1; | |
3650 #ifdef FEAT_MBYTE | |
3651 if (has_mbyte) | |
3652 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
3653 #endif | |
3654 if (oldp[bd.textcol] != TAB) | |
3655 { | |
3656 /* Only a Tab can be split into spaces. Other | |
3657 * characters will have to be moved to after the | |
3658 * block, causing misalignment. */ | |
3659 delcount = 0; | |
3660 bd.endspaces = 0; | |
3661 } | |
3662 } | |
3663 | |
3664 yanklen = (int)STRLEN(y_array[i]); | |
3665 | |
3666 /* calculate number of spaces required to fill right side of block*/ | |
3667 spaces = y_width + 1; | |
3668 for (j = 0; j < yanklen; j++) | |
5995 | 3669 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
7 | 3670 if (spaces < 0) |
3671 spaces = 0; | |
3672 | |
3673 /* insert the new text */ | |
3674 totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces; | |
3675 newp = alloc_check((unsigned)totlen + oldlen + 1); | |
3676 if (newp == NULL) | |
3677 break; | |
3678 /* copy part up to cursor to new line */ | |
3679 ptr = newp; | |
3680 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
3681 ptr += bd.textcol; | |
3682 /* may insert some spaces before the new text */ | |
6929 | 3683 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
7 | 3684 ptr += bd.startspaces; |
3685 /* insert the new text */ | |
3686 for (j = 0; j < count; ++j) | |
3687 { | |
3688 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
3689 ptr += yanklen; | |
3690 | |
3691 /* insert block's trailing spaces only if there's text behind */ | |
3692 if ((j < count - 1 || !shortline) && spaces) | |
3693 { | |
6929 | 3694 vim_memset(ptr, ' ', (size_t)spaces); |
7 | 3695 ptr += spaces; |
3696 } | |
3697 } | |
3698 /* may insert some spaces after the new text */ | |
6929 | 3699 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
7 | 3700 ptr += bd.endspaces; |
3701 /* move the text after the cursor to the end of the line. */ | |
3702 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
3703 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
3704 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
3705 | |
3706 ++curwin->w_cursor.lnum; | |
3707 if (i == 0) | |
3708 curwin->w_cursor.col += bd.startspaces; | |
3709 } | |
3710 | |
3711 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
3712 | |
3713 /* Set '[ mark. */ | |
3714 curbuf->b_op_start = curwin->w_cursor; | |
3715 curbuf->b_op_start.lnum = lnum; | |
3716 | |
3717 /* adjust '] mark */ | |
3718 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
3719 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
237 | 3720 # ifdef FEAT_VIRTUALEDIT |
7 | 3721 curbuf->b_op_end.coladd = 0; |
237 | 3722 # endif |
7 | 3723 if (flags & PUT_CURSEND) |
3724 { | |
916 | 3725 colnr_T len; |
3726 | |
7 | 3727 curwin->w_cursor = curbuf->b_op_end; |
3728 curwin->w_cursor.col++; | |
916 | 3729 |
3730 /* in Insert mode we might be after the NUL, correct for that */ | |
3731 len = (colnr_T)STRLEN(ml_get_curline()); | |
3732 if (curwin->w_cursor.col > len) | |
3733 curwin->w_cursor.col = len; | |
7 | 3734 } |
3735 else | |
3736 curwin->w_cursor.lnum = lnum; | |
3737 } | |
3738 else | |
3739 { | |
3740 /* | |
3741 * Character or Line mode | |
3742 */ | |
3743 if (y_type == MCHAR) | |
3744 { | |
3745 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
3746 * char */ | |
3747 if (dir == FORWARD && gchar_cursor() != NUL) | |
3748 { | |
3749 #ifdef FEAT_MBYTE | |
3750 if (has_mbyte) | |
3751 { | |
474 | 3752 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
7 | 3753 |
3754 /* put it on the next of the multi-byte character. */ | |
3755 col += bytelen; | |
3756 if (yanklen) | |
3757 { | |
3758 curwin->w_cursor.col += bytelen; | |
3759 curbuf->b_op_end.col += bytelen; | |
3760 } | |
3761 } | |
3762 else | |
3763 #endif | |
3764 { | |
3765 ++col; | |
3766 if (yanklen) | |
3767 { | |
3768 ++curwin->w_cursor.col; | |
3769 ++curbuf->b_op_end.col; | |
3770 } | |
3771 } | |
3772 } | |
3773 curbuf->b_op_start = curwin->w_cursor; | |
3774 } | |
3775 /* | |
3776 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
3777 */ | |
3778 else if (dir == BACKWARD) | |
3779 --lnum; | |
699 | 3780 new_cursor = curwin->w_cursor; |
7 | 3781 |
3782 /* | |
3783 * simple case: insert into current line | |
3784 */ | |
3785 if (y_type == MCHAR && y_size == 1) | |
3786 { | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3787 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
|
3788 |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3789 if (VIsual_active) |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3790 { |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3791 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
|
3792 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
|
3793 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
|
3794 } |
10670
bce3eccea39a
patch 8.0.0225: put in Visual block mode terminates early
Christian Brabandt <cb@256bit.org>
parents:
10664
diff
changeset
|
3795 |
5365 | 3796 do { |
3797 totlen = count * yanklen; | |
3798 if (totlen > 0) | |
7 | 3799 { |
5365 | 3800 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
|
3801 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
|
3802 { |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3803 lnum++; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3804 continue; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3805 } |
5365 | 3806 newp = alloc_check((unsigned)(STRLEN(oldp) + totlen + 1)); |
3807 if (newp == NULL) | |
3808 goto end; /* alloc() gave an error message */ | |
3809 mch_memmove(newp, oldp, (size_t)col); | |
3810 ptr = newp + col; | |
3811 for (i = 0; i < count; ++i) | |
3812 { | |
3813 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
3814 ptr += yanklen; | |
3815 } | |
3816 STRMOVE(ptr, oldp + col); | |
3817 ml_replace(lnum, newp, FALSE); | |
3818 /* Place cursor on last putted char. */ | |
3819 if (lnum == curwin->w_cursor.lnum) | |
5496 | 3820 { |
3821 /* make sure curwin->w_virtcol is updated */ | |
3822 changed_cline_bef_curs(); | |
5365 | 3823 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
5496 | 3824 } |
7 | 3825 } |
5365 | 3826 if (VIsual_active) |
3827 lnum++; | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3828 } while (VIsual_active && lnum <= end_lnum); |
5365 | 3829 |
6379 | 3830 if (VIsual_active) /* reset lnum to the last visual line */ |
3831 lnum--; | |
3832 | |
7 | 3833 curbuf->b_op_end = curwin->w_cursor; |
3834 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
3835 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
3836 ++curwin->w_cursor.col; | |
3837 changed_bytes(lnum, col); | |
3838 } | |
3839 else | |
3840 { | |
3841 /* | |
3842 * Insert at least one line. When y_type is MCHAR, break the first | |
3843 * line in two. | |
3844 */ | |
3845 for (cnt = 1; cnt <= count; ++cnt) | |
3846 { | |
3847 i = 0; | |
3848 if (y_type == MCHAR) | |
3849 { | |
3850 /* | |
3851 * Split the current line in two at the insert position. | |
3852 * First insert y_array[size - 1] in front of second line. | |
3853 * Then append y_array[0] to first line. | |
3854 */ | |
3855 lnum = new_cursor.lnum; | |
3856 ptr = ml_get(lnum) + col; | |
3857 totlen = (int)STRLEN(y_array[y_size - 1]); | |
3858 newp = alloc_check((unsigned)(STRLEN(ptr) + totlen + 1)); | |
3859 if (newp == NULL) | |
3860 goto error; | |
3861 STRCPY(newp, y_array[y_size - 1]); | |
3862 STRCAT(newp, ptr); | |
3863 /* insert second line */ | |
3864 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
3865 vim_free(newp); | |
3866 | |
3867 oldp = ml_get(lnum); | |
3868 newp = alloc_check((unsigned)(col + yanklen + 1)); | |
3869 if (newp == NULL) | |
3870 goto error; | |
3871 /* copy first part of line */ | |
3872 mch_memmove(newp, oldp, (size_t)col); | |
3873 /* append to first line */ | |
3874 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
3875 ml_replace(lnum, newp, FALSE); | |
3876 | |
3877 curwin->w_cursor.lnum = lnum; | |
3878 i = 1; | |
3879 } | |
3880 | |
3881 for (; i < y_size; ++i) | |
3882 { | |
3883 if ((y_type != MCHAR || i < y_size - 1) | |
3884 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
3885 == FAIL) | |
3886 goto error; | |
3887 lnum++; | |
3888 ++nr_lines; | |
3889 if (flags & PUT_FIXINDENT) | |
3890 { | |
3891 old_pos = curwin->w_cursor; | |
3892 curwin->w_cursor.lnum = lnum; | |
3893 ptr = ml_get(lnum); | |
3894 if (cnt == count && i == y_size - 1) | |
3895 lendiff = (int)STRLEN(ptr); | |
3896 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
3897 if (*ptr == '#' && preprocs_left()) | |
3898 indent = 0; /* Leave # lines at start */ | |
3899 else | |
3900 #endif | |
3901 if (*ptr == NUL) | |
3902 indent = 0; /* Ignore empty lines */ | |
3903 else if (first_indent) | |
3904 { | |
3905 indent_diff = orig_indent - get_indent(); | |
3906 indent = orig_indent; | |
3907 first_indent = FALSE; | |
3908 } | |
3909 else if ((indent = get_indent() + indent_diff) < 0) | |
3910 indent = 0; | |
3911 (void)set_indent(indent, 0); | |
3912 curwin->w_cursor = old_pos; | |
3913 /* remember how many chars were removed */ | |
3914 if (cnt == count && i == y_size - 1) | |
3915 lendiff -= (int)STRLEN(ml_get(lnum)); | |
3916 } | |
3917 } | |
3918 } | |
3919 | |
3920 error: | |
3921 /* Adjust marks. */ | |
3922 if (y_type == MLINE) | |
3923 { | |
3924 curbuf->b_op_start.col = 0; | |
3925 if (dir == FORWARD) | |
3926 curbuf->b_op_start.lnum++; | |
3927 } | |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3928 /* 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
|
3929 * 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
|
3930 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
|
3931 < 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
|
3932 #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
|
3933 || 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
|
3934 #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
|
3935 ) |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3936 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
7 | 3937 (linenr_T)MAXLNUM, nr_lines, 0L); |
3938 | |
3939 /* note changed text for displaying and folding */ | |
3940 if (y_type == MCHAR) | |
3941 changed_lines(curwin->w_cursor.lnum, col, | |
3942 curwin->w_cursor.lnum + 1, nr_lines); | |
3943 else | |
3944 changed_lines(curbuf->b_op_start.lnum, 0, | |
3945 curbuf->b_op_start.lnum, nr_lines); | |
3946 | |
3947 /* put '] mark at last inserted character */ | |
3948 curbuf->b_op_end.lnum = lnum; | |
3949 /* correct length for change in indent */ | |
3950 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
3951 if (col > 1) | |
3952 curbuf->b_op_end.col = col - 1; | |
3953 else | |
3954 curbuf->b_op_end.col = 0; | |
3955 | |
168 | 3956 if (flags & PUT_CURSLINE) |
3957 { | |
237 | 3958 /* ":put": put cursor on last inserted line */ |
168 | 3959 curwin->w_cursor.lnum = lnum; |
3960 beginline(BL_WHITE | BL_FIX); | |
3961 } | |
3962 else if (flags & PUT_CURSEND) | |
7 | 3963 { |
3964 /* put cursor after inserted text */ | |
3965 if (y_type == MLINE) | |
3966 { | |
3967 if (lnum >= curbuf->b_ml.ml_line_count) | |
3968 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
3969 else | |
3970 curwin->w_cursor.lnum = lnum + 1; | |
3971 curwin->w_cursor.col = 0; | |
3972 } | |
3973 else | |
3974 { | |
3975 curwin->w_cursor.lnum = lnum; | |
3976 curwin->w_cursor.col = col; | |
3977 } | |
3978 } | |
3979 else if (y_type == MLINE) | |
3980 { | |
168 | 3981 /* put cursor on first non-blank in first inserted line */ |
7 | 3982 curwin->w_cursor.col = 0; |
3983 if (dir == FORWARD) | |
3984 ++curwin->w_cursor.lnum; | |
3985 beginline(BL_WHITE | BL_FIX); | |
3986 } | |
3987 else /* put cursor on first inserted character */ | |
3988 curwin->w_cursor = new_cursor; | |
3989 } | |
3990 } | |
3991 | |
3992 msgmore(nr_lines); | |
3993 curwin->w_set_curswant = TRUE; | |
3994 | |
3995 end: | |
3996 if (allocated) | |
3997 vim_free(insert_string); | |
840 | 3998 if (regname == '=') |
3999 vim_free(y_array); | |
4000 | |
5380 | 4001 VIsual_active = FALSE; |
4002 | |
140 | 4003 /* If the cursor is past the end of the line put it at the end. */ |
844 | 4004 adjust_cursor_eol(); |
4005 } | |
4006 | |
4007 /* | |
4008 * When the cursor is on the NUL past the end of the line and it should not be | |
4009 * there move it left. | |
4010 */ | |
4011 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4012 adjust_cursor_eol(void) |
844 | 4013 { |
4014 if (curwin->w_cursor.col > 0 | |
4015 && gchar_cursor() == NUL | |
773 | 4016 #ifdef FEAT_VIRTUALEDIT |
4017 && (ve_flags & VE_ONEMORE) == 0 | |
4018 #endif | |
7 | 4019 && !(restart_edit || (State & INSERT))) |
4020 { | |
557 | 4021 /* Put the cursor on the last character in the line. */ |
555 | 4022 dec_cursor(); |
844 | 4023 |
7 | 4024 #ifdef FEAT_VIRTUALEDIT |
4025 if (ve_flags == VE_ALL) | |
557 | 4026 { |
4027 colnr_T scol, ecol; | |
4028 | |
4029 /* Coladd is set to the width of the last character. */ | |
4030 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
4031 curwin->w_cursor.coladd = ecol - scol + 1; | |
4032 } | |
7 | 4033 #endif |
4034 } | |
4035 } | |
4036 | |
4037 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
4038 /* | |
4039 * Return TRUE if lines starting with '#' should be left aligned. | |
4040 */ | |
4041 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4042 preprocs_left(void) |
7 | 4043 { |
4044 return | |
4045 # ifdef FEAT_SMARTINDENT | |
4046 # ifdef FEAT_CINDENT | |
4047 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
4048 # else | |
4049 curbuf->b_p_si | |
4050 # endif | |
4051 # endif | |
4052 # ifdef FEAT_CINDENT | |
5438 | 4053 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
4054 && curbuf->b_ind_hash_comment == 0) | |
7 | 4055 # endif |
4056 ; | |
4057 } | |
4058 #endif | |
4059 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4060 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4061 * 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
|
4062 */ |
7 | 4063 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4064 get_register_name(int num) |
7 | 4065 { |
4066 if (num == -1) | |
4067 return '"'; | |
4068 else if (num < 10) | |
4069 return num + '0'; | |
4070 else if (num == DELETION_REGISTER) | |
4071 return '-'; | |
4072 #ifdef FEAT_CLIPBOARD | |
4073 else if (num == STAR_REGISTER) | |
4074 return '*'; | |
4075 else if (num == PLUS_REGISTER) | |
4076 return '+'; | |
4077 #endif | |
4078 else | |
4079 { | |
4080 #ifdef EBCDIC | |
4081 int i; | |
4082 | |
4083 /* EBCDIC is really braindead ... */ | |
4084 i = 'a' + (num - 10); | |
4085 if (i > 'i') | |
4086 i += 7; | |
4087 if (i > 'r') | |
4088 i += 8; | |
4089 return i; | |
4090 #else | |
4091 return num + 'a' - 10; | |
4092 #endif | |
4093 } | |
4094 } | |
4095 | |
4096 /* | |
4097 * ":dis" and ":registers": Display the contents of the yank registers. | |
4098 */ | |
4099 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4100 ex_display(exarg_T *eap) |
7 | 4101 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4102 int i, n; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4103 long j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4104 char_u *p; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4105 yankreg_T *yb; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4106 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4107 int attr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4108 char_u *arg = eap->arg; |
22 | 4109 #ifdef FEAT_MBYTE |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4110 int clen; |
22 | 4111 #else |
4112 # define clen 1 | |
4113 #endif | |
7 | 4114 |
4115 if (arg != NULL && *arg == NUL) | |
4116 arg = NULL; | |
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
4117 attr = HL_ATTR(HLF_8); |
7 | 4118 |
4119 /* Highlight title */ | |
4120 MSG_PUTS_TITLE(_("\n--- Registers ---")); | |
4121 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) | |
4122 { | |
4123 name = get_register_name(i); | |
2644 | 4124 if (arg != NULL && vim_strchr(arg, name) == NULL |
4125 #ifdef ONE_CLIPBOARD | |
4126 /* Star register and plus register contain the same thing. */ | |
4127 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
4128 #endif | |
4129 ) | |
7 | 4130 continue; /* did not ask for this register */ |
4131 | |
4132 #ifdef FEAT_CLIPBOARD | |
4133 /* Adjust register name for "unnamed" in 'clipboard'. | |
4134 * When it's a clipboard register, fill it with the current contents | |
4135 * of the clipboard. */ | |
4136 adjust_clip_reg(&name); | |
4137 (void)may_get_selection(name); | |
4138 #endif | |
4139 | |
4140 if (i == -1) | |
4141 { | |
4142 if (y_previous != NULL) | |
4143 yb = y_previous; | |
4144 else | |
4145 yb = &(y_regs[0]); | |
4146 } | |
4147 else | |
4148 yb = &(y_regs[i]); | |
2000 | 4149 |
4150 #ifdef FEAT_EVAL | |
4151 if (name == MB_TOLOWER(redir_reg) | |
4152 || (redir_reg == '"' && yb == y_previous)) | |
4153 continue; /* do not list register being written to, the | |
4154 * pointer can be freed */ | |
4155 #endif | |
4156 | |
7 | 4157 if (yb->y_array != NULL) |
4158 { | |
4159 msg_putchar('\n'); | |
4160 msg_putchar('"'); | |
4161 msg_putchar(name); | |
4162 MSG_PUTS(" "); | |
4163 | |
4164 n = (int)Columns - 6; | |
4165 for (j = 0; j < yb->y_size && n > 1; ++j) | |
4166 { | |
4167 if (j) | |
4168 { | |
4169 MSG_PUTS_ATTR("^J", attr); | |
4170 n -= 2; | |
4171 } | |
4172 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
4173 { | |
4174 #ifdef FEAT_MBYTE | |
474 | 4175 clen = (*mb_ptr2len)(p); |
22 | 4176 #endif |
4177 msg_outtrans_len(p, clen); | |
4178 #ifdef FEAT_MBYTE | |
4179 p += clen - 1; | |
7 | 4180 #endif |
4181 } | |
4182 } | |
4183 if (n > 1 && yb->y_type == MLINE) | |
4184 MSG_PUTS_ATTR("^J", attr); | |
4185 out_flush(); /* show one line at a time */ | |
4186 } | |
4187 ui_breakcheck(); | |
4188 } | |
4189 | |
4190 /* | |
4191 * display last inserted text | |
4192 */ | |
4193 if ((p = get_last_insert()) != NULL | |
4194 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
4195 { | |
4196 MSG_PUTS("\n\". "); | |
4197 dis_msg(p, TRUE); | |
4198 } | |
4199 | |
4200 /* | |
4201 * display last command line | |
4202 */ | |
4203 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
4204 && !got_int) | |
4205 { | |
4206 MSG_PUTS("\n\": "); | |
4207 dis_msg(last_cmdline, FALSE); | |
4208 } | |
4209 | |
4210 /* | |
4211 * display current file name | |
4212 */ | |
4213 if (curbuf->b_fname != NULL | |
4214 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4215 { | |
4216 MSG_PUTS("\n\"% "); | |
4217 dis_msg(curbuf->b_fname, FALSE); | |
4218 } | |
4219 | |
4220 /* | |
4221 * display alternate file name | |
4222 */ | |
4223 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4224 { | |
4225 char_u *fname; | |
4226 linenr_T dummy; | |
4227 | |
4228 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
4229 { | |
4230 MSG_PUTS("\n\"# "); | |
4231 dis_msg(fname, FALSE); | |
4232 } | |
4233 } | |
4234 | |
4235 /* | |
4236 * display last search pattern | |
4237 */ | |
4238 if (last_search_pat() != NULL | |
4239 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
4240 { | |
4241 MSG_PUTS("\n\"/ "); | |
4242 dis_msg(last_search_pat(), FALSE); | |
4243 } | |
4244 | |
4245 #ifdef FEAT_EVAL | |
4246 /* | |
4247 * display last used expression | |
4248 */ | |
4249 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
4250 && !got_int) | |
4251 { | |
4252 MSG_PUTS("\n\"= "); | |
4253 dis_msg(expr_line, FALSE); | |
4254 } | |
4255 #endif | |
4256 } | |
4257 | |
4258 /* | |
4259 * display a string for do_dis() | |
4260 * truncate at end of screen line | |
4261 */ | |
4262 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4263 dis_msg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4264 char_u *p, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4265 int skip_esc) /* if TRUE, ignore trailing ESC */ |
7 | 4266 { |
4267 int n; | |
4268 #ifdef FEAT_MBYTE | |
4269 int l; | |
4270 #endif | |
4271 | |
4272 n = (int)Columns - 6; | |
4273 while (*p != NUL | |
4274 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
4275 && (n -= ptr2cells(p)) >= 0) | |
4276 { | |
4277 #ifdef FEAT_MBYTE | |
474 | 4278 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
7 | 4279 { |
4280 msg_outtrans_len(p, l); | |
4281 p += l; | |
4282 } | |
4283 else | |
4284 #endif | |
4285 msg_outtrans_len(p++, 1); | |
4286 } | |
4287 ui_breakcheck(); | |
4288 } | |
4289 | |
3562 | 4290 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4291 /* | |
4292 * If "process" is TRUE and the line begins with a comment leader (possibly | |
4293 * after some white space), return a pointer to the text after it. Put a boolean | |
4294 * value indicating whether the line ends with an unclosed comment in | |
4295 * "is_comment". | |
4296 * line - line to be processed, | |
4297 * process - if FALSE, will only check whether the line ends with an unclosed | |
3584 | 4298 * comment, |
3562 | 4299 * include_space - whether to also skip space following the comment leader, |
4300 * is_comment - will indicate whether the current line ends with an unclosed | |
3584 | 4301 * comment. |
3562 | 4302 */ |
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4303 char_u * |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4304 skip_comment( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4305 char_u *line, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4306 int process, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4307 int include_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4308 int *is_comment) |
3562 | 4309 { |
4310 char_u *comment_flags = NULL; | |
4311 int lead_len; | |
4312 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
4313 | |
4314 *is_comment = FALSE; | |
4315 if (leader_offset != -1) | |
4316 { | |
4317 /* Let's check whether the line ends with an unclosed comment. | |
4318 * If the last comment leader has COM_END in flags, there's no comment. | |
4319 */ | |
4320 while (*comment_flags) | |
4321 { | |
4322 if (*comment_flags == COM_END | |
4323 || *comment_flags == ':') | |
4324 break; | |
4325 ++comment_flags; | |
4326 } | |
4327 if (*comment_flags != COM_END) | |
4328 *is_comment = TRUE; | |
4329 } | |
4330 | |
4331 if (process == FALSE) | |
4332 return line; | |
4333 | |
4334 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
4335 | |
4336 if (lead_len == 0) | |
4337 return line; | |
4338 | |
4339 /* Find: | |
4340 * - COM_END, | |
4341 * - colon, | |
4342 * whichever comes first. | |
4343 */ | |
4344 while (*comment_flags) | |
4345 { | |
3580 | 4346 if (*comment_flags == COM_END |
3562 | 4347 || *comment_flags == ':') |
4348 { | |
4349 break; | |
4350 } | |
4351 ++comment_flags; | |
4352 } | |
4353 | |
4354 /* If we found a colon, it means that we are not processing a line | |
3580 | 4355 * starting with a closing part of a three-part comment. That's good, |
4356 * because we don't want to remove those as this would be annoying. | |
3562 | 4357 */ |
4358 if (*comment_flags == ':' || *comment_flags == NUL) | |
4359 line += lead_len; | |
4360 | |
4361 return line; | |
4362 } | |
4363 #endif | |
4364 | |
7 | 4365 /* |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4366 * 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
|
4367 * When "save_undo" is TRUE save lines for undo first. |
5848 | 4368 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
4369 * leaders should not be removed. | |
4370 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
4371 * to set those marks. | |
7 | 4372 * |
1217 | 4373 * return FAIL for failure, OK otherwise |
7 | 4374 */ |
4375 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4376 do_join( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4377 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4378 int insert_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4379 int save_undo, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4380 int use_formatoptions UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4381 int setmark) |
7 | 4382 { |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4383 char_u *curr = NULL; |
2597 | 4384 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
|
4385 char_u *cend; |
7 | 4386 char_u *newp; |
2597 | 4387 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
|
4388 int endcurr1 = NUL; |
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4389 int endcurr2 = NUL; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4390 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
|
4391 int sumsize = 0; /* size of the long new line */ |
7 | 4392 linenr_T t; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4393 colnr_T col = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4394 int ret = OK; |
3562 | 4395 #if defined(FEAT_COMMENTS) || defined(PROTO) |
3574 | 4396 int *comments = NULL; |
3562 | 4397 int remove_comments = (use_formatoptions == TRUE) |
4398 && has_format_option(FO_REMOVE_COMS); | |
4399 int prev_was_comment; | |
4400 #endif | |
4401 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4402 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4403 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
|
4404 (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
|
4405 return FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4406 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4407 /* 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
|
4408 * 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
|
4409 * 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
|
4410 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
|
4411 if (spaces == NULL) |
7 | 4412 return FAIL; |
3562 | 4413 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4414 if (remove_comments) | |
4415 { | |
4416 comments = (int *)lalloc_clear((long_u)count * sizeof(int), TRUE); | |
4417 if (comments == NULL) | |
4418 { | |
4419 vim_free(spaces); | |
4420 return FAIL; | |
4421 } | |
4422 } | |
4423 #endif | |
7 | 4424 |
4425 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4426 * 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
|
4427 * and setup the array of space strings lengths |
7 | 4428 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4429 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
|
4430 { |
2597 | 4431 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
5848 | 4432 if (t == 0 && setmark) |
5664 | 4433 { |
4434 /* Set the '[ mark. */ | |
4435 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
4436 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
4437 } | |
3562 | 4438 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4439 if (remove_comments) | |
4440 { | |
4441 /* We don't want to remove the comment leader if the | |
4442 * previous line is not a comment. */ | |
4443 if (t > 0 && prev_was_comment) | |
4444 { | |
4445 | |
4446 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
4447 &prev_was_comment); | |
3576 | 4448 comments[t] = (int)(new_curr - curr); |
3562 | 4449 curr = new_curr; |
4450 } | |
4451 else | |
4452 curr = skip_comment(curr, FALSE, insert_space, | |
4453 &prev_was_comment); | |
4454 } | |
4455 #endif | |
4456 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4457 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
|
4458 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4459 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4460 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
|
4461 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4462 && (!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
|
4463 || (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
|
4464 && (!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
|
4465 || 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
|
4466 #endif |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4467 ) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4468 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4469 /* 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
|
4470 if (endcurr1 == ' ') |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4471 endcurr1 = endcurr2; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4472 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4473 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4474 /* 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
|
4475 if ( p_js |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4476 && (endcurr1 == '.' |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4477 || (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
|
4478 && (endcurr1 == '?' || endcurr1 == '!')))) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4479 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4480 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4481 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4482 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4483 sumsize += currsize + spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4484 endcurr1 = endcurr2 = NUL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4485 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
|
4486 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4487 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4488 if (has_mbyte) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4489 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4490 cend = curr + currsize; |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4491 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
|
4492 endcurr1 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4493 if (cend > curr) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4494 { |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4495 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
|
4496 endcurr2 = (*mb_ptr2char)(cend); |
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 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4499 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4500 #endif |
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 endcurr1 = *(curr + currsize - 1); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4503 if (currsize > 1) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4504 endcurr2 = *(curr + currsize - 2); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4505 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4506 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4507 line_breakcheck(); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4508 if (got_int) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4509 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4510 ret = FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4511 goto theend; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4512 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4513 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4514 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4515 /* 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
|
4516 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
|
4517 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4518 /* 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
|
4519 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
|
4520 cend = newp + sumsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4521 *cend = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4522 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4523 /* |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4524 * 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
|
4525 * |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4526 * 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
|
4527 * 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
|
4528 * 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
|
4529 */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4530 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
|
4531 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4532 cend -= currsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4533 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
|
4534 if (spaces[t] > 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4535 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4536 cend -= spaces[t]; |
6929 | 4537 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
|
4538 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4539 mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t, |
2597 | 4540 (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
|
4541 if (t == 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4542 break; |
2597 | 4543 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1)); |
3562 | 4544 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4545 if (remove_comments) | |
4546 curr += comments[t - 1]; | |
4547 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4548 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
|
4549 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4550 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4551 } |
7 | 4552 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
4553 | |
5848 | 4554 if (setmark) |
4555 { | |
4556 /* Set the '] mark. */ | |
4557 curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; | |
4558 curwin->w_buffer->b_op_end.col = (colnr_T)STRLEN(newp); | |
4559 } | |
5664 | 4560 |
7 | 4561 /* Only report the change in the first line here, del_lines() will report |
4562 * the deleted line. */ | |
4563 changed_lines(curwin->w_cursor.lnum, currsize, | |
4564 curwin->w_cursor.lnum + 1, 0L); | |
4565 | |
4566 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4567 * Delete following lines. To do this we move the cursor there |
7 | 4568 * briefly, and then move it back. After del_lines() the cursor may |
4569 * have moved up (last line deleted), so the current lnum is kept in t. | |
4570 */ | |
4571 t = curwin->w_cursor.lnum; | |
4572 ++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
|
4573 del_lines(count - 1, FALSE); |
7 | 4574 curwin->w_cursor.lnum = t; |
4575 | |
4576 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4577 * Set the cursor column: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4578 * 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
|
4579 * vim: use the column of the last join |
7 | 4580 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4581 curwin->w_cursor.col = |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4582 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
7 | 4583 check_cursor_col(); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4584 |
7 | 4585 #ifdef FEAT_VIRTUALEDIT |
4586 curwin->w_cursor.coladd = 0; | |
4587 #endif | |
4588 curwin->w_set_curswant = TRUE; | |
4589 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4590 theend: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4591 vim_free(spaces); |
3562 | 4592 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4593 if (remove_comments) | |
4594 vim_free(comments); | |
4595 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4596 return ret; |
7 | 4597 } |
4598 | |
4599 #ifdef FEAT_COMMENTS | |
4600 /* | |
4601 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
4602 * the first line. White-space is ignored. Note that the whole of | |
4603 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
4604 */ | |
4605 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4606 same_leader( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4607 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4608 int leader1_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4609 char_u *leader1_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4610 int leader2_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4611 char_u *leader2_flags) |
7 | 4612 { |
4613 int idx1 = 0, idx2 = 0; | |
4614 char_u *p; | |
4615 char_u *line1; | |
4616 char_u *line2; | |
4617 | |
4618 if (leader1_len == 0) | |
4619 return (leader2_len == 0); | |
4620 | |
4621 /* | |
4622 * If first leader has 'f' flag, the lines can be joined only if the | |
4623 * second line does not have a leader. | |
4624 * If first leader has 'e' flag, the lines can never be joined. | |
4625 * If fist leader has 's' flag, the lines can only be joined if there is | |
4626 * some text after it and the second line has the 'm' flag. | |
4627 */ | |
4628 if (leader1_flags != NULL) | |
4629 { | |
4630 for (p = leader1_flags; *p && *p != ':'; ++p) | |
4631 { | |
4632 if (*p == COM_FIRST) | |
4633 return (leader2_len == 0); | |
4634 if (*p == COM_END) | |
4635 return FALSE; | |
4636 if (*p == COM_START) | |
4637 { | |
4638 if (*(ml_get(lnum) + leader1_len) == NUL) | |
4639 return FALSE; | |
4640 if (leader2_flags == NULL || leader2_len == 0) | |
4641 return FALSE; | |
4642 for (p = leader2_flags; *p && *p != ':'; ++p) | |
4643 if (*p == COM_MIDDLE) | |
4644 return TRUE; | |
4645 return FALSE; | |
4646 } | |
4647 } | |
4648 } | |
4649 | |
4650 /* | |
4651 * Get current line and next line, compare the leaders. | |
4652 * The first line has to be saved, only one line can be locked at a time. | |
4653 */ | |
4654 line1 = vim_strsave(ml_get(lnum)); | |
4655 if (line1 != NULL) | |
4656 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4657 for (idx1 = 0; VIM_ISWHITE(line1[idx1]); ++idx1) |
7 | 4658 ; |
4659 line2 = ml_get(lnum + 1); | |
4660 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
4661 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4662 if (!VIM_ISWHITE(line2[idx2])) |
7 | 4663 { |
4664 if (line1[idx1++] != line2[idx2]) | |
4665 break; | |
4666 } | |
4667 else | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4668 while (VIM_ISWHITE(line1[idx1])) |
7 | 4669 ++idx1; |
4670 } | |
4671 vim_free(line1); | |
4672 } | |
4673 return (idx2 == leader2_len && idx1 == leader1_len); | |
4674 } | |
4675 #endif | |
4676 | |
4677 /* | |
3252 | 4678 * Implementation of the format operator 'gq'. |
7 | 4679 */ |
4680 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4681 op_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4682 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4683 int keep_cursor) /* keep cursor on same text char */ |
7 | 4684 { |
4685 long old_line_count = curbuf->b_ml.ml_line_count; | |
4686 | |
4687 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
4688 * can put it back there. */ | |
4689 curwin->w_cursor = oap->cursor_start; | |
4690 | |
4691 if (u_save((linenr_T)(oap->start.lnum - 1), | |
4692 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
4693 return; | |
4694 curwin->w_cursor = oap->start; | |
4695 | |
4696 if (oap->is_VIsual) | |
4697 /* When there is no change: need to remove the Visual selection */ | |
4698 redraw_curbuf_later(INVERTED); | |
4699 | |
4700 /* Set '[ mark at the start of the formatted area */ | |
4701 curbuf->b_op_start = oap->start; | |
4702 | |
4703 /* For "gw" remember the cursor position and put it back below (adjusted | |
4704 * for joined and split lines). */ | |
4705 if (keep_cursor) | |
4706 saved_cursor = oap->cursor_start; | |
4707 | |
1563 | 4708 format_lines(oap->line_count, keep_cursor); |
7 | 4709 |
4710 /* | |
4711 * Leave the cursor at the first non-blank of the last formatted line. | |
4712 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
4713 * line, so "." will do the next lines. | |
4714 */ | |
4715 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
4716 ++curwin->w_cursor.lnum; | |
4717 beginline(BL_WHITE | BL_FIX); | |
4718 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
4719 msgmore(old_line_count); | |
4720 | |
4721 /* put '] mark on the end of the formatted area */ | |
4722 curbuf->b_op_end = curwin->w_cursor; | |
4723 | |
4724 if (keep_cursor) | |
4725 { | |
4726 curwin->w_cursor = saved_cursor; | |
4727 saved_cursor.lnum = 0; | |
4728 } | |
4729 | |
4730 if (oap->is_VIsual) | |
4731 { | |
4732 win_T *wp; | |
4733 | |
4734 FOR_ALL_WINDOWS(wp) | |
4735 { | |
4736 if (wp->w_old_cursor_lnum != 0) | |
4737 { | |
4738 /* When lines have been inserted or deleted, adjust the end of | |
4739 * the Visual area to be redrawn. */ | |
4740 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
4741 wp->w_old_cursor_lnum += old_line_count; | |
4742 else | |
4743 wp->w_old_visual_lnum += old_line_count; | |
4744 } | |
4745 } | |
4746 } | |
4747 } | |
4748 | |
667 | 4749 #if defined(FEAT_EVAL) || defined(PROTO) |
4750 /* | |
4751 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
4752 */ | |
4753 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4754 op_formatexpr(oparg_T *oap) |
667 | 4755 { |
4756 if (oap->is_VIsual) | |
4757 /* When there is no change: need to remove the Visual selection */ | |
4758 redraw_curbuf_later(INVERTED); | |
4759 | |
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4760 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
|
4761 /* 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
|
4762 * internal formatting. */ |
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4763 op_format(oap, FALSE); |
667 | 4764 } |
4765 | |
4766 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4767 fex_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4768 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4769 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4770 int c) /* character to be inserted */ |
667 | 4771 { |
681 | 4772 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
4773 OPT_LOCAL); | |
667 | 4774 int r; |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4775 char_u *fex; |
667 | 4776 |
4777 /* | |
4778 * Set v:lnum to the first line number and v:count to the number of lines. | |
844 | 4779 * Set v:char to the character to be inserted (can be NUL). |
667 | 4780 */ |
4781 set_vim_var_nr(VV_LNUM, lnum); | |
4782 set_vim_var_nr(VV_COUNT, count); | |
1969 | 4783 set_vim_var_char(c); |
844 | 4784 |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4785 /* 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
|
4786 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
|
4787 if (fex == NULL) |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4788 return 0; |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4789 |
667 | 4790 /* |
4791 * Evaluate the function. | |
4792 */ | |
4793 if (use_sandbox) | |
4794 ++sandbox; | |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4795 r = (int)eval_to_number(fex); |
667 | 4796 if (use_sandbox) |
4797 --sandbox; | |
844 | 4798 |
4799 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
|
4800 vim_free(fex); |
844 | 4801 |
667 | 4802 return r; |
4803 } | |
4804 #endif | |
4805 | |
7 | 4806 /* |
4807 * Format "line_count" lines, starting at the cursor position. | |
4808 * When "line_count" is negative, format until the end of the paragraph. | |
4809 * Lines after the cursor line are saved for undo, caller must have saved the | |
4810 * first line. | |
4811 */ | |
4812 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4813 format_lines( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4814 linenr_T line_count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4815 int avoid_fex) /* don't use 'formatexpr' */ |
7 | 4816 { |
4817 int max_len; | |
4818 int is_not_par; /* current line not part of parag. */ | |
4819 int next_is_not_par; /* next line not part of paragraph */ | |
4820 int is_end_par; /* at end of paragraph */ | |
4821 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
4822 int next_is_start_par = FALSE; | |
4823 #ifdef FEAT_COMMENTS | |
4824 int leader_len = 0; /* leader len of current line */ | |
4825 int next_leader_len; /* leader len of next line */ | |
4826 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
4827 char_u *next_leader_flags; /* flags for leader of next line */ | |
4828 int do_comments; /* format comments */ | |
3584 | 4829 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
7 | 4830 #endif |
4831 int advance = TRUE; | |
3584 | 4832 int second_indent = -1; /* indent for second line (comment |
4833 * aware) */ | |
7 | 4834 int do_second_indent; |
4835 int do_number_indent; | |
4836 int do_trail_white; | |
4837 int first_par_line = TRUE; | |
4838 int smd_save; | |
4839 long count; | |
4840 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
4841 int force_format = FALSE; | |
4842 int old_State = State; | |
4843 | |
4844 /* length of a line to force formatting: 3 * 'tw' */ | |
4845 max_len = comp_textwidth(TRUE) * 3; | |
4846 | |
4847 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
4848 #ifdef FEAT_COMMENTS | |
4849 do_comments = has_format_option(FO_Q_COMS); | |
4850 #endif | |
4851 do_second_indent = has_format_option(FO_Q_SECOND); | |
4852 do_number_indent = has_format_option(FO_Q_NUMBER); | |
4853 do_trail_white = has_format_option(FO_WHITE_PAR); | |
4854 | |
4855 /* | |
4856 * Get info about the previous and current line. | |
4857 */ | |
4858 if (curwin->w_cursor.lnum > 1) | |
4859 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
4860 #ifdef FEAT_COMMENTS | |
4861 , &leader_len, &leader_flags, do_comments | |
4862 #endif | |
4863 ); | |
4864 else | |
4865 is_not_par = TRUE; | |
4866 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
4867 #ifdef FEAT_COMMENTS | |
4868 , &next_leader_len, &next_leader_flags, do_comments | |
4869 #endif | |
4870 ); | |
4871 is_end_par = (is_not_par || next_is_not_par); | |
4872 if (!is_end_par && do_trail_white) | |
4873 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
4874 | |
4875 curwin->w_cursor.lnum--; | |
4876 for (count = line_count; count != 0 && !got_int; --count) | |
4877 { | |
4878 /* | |
4879 * Advance to next paragraph. | |
4880 */ | |
4881 if (advance) | |
4882 { | |
4883 curwin->w_cursor.lnum++; | |
4884 prev_is_end_par = is_end_par; | |
4885 is_not_par = next_is_not_par; | |
4886 #ifdef FEAT_COMMENTS | |
4887 leader_len = next_leader_len; | |
4888 leader_flags = next_leader_flags; | |
4889 #endif | |
4890 } | |
4891 | |
4892 /* | |
4893 * The last line to be formatted. | |
4894 */ | |
4895 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
4896 { | |
4897 next_is_not_par = TRUE; | |
4898 #ifdef FEAT_COMMENTS | |
4899 next_leader_len = 0; | |
4900 next_leader_flags = NULL; | |
4901 #endif | |
4902 } | |
4903 else | |
4904 { | |
4905 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
4906 #ifdef FEAT_COMMENTS | |
4907 , &next_leader_len, &next_leader_flags, do_comments | |
4908 #endif | |
4909 ); | |
4910 if (do_number_indent) | |
4911 next_is_start_par = | |
4912 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
4913 } | |
4914 advance = TRUE; | |
4915 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
4916 if (!is_end_par && do_trail_white) | |
4917 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
4918 | |
4919 /* | |
4920 * Skip lines that are not in a paragraph. | |
4921 */ | |
4922 if (is_not_par) | |
4923 { | |
4924 if (line_count < 0) | |
4925 break; | |
4926 } | |
4927 else | |
4928 { | |
4929 /* | |
4930 * For the first line of a paragraph, check indent of second line. | |
4931 * Don't do this for comments and empty lines. | |
4932 */ | |
4933 if (first_par_line | |
4934 && (do_second_indent || do_number_indent) | |
4935 && prev_is_end_par | |
3584 | 4936 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
4937 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
4938 if (do_second_indent && !LINEEMPTY(curwin->w_cursor.lnum + 1)) |
3584 | 4939 { |
4940 #ifdef FEAT_COMMENTS | |
4941 if (leader_len == 0 && next_leader_len == 0) | |
4942 { | |
4943 /* no comment found */ | |
4944 #endif | |
4945 second_indent = | |
4946 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
7 | 4947 #ifdef FEAT_COMMENTS |
3584 | 4948 } |
4949 else | |
4950 { | |
4951 second_indent = next_leader_len; | |
4952 do_comments_list = 1; | |
4953 } | |
4954 #endif | |
4955 } | |
7 | 4956 else if (do_number_indent) |
3584 | 4957 { |
4958 #ifdef FEAT_COMMENTS | |
4959 if (leader_len == 0 && next_leader_len == 0) | |
4960 { | |
4961 /* no comment found */ | |
4962 #endif | |
4963 second_indent = | |
4964 get_number_indent(curwin->w_cursor.lnum); | |
4965 #ifdef FEAT_COMMENTS | |
4966 } | |
4967 else | |
4968 { | |
4969 /* get_number_indent() is now "comment aware"... */ | |
4970 second_indent = | |
4971 get_number_indent(curwin->w_cursor.lnum); | |
4972 do_comments_list = 1; | |
4973 } | |
4974 #endif | |
4975 } | |
7 | 4976 } |
4977 | |
4978 /* | |
4979 * When the comment leader changes, it's the end of the paragraph. | |
4980 */ | |
4981 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
4982 #ifdef FEAT_COMMENTS | |
4983 || !same_leader(curwin->w_cursor.lnum, | |
4984 leader_len, leader_flags, | |
4985 next_leader_len, next_leader_flags) | |
4986 #endif | |
4987 ) | |
4988 is_end_par = TRUE; | |
4989 | |
4990 /* | |
4991 * If we have got to the end of a paragraph, or the line is | |
4992 * getting long, format it. | |
4993 */ | |
4994 if (is_end_par || force_format) | |
4995 { | |
4996 if (need_set_indent) | |
4997 /* replace indent in first line with minimal number of | |
4998 * tabs and spaces, according to current options */ | |
4999 (void)set_indent(get_indent(), SIN_CHANGED); | |
5000 | |
5001 /* put cursor on last non-space */ | |
5002 State = NORMAL; /* don't go past end-of-line */ | |
5003 coladvance((colnr_T)MAXCOL); | |
5004 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
5005 dec_cursor(); | |
5006 | |
5007 /* do the formatting, without 'showmode' */ | |
5008 State = INSERT; /* for open_line() */ | |
5009 smd_save = p_smd; | |
5010 p_smd = FALSE; | |
5011 insertchar(NUL, INSCHAR_FORMAT | |
5012 #ifdef FEAT_COMMENTS | |
5013 + (do_comments ? INSCHAR_DO_COM : 0) | |
3584 | 5014 + (do_comments && do_comments_list |
5015 ? INSCHAR_COM_LIST : 0) | |
7 | 5016 #endif |
1563 | 5017 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
7 | 5018 State = old_State; |
5019 p_smd = smd_save; | |
5020 second_indent = -1; | |
5021 /* at end of par.: need to set indent of next par. */ | |
5022 need_set_indent = is_end_par; | |
5023 if (is_end_par) | |
5024 { | |
5025 /* When called with a negative line count, break at the | |
5026 * end of the paragraph. */ | |
5027 if (line_count < 0) | |
5028 break; | |
5029 first_par_line = TRUE; | |
5030 } | |
5031 force_format = FALSE; | |
5032 } | |
5033 | |
5034 /* | |
5035 * When still in same paragraph, join the lines together. But | |
5403 | 5036 * first delete the leader from the second line. |
7 | 5037 */ |
5038 if (!is_end_par) | |
5039 { | |
5040 advance = FALSE; | |
5041 curwin->w_cursor.lnum++; | |
5042 curwin->w_cursor.col = 0; | |
5043 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
|
5044 break; |
7 | 5045 #ifdef FEAT_COMMENTS |
5046 if (next_leader_len > 0) | |
5403 | 5047 { |
5048 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
7 | 5049 mark_col_adjust(curwin->w_cursor.lnum, (colnr_T)0, 0L, |
5050 (long)-next_leader_len); | |
5403 | 5051 } else |
5052 #endif | |
5053 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
5054 { | |
5055 char_u *p = ml_get_curline(); | |
5415 | 5056 int indent = (int)(skipwhite(p) - p); |
5403 | 5057 |
5058 if (indent > 0) | |
5059 { | |
5060 (void)del_bytes(indent, FALSE, FALSE); | |
5061 mark_col_adjust(curwin->w_cursor.lnum, | |
5062 (colnr_T)0, 0L, (long)-indent); | |
5415 | 5063 } |
5403 | 5064 } |
7 | 5065 curwin->w_cursor.lnum--; |
5848 | 5066 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
7 | 5067 { |
5068 beep_flush(); | |
5069 break; | |
5070 } | |
5071 first_par_line = FALSE; | |
5072 /* If the line is getting long, format it next time */ | |
5073 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
5074 force_format = TRUE; | |
5075 else | |
5076 force_format = FALSE; | |
5077 } | |
5078 } | |
5079 line_breakcheck(); | |
5080 } | |
5081 } | |
5082 | |
5083 /* | |
5084 * Return TRUE if line "lnum" ends in a white character. | |
5085 */ | |
5086 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5087 ends_in_white(linenr_T lnum) |
7 | 5088 { |
5089 char_u *s = ml_get(lnum); | |
5090 size_t l; | |
5091 | |
5092 if (*s == NUL) | |
5093 return FALSE; | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5094 /* Don't use STRLEN() inside VIM_ISWHITE(), SAS/C complains: "macro |
7 | 5095 * invocation may call function multiple times". */ |
5096 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
|
5097 return VIM_ISWHITE(s[l]); |
7 | 5098 } |
5099 | |
5100 /* | |
5101 * Blank lines, and lines containing only the comment leader, are left | |
5102 * untouched by the formatting. The function returns TRUE in this | |
5103 * case. It also returns TRUE when a line starts with the end of a comment | |
5104 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
5105 * previous line. A new paragraph starts after a blank line, or when the | |
5106 * comment leader changes -- webb. | |
5107 */ | |
5108 #ifdef FEAT_COMMENTS | |
5109 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5110 fmt_check_par( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5111 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5112 int *leader_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5113 char_u **leader_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5114 int do_comments) |
7 | 5115 { |
5116 char_u *flags = NULL; /* init for GCC */ | |
5117 char_u *ptr; | |
5118 | |
5119 ptr = ml_get(lnum); | |
5120 if (do_comments) | |
3562 | 5121 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
7 | 5122 else |
5123 *leader_len = 0; | |
5124 | |
5125 if (*leader_len > 0) | |
5126 { | |
5127 /* | |
5128 * Search for 'e' flag in comment leader flags. | |
5129 */ | |
5130 flags = *leader_flags; | |
5131 while (*flags && *flags != ':' && *flags != COM_END) | |
5132 ++flags; | |
5133 } | |
5134 | |
5135 return (*skipwhite(ptr + *leader_len) == NUL | |
5136 || (*leader_len > 0 && *flags == COM_END) | |
5137 || startPS(lnum, NUL, FALSE)); | |
5138 } | |
5139 #else | |
5140 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5141 fmt_check_par(linenr_T lnum) |
7 | 5142 { |
5143 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
5144 } | |
5145 #endif | |
5146 | |
5147 /* | |
5148 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
5149 * previous line is in the same paragraph. Used for auto-formatting. | |
5150 */ | |
5151 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5152 paragraph_start(linenr_T lnum) |
7 | 5153 { |
5154 char_u *p; | |
5155 #ifdef FEAT_COMMENTS | |
5156 int leader_len = 0; /* leader len of current line */ | |
5157 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
5158 int next_leader_len; /* leader len of next line */ | |
5159 char_u *next_leader_flags; /* flags for leader of next line */ | |
5160 int do_comments; /* format comments */ | |
5161 #endif | |
5162 | |
5163 if (lnum <= 1) | |
5164 return TRUE; /* start of the file */ | |
5165 | |
5166 p = ml_get(lnum - 1); | |
5167 if (*p == NUL) | |
5168 return TRUE; /* after empty line */ | |
5169 | |
5170 #ifdef FEAT_COMMENTS | |
5171 do_comments = has_format_option(FO_Q_COMS); | |
5172 #endif | |
5173 if (fmt_check_par(lnum - 1 | |
5174 #ifdef FEAT_COMMENTS | |
5175 , &leader_len, &leader_flags, do_comments | |
5176 #endif | |
5177 )) | |
5178 return TRUE; /* after non-paragraph line */ | |
5179 | |
5180 if (fmt_check_par(lnum | |
5181 #ifdef FEAT_COMMENTS | |
5182 , &next_leader_len, &next_leader_flags, do_comments | |
5183 #endif | |
5184 )) | |
5185 return TRUE; /* "lnum" is not a paragraph line */ | |
5186 | |
5187 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
5188 return TRUE; /* missing trailing space in previous line. */ | |
5189 | |
5190 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
5191 return TRUE; /* numbered item starts in "lnum". */ | |
5192 | |
5193 #ifdef FEAT_COMMENTS | |
5194 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
5195 next_leader_len, next_leader_flags)) | |
5196 return TRUE; /* change of comment leader. */ | |
5197 #endif | |
5198 | |
5199 return FALSE; | |
5200 } | |
5201 | |
5202 /* | |
5203 * prepare a few things for block mode yank/delete/tilde | |
5204 * | |
5205 * for delete: | |
5206 * - textlen includes the first/last char to be (partly) deleted | |
5207 * - start/endspaces is the number of columns that are taken by the | |
5208 * first/last deleted char minus the number of columns that have to be | |
1839 | 5209 * deleted. |
5210 * for yank and tilde: | |
7 | 5211 * - textlen includes the first/last char to be wholly yanked |
5212 * - start/endspaces is the number of columns of the first/last yanked char | |
5213 * that are to be yanked. | |
5214 */ | |
5215 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5216 block_prep( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5217 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5218 struct block_def *bdp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5219 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5220 int is_del) |
7 | 5221 { |
5222 int incr = 0; | |
5223 char_u *pend; | |
5224 char_u *pstart; | |
5225 char_u *line; | |
5226 char_u *prev_pstart; | |
5227 char_u *prev_pend; | |
5228 | |
5229 bdp->startspaces = 0; | |
5230 bdp->endspaces = 0; | |
5231 bdp->textlen = 0; | |
5232 bdp->start_vcol = 0; | |
5233 bdp->end_vcol = 0; | |
5234 #ifdef FEAT_VISUALEXTRA | |
5235 bdp->is_short = FALSE; | |
5236 bdp->is_oneChar = FALSE; | |
5237 bdp->pre_whitesp = 0; | |
5238 bdp->pre_whitesp_c = 0; | |
5239 bdp->end_char_vcols = 0; | |
5240 #endif | |
5241 bdp->start_char_vcols = 0; | |
5242 | |
5243 line = ml_get(lnum); | |
5244 pstart = line; | |
5245 prev_pstart = line; | |
5246 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
5247 { | |
5248 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 5249 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
7 | 5250 bdp->start_vcol += incr; |
5251 #ifdef FEAT_VISUALEXTRA | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5252 if (VIM_ISWHITE(*pstart)) |
7 | 5253 { |
5254 bdp->pre_whitesp += incr; | |
5255 bdp->pre_whitesp_c++; | |
5256 } | |
5257 else | |
5258 { | |
5259 bdp->pre_whitesp = 0; | |
5260 bdp->pre_whitesp_c = 0; | |
5261 } | |
5262 #endif | |
5263 prev_pstart = pstart; | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
5264 MB_PTR_ADV(pstart); |
7 | 5265 } |
5266 bdp->start_char_vcols = incr; | |
5267 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
5268 { | |
5269 bdp->end_vcol = bdp->start_vcol; | |
5270 #ifdef FEAT_VISUALEXTRA | |
5271 bdp->is_short = TRUE; | |
5272 #endif | |
5273 if (!is_del || oap->op_type == OP_APPEND) | |
5274 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
5275 } | |
5276 else | |
5277 { | |
5278 /* notice: this converts partly selected Multibyte characters to | |
5279 * spaces, too. */ | |
5280 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
5281 if (is_del && bdp->startspaces) | |
5282 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
5283 pend = pstart; | |
5284 bdp->end_vcol = bdp->start_vcol; | |
5285 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
5286 { | |
5287 #ifdef FEAT_VISUALEXTRA | |
5288 bdp->is_oneChar = TRUE; | |
5289 #endif | |
5290 if (oap->op_type == OP_INSERT) | |
5291 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5292 else if (oap->op_type == OP_APPEND) | |
5293 { | |
5294 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
5295 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5296 } | |
5297 else | |
5298 { | |
5299 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
5300 if (is_del && oap->op_type != OP_LSHIFT) | |
5301 { | |
5302 /* just putting the sum of those two into | |
5303 * bdp->startspaces doesn't work for Visual replace, | |
5304 * so we have to split the tab in two */ | |
5305 bdp->startspaces = bdp->start_char_vcols | |
5306 - (bdp->start_vcol - oap->start_vcol); | |
5307 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5308 } | |
5309 } | |
5310 } | |
5311 else | |
5312 { | |
5313 prev_pend = pend; | |
5314 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
5315 { | |
5316 /* Count a tab for what it's worth (if list mode not on) */ | |
5317 prev_pend = pend; | |
6535 | 5318 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
7 | 5319 bdp->end_vcol += incr; |
5320 } | |
5321 if (bdp->end_vcol <= oap->end_vcol | |
5322 && (!is_del | |
5323 || oap->op_type == OP_APPEND | |
5324 || oap->op_type == OP_REPLACE)) /* line too short */ | |
5325 { | |
5326 #ifdef FEAT_VISUALEXTRA | |
5327 bdp->is_short = TRUE; | |
5328 #endif | |
5329 /* Alternative: include spaces to fill up the block. | |
5330 * Disadvantage: can lead to trailing spaces when the line is | |
5331 * short where the text is put */ | |
5332 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
5333 if (oap->op_type == OP_APPEND || virtual_op) | |
5334 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
593 | 5335 + oap->inclusive; |
7 | 5336 else |
5337 bdp->endspaces = 0; /* replace doesn't add characters */ | |
5338 } | |
5339 else if (bdp->end_vcol > oap->end_vcol) | |
5340 { | |
5341 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5342 if (!is_del && bdp->endspaces) | |
5343 { | |
5344 bdp->endspaces = incr - bdp->endspaces; | |
5345 if (pend != pstart) | |
5346 pend = prev_pend; | |
5347 } | |
5348 } | |
5349 } | |
5350 #ifdef FEAT_VISUALEXTRA | |
5351 bdp->end_char_vcols = incr; | |
5352 #endif | |
5353 if (is_del && bdp->startspaces) | |
5354 pstart = prev_pstart; | |
5355 bdp->textlen = (int)(pend - pstart); | |
5356 } | |
5357 bdp->textcol = (colnr_T) (pstart - line); | |
5358 bdp->textstart = pstart; | |
5359 } | |
5360 | |
5361 /* | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5362 * Handle the add/subtract operator. |
7 | 5363 */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5364 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5365 op_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5366 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5367 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
|
5368 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
|
5369 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5370 pos_T pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5371 struct block_def bd; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5372 int change_cnt = 0; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5373 linenr_T amount = Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5374 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5375 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5376 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5377 pos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5378 if (u_save_cursor() == FAIL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5379 return; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5380 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
|
5381 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5382 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
|
5383 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5384 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5385 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5386 int one_change; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5387 int length; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5388 pos_T startpos; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5389 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5390 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
|
5391 (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
|
5392 return; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5393 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5394 pos = oap->start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5395 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
|
5396 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5397 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
|
5398 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5399 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
|
5400 pos.col = bd.textcol; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5401 length = bd.textlen; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5402 } |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5403 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
|
5404 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5405 curwin->w_cursor.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5406 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5407 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
|
5408 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5409 else /* oap->motion_type == MCHAR */ |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5410 { |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5411 if (!oap->inclusive) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5412 dec(&(oap->end)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5413 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
|
5414 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5415 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
|
5416 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5417 pos.col += oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5418 length -= oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5419 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5420 if (pos.lnum == oap->end.lnum) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5421 { |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5422 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
|
5423 if (oap->end.col >= length) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5424 oap->end.col = length - 1; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5425 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
|
5426 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5427 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5428 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
|
5429 if (one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5430 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5431 /* 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
|
5432 if (change_cnt == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5433 startpos = curbuf->b_op_start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5434 ++change_cnt; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5435 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5436 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5437 #ifdef FEAT_NETBEANS_INTG |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5438 if (netbeans_active() && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5439 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5440 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
|
5441 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5442 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
|
5443 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
|
5444 &ptr[pos.col], length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5445 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5446 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5447 if (g_cmd && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5448 amount += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5449 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5450 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5451 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
|
5452 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5453 if (!change_cnt && oap->is_VIsual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5454 /* 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
|
5455 redraw_curbuf_later(INVERTED); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5456 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5457 /* 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
|
5458 * position from do_addsub(). */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5459 if (change_cnt > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5460 curbuf->b_op_start = startpos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5461 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5462 if (change_cnt > p_report) |
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 if (change_cnt == 1) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5465 MSG(_("1 line changed")); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5466 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5467 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
|
5468 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5469 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5470 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5471 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5472 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5473 * 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
|
5474 * 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
|
5475 * |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5476 * 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
|
5477 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5478 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5479 do_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5480 int op_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5481 pos_T *pos, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5482 int length, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5483 linenr_T Prenum1) |
7 | 5484 { |
5485 int col; | |
5486 char_u *buf1; | |
5487 char_u buf2[NUMBUFLEN]; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5488 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
7 | 5489 static int hexupper = FALSE; /* 0xABC */ |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5490 uvarnumber_T n; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5491 uvarnumber_T oldn; |
7 | 5492 char_u *ptr; |
5493 int c; | |
5494 int todel; | |
5495 int dohex; | |
5496 int dooct; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5497 int dobin; |
7 | 5498 int doalp; |
5499 int firstdigit; | |
5500 int subtract; | |
6868 | 5501 int negative = FALSE; |
6891 | 5502 int was_positive = TRUE; |
6868 | 5503 int visual = VIsual_active; |
6921 | 5504 int did_change = FALSE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5505 pos_T save_cursor = curwin->w_cursor; |
6927 | 5506 int maxlen = 0; |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5507 pos_T startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5508 pos_T endpos; |
7 | 5509 |
5510 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
5511 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
|
5512 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
7 | 5513 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
5514 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5515 curwin->w_cursor = *pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5516 ptr = ml_get(pos->lnum); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5517 col = pos->col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5518 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5519 if (*ptr == NUL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5520 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5521 |
7 | 5522 /* |
5523 * First check if we are on a hexadecimal number, after the "0x". | |
5524 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5525 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5526 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5527 if (dobin) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5528 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
|
5529 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5530 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5531 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5532 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5533 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
|
5534 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5535 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5536 |
6868 | 5537 if (dohex) |
5538 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
|
5539 { |
6868 | 5540 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5541 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5542 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5543 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
|
5544 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5545 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5546 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5547 if ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5548 && dohex |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5549 && ! ((col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5550 && (ptr[col] == 'X' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5551 || ptr[col] == 'x') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5552 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5553 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5554 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5555 !(*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
|
5556 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5557 && vim_isxdigit(ptr[col + 1])))) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5558 { |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5559 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5560 /* 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
|
5561 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5562 col = pos->col; |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5563 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5564 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
|
5565 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5566 col--; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5567 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5568 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5569 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
|
5570 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5571 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5572 } |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5573 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5574 if (( dohex |
6868 | 5575 && col > 0 |
5576 && (ptr[col] == 'X' | |
5577 || ptr[col] == 'x') | |
5578 && ptr[col - 1] == '0' | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5579 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5580 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5581 !(*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
|
5582 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5583 && vim_isxdigit(ptr[col + 1])) || |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5584 ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5585 && col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5586 && (ptr[col] == 'B' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5587 || ptr[col] == 'b') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5588 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5589 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5590 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5591 !(*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
|
5592 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5593 && vim_isbdigit(ptr[col + 1]))) |
6868 | 5594 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5595 /* Found hexadecimal or binary number, move to its start. */ |
7 | 5596 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5597 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5598 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5599 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
|
5600 #endif |
6868 | 5601 } |
5602 else | |
7 | 5603 { |
6868 | 5604 /* |
5605 * Search forward and then backward to find the start of number. | |
5606 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5607 col = pos->col; |
6868 | 5608 |
5609 while (ptr[col] != NUL | |
5610 && !vim_isdigit(ptr[col]) | |
5611 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5612 col += MB_PTR2LEN(ptr + col); |
6868 | 5613 |
5614 while (col > 0 | |
5615 && vim_isdigit(ptr[col - 1]) | |
5616 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5617 { |
6868 | 5618 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5619 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5620 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5621 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
|
5622 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5623 } |
6868 | 5624 } |
5625 } | |
5626 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5627 if (visual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5628 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5629 while (ptr[col] != NUL && length > 0 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5630 && !vim_isdigit(ptr[col]) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5631 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5632 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5633 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
|
5634 |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5635 col += mb_len; |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5636 length -= mb_len; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5637 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5638 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5639 if (length == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5640 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5641 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5642 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
|
5643 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5644 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5645 !(*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
|
5646 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5647 ) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5648 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5649 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5650 was_positive = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5651 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5652 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5653 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5654 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5655 * 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
|
5656 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5657 firstdigit = ptr[col]; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5658 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
|
5659 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5660 beep_flush(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5661 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5662 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5663 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5664 if (doalp && ASCII_ISALPHA(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5665 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5666 /* decrement or increment alphabetic character */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5667 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5668 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5669 if (CharOrd(firstdigit) < Prenum1) |
6927 | 5670 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5671 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5672 firstdigit = 'A'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5673 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5674 firstdigit = 'a'; |
6927 | 5675 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5676 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5677 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5678 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5679 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5680 firstdigit -= Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5681 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5682 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5683 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5684 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5685 if (26 - CharOrd(firstdigit) - 1 < Prenum1) |
6927 | 5686 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5687 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5688 firstdigit = 'Z'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5689 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5690 firstdigit = 'z'; |
6927 | 5691 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5692 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5693 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5694 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5695 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5696 firstdigit += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5697 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5698 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5699 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5700 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5701 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5702 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5703 (void)del_char(FALSE); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5704 ins_char(firstdigit); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5705 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5706 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5707 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5708 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5709 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5710 if (col > 0 && ptr[col - 1] == '-' |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5711 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5712 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5713 !(*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
|
5714 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5715 && !visual) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5716 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5717 /* negative number */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5718 --col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5719 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5720 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5721 /* get the number value (unsigned) */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5722 if (visual && VIsual_mode != 'V') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5723 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
|
5724 ? (int)STRLEN(ptr) - col |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5725 : length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5726 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5727 vim_str2nr(ptr + col, &pre, &length, |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5728 0 + (dobin ? STR2NR_BIN : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5729 + (dooct ? STR2NR_OCT : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5730 + (dohex ? STR2NR_HEX : 0), |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5731 NULL, &n, maxlen); |
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 /* 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
|
5734 if (pre && negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5735 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5736 ++col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5737 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5738 negative = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5739 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5740 /* add or subtract */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5741 subtract = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5742 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5743 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5744 if (negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5745 subtract ^= TRUE; |
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 oldn = n; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5748 if (subtract) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5749 n -= (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5750 else |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5751 n += (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5752 /* handle wraparound for decimal numbers */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5753 if (!pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5754 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5755 if (subtract) |
6927 | 5756 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5757 if (n > oldn) |
6868 | 5758 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5759 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
|
5760 negative ^= TRUE; |
6868 | 5761 } |
7 | 5762 } |
5763 else | |
6868 | 5764 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5765 /* add */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5766 if (n < oldn) |
6868 | 5767 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5768 n = (n ^ (uvarnumber_T)-1); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5769 negative ^= TRUE; |
6868 | 5770 } |
6927 | 5771 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5772 if (n == 0) |
6868 | 5773 negative = FALSE; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5774 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5775 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5776 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
|
5777 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5778 /* need to remove the '-' */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5779 col--; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5780 length++; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5781 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5782 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5783 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5784 * Delete the old number. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5785 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5786 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5787 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5788 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5789 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5790 todel = length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5791 c = gchar_cursor(); |
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 * 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
|
5794 * 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
|
5795 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5796 if (c == '-') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5797 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5798 while (todel-- > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5799 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5800 if (c < 0x100 && isalpha(c)) |
6868 | 5801 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5802 if (isupper(c)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5803 hexupper = TRUE; |
6868 | 5804 else |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5805 hexupper = FALSE; |
6891 | 5806 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5807 /* 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
|
5808 (void)del_char(FALSE); |
6868 | 5809 c = gchar_cursor(); |
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 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5812 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5813 * Prepare the leading characters in buf1[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5814 * 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
|
5815 * Allocate a bit too much. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5816 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5817 buf1 = alloc((unsigned)length + NUMBUFLEN); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5818 if (buf1 == NULL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5819 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5820 ptr = buf1; |
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
5821 if (negative && (!visual || was_positive)) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5822 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5823 *ptr++ = '-'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5824 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5825 if (pre) |
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 *ptr++ = '0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5828 --length; |
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 if (pre == 'b' || pre == 'B' || |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5831 pre == 'x' || pre == 'X') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5832 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5833 *ptr++ = pre; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5834 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5835 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5836 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5837 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5838 * Put the number characters in buf2[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5839 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5840 if (pre == 'b' || pre == 'B') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5841 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5842 int i; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5843 int bit = 0; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5844 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
|
5845 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5846 /* leading zeros */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5847 for (bit = bits; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5848 if ((n >> (bit - 1)) & 0x1) break; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5849 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5850 for (i = 0; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5851 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
|
5852 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5853 buf2[i] = '\0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5854 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5855 else if (pre == 0) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5856 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
|
5857 else if (pre == '0') |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5858 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
|
5859 else if (pre && hexupper) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5860 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
|
5861 else |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5862 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
|
5863 length -= (int)STRLEN(buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5864 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5865 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5866 * 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
|
5867 * 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
|
5868 * Don't do this when |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5869 * 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
|
5870 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5871 if (firstdigit == '0' && !(dooct && pre == 0)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5872 while (length-- > 0) |
6868 | 5873 *ptr++ = '0'; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5874 *ptr = NUL; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5875 STRCAT(buf1, buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5876 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
|
5877 vim_free(buf1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5878 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5879 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
|
5880 --curwin->w_cursor.col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5881 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5882 |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5883 if (did_change) |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5884 { |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5885 /* set the '[ and '] marks */ |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5886 curbuf->b_op_start = startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5887 curbuf->b_op_end = endpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5888 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
|
5889 --curbuf->b_op_end.col; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5890 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5891 |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5892 theend: |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5893 if (visual) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5894 curwin->w_cursor = save_cursor; |
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5895 else if (did_change) |
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5896 curwin->w_set_curswant = TRUE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5897 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5898 return did_change; |
7 | 5899 } |
5900 | |
5901 #ifdef FEAT_VIMINFO | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5902 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5903 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
|
5904 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5905 #define REG_PREVIOUS 1 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5906 #define REG_EXEC 2 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5907 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5908 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5909 * 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
|
5910 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5911 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5912 prepare_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5913 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5914 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
|
5915 * (int)sizeof(yankreg_T)); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5916 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5917 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5918 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5919 finish_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5920 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5921 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5922 int j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5923 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5924 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5925 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5926 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
|
5927 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
|
5928 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5929 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
|
5930 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
|
5931 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
|
5932 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5933 vim_free(y_read_regs); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5934 y_read_regs = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5935 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5936 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5937 |
7 | 5938 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5939 read_viminfo_register(vir_T *virp, int force) |
7 | 5940 { |
5941 int eof; | |
5942 int do_it = TRUE; | |
5943 int size; | |
5944 int limit; | |
5945 int i; | |
5946 int set_prev = FALSE; | |
5947 char_u *str; | |
5948 char_u **array = NULL; | |
6508 | 5949 int new_type = MCHAR; /* init to shut up compiler */ |
5950 colnr_T new_width = 0; /* init to shut up compiler */ | |
7 | 5951 |
5952 /* We only get here (hopefully) if line[0] == '"' */ | |
5953 str = virp->vir_line + 1; | |
1893 | 5954 |
5955 /* If the line starts with "" this is the y_previous register. */ | |
7 | 5956 if (*str == '"') |
5957 { | |
5958 set_prev = TRUE; | |
5959 str++; | |
5960 } | |
1893 | 5961 |
7 | 5962 if (!ASCII_ISALNUM(*str) && *str != '-') |
5963 { | |
5964 if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line)) | |
5965 return TRUE; /* too many errors, pretend end-of-file */ | |
5966 do_it = FALSE; | |
5967 } | |
5968 get_yank_register(*str++, FALSE); | |
5969 if (!force && y_current->y_array != NULL) | |
5970 do_it = FALSE; | |
1893 | 5971 |
5972 if (*str == '@') | |
5973 { | |
5974 /* "x@: register x used for @@ */ | |
5975 if (force || execreg_lastc == NUL) | |
5976 execreg_lastc = str[-1]; | |
5977 } | |
5978 | |
7 | 5979 size = 0; |
5980 limit = 100; /* Optimized for registers containing <= 100 lines */ | |
5981 if (do_it) | |
5982 { | |
6462 | 5983 /* |
5984 * Build the new register in array[]. | |
5985 * y_array is kept as-is until done. | |
5986 * The "do_it" flag is reset when something is wrong, in which case | |
5987 * array[] needs to be freed. | |
5988 */ | |
7 | 5989 if (set_prev) |
5990 y_previous = y_current; | |
6462 | 5991 array = (char_u **)alloc((unsigned)(limit * sizeof(char_u *))); |
1893 | 5992 str = skipwhite(skiptowhite(str)); |
7 | 5993 if (STRNCMP(str, "CHAR", 4) == 0) |
6462 | 5994 new_type = MCHAR; |
7 | 5995 else if (STRNCMP(str, "BLOCK", 5) == 0) |
6462 | 5996 new_type = MBLOCK; |
7 | 5997 else |
6462 | 5998 new_type = MLINE; |
7 | 5999 /* get the block width; if it's missing we get a zero, which is OK */ |
6000 str = skipwhite(skiptowhite(str)); | |
6462 | 6001 new_width = getdigits(&str); |
7 | 6002 } |
6003 | |
6004 while (!(eof = viminfo_readline(virp)) | |
6005 && (virp->vir_line[0] == TAB || virp->vir_line[0] == '<')) | |
6006 { | |
6007 if (do_it) | |
6008 { | |
6462 | 6009 if (size == limit) |
7 | 6010 { |
6462 | 6011 char_u **new_array = (char_u **) |
7 | 6012 alloc((unsigned)(limit * 2 * sizeof(char_u *))); |
6462 | 6013 |
6014 if (new_array == NULL) | |
6015 { | |
6016 do_it = FALSE; | |
6017 break; | |
6018 } | |
7 | 6019 for (i = 0; i < limit; i++) |
6462 | 6020 new_array[i] = array[i]; |
7 | 6021 vim_free(array); |
6462 | 6022 array = new_array; |
7 | 6023 limit *= 2; |
6024 } | |
6025 str = viminfo_readstring(virp, 1, TRUE); | |
6026 if (str != NULL) | |
6027 array[size++] = str; | |
6028 else | |
6462 | 6029 /* error, don't store the result */ |
7 | 6030 do_it = FALSE; |
6031 } | |
6032 } | |
6508 | 6033 |
7 | 6034 if (do_it) |
6035 { | |
6462 | 6036 /* free y_array[] */ |
6037 for (i = 0; i < y_current->y_size; i++) | |
6038 vim_free(y_current->y_array[i]); | |
6039 vim_free(y_current->y_array); | |
6040 | |
6041 y_current->y_type = new_type; | |
6042 y_current->y_width = new_width; | |
6043 y_current->y_size = size; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6044 y_current->y_time_set = 0; |
7 | 6045 if (size == 0) |
6046 { | |
6047 y_current->y_array = NULL; | |
6048 } | |
6462 | 6049 else |
7 | 6050 { |
6462 | 6051 /* Move the lines from array[] to y_array[]. */ |
7 | 6052 y_current->y_array = |
6053 (char_u **)alloc((unsigned)(size * sizeof(char_u *))); | |
6054 for (i = 0; i < size; i++) | |
6462 | 6055 { |
6056 if (y_current->y_array == NULL) | |
6057 vim_free(array[i]); | |
6058 else | |
6059 y_current->y_array[i] = array[i]; | |
6060 } | |
7 | 6061 } |
6462 | 6062 } |
6063 else | |
6064 { | |
6065 /* Free array[] if it was filled. */ | |
6066 for (i = 0; i < size; i++) | |
6067 vim_free(array[i]); | |
6068 } | |
6069 vim_free(array); | |
6070 | |
7 | 6071 return eof; |
6072 } | |
6073 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6074 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6075 * 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
|
6076 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6077 void |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6078 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
|
6079 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6080 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
|
6081 int flags; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6082 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6083 int type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6084 int linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6085 int width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6086 time_t timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6087 yankreg_T *y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6088 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6089 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6090 /* Check the format: |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6091 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6092 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6093 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6094 if (values->ga_len < 6 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6095 || vp[0].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6096 || vp[1].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6097 || vp[2].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6098 || vp[3].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6099 || vp[4].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6100 || vp[5].bv_type != BVAL_NR) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6101 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6102 flags = vp[0].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6103 name = vp[1].bv_nr; |
9307
eb52a2670c96
commit https://github.com/vim/vim/commit/67e3720a9ddd8a9d2e8344358c28fa1f4196db0d
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
6104 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
|
6105 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6106 type = vp[2].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6107 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
|
6108 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6109 linecount = vp[3].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6110 if (values->ga_len < 6 + linecount) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6111 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6112 width = vp[4].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6113 if (width < 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6114 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6115 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6116 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6117 /* 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
|
6118 * 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
|
6119 y_ptr = &y_read_regs[name]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6120 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6121 y_ptr = &y_regs[name]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6122 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6123 /* 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
|
6124 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
|
6125 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
|
6126 && (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
|
6127 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6128 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6129 if (y_ptr->y_array != NULL) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6130 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
|
6131 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
|
6132 vim_free(y_ptr->y_array); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6133 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6134 if (y_read_regs == NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6135 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6136 if (flags & REG_PREVIOUS) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6137 y_previous = y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6138 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
|
6139 execreg_lastc = get_register_name(name); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6140 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6141 y_ptr->y_type = type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6142 y_ptr->y_width = width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6143 y_ptr->y_size = linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6144 y_ptr->y_time_set = timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6145 if (linecount == 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6146 y_ptr->y_array = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6147 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6148 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6149 y_ptr->y_array = |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6150 (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
|
6151 for (i = 0; i < linecount; i++) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6152 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6153 if (vp[i + 6].bv_allocated) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6154 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6155 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
|
6156 vp[i + 6].bv_string = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6157 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6158 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6159 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
|
6160 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6161 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6162 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6163 |
7 | 6164 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6165 write_viminfo_registers(FILE *fp) |
7 | 6166 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6167 int i, j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6168 char_u *type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6169 char_u c; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6170 int num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6171 int max_num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6172 int max_kbyte; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6173 long len; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6174 yankreg_T *y_ptr; |
7 | 6175 |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
6176 fputs(_("\n# Registers:\n"), fp); |
7 | 6177 |
6178 /* Get '<' value, use old '"' value if '<' is not found. */ | |
6179 max_num_lines = get_viminfo_parameter('<'); | |
6180 if (max_num_lines < 0) | |
6181 max_num_lines = get_viminfo_parameter('"'); | |
6182 if (max_num_lines == 0) | |
6183 return; | |
6184 max_kbyte = get_viminfo_parameter('s'); | |
6185 if (max_kbyte == 0) | |
6186 return; | |
1893 | 6187 |
7 | 6188 for (i = 0; i < NUM_REGISTERS; i++) |
6189 { | |
6190 #ifdef FEAT_CLIPBOARD | |
6191 /* Skip '*'/'+' register, we don't want them back next time */ | |
6192 if (i == STAR_REGISTER || i == PLUS_REGISTER) | |
6193 continue; | |
6194 #endif | |
6195 #ifdef FEAT_DND | |
6196 /* Neither do we want the '~' register */ | |
6197 if (i == TILDE_REGISTER) | |
6198 continue; | |
6199 #endif | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6200 /* 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
|
6201 * viminfo if it's newer. */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6202 if (y_read_regs != NULL |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6203 && 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
|
6204 && (y_regs[i].y_array == NULL || |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6205 y_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
|
6206 y_ptr = &y_read_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6207 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
|
6208 continue; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6209 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6210 y_ptr = &y_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6211 |
55 | 6212 /* Skip empty registers. */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6213 num_lines = y_ptr->y_size; |
55 | 6214 if (num_lines == 0 |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6215 || (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
|
6216 && *y_ptr->y_array[0] == NUL)) |
55 | 6217 continue; |
6218 | |
7 | 6219 if (max_kbyte > 0) |
6220 { | |
6221 /* Skip register if there is more text than the maximum size. */ | |
6222 len = 0; | |
6223 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
|
6224 len += (long)STRLEN(y_ptr->y_array[j]) + 1L; |
7 | 6225 if (len > (long)max_kbyte * 1024L) |
6226 continue; | |
6227 } | |
6228 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6229 switch (y_ptr->y_type) |
7 | 6230 { |
6231 case MLINE: | |
6232 type = (char_u *)"LINE"; | |
6233 break; | |
6234 case MCHAR: | |
6235 type = (char_u *)"CHAR"; | |
6236 break; | |
6237 case MBLOCK: | |
6238 type = (char_u *)"BLOCK"; | |
6239 break; | |
6240 default: | |
6241 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
|
6242 y_ptr->y_type); |
7 | 6243 emsg(IObuff); |
6244 type = (char_u *)"LINE"; | |
6245 break; | |
6246 } | |
6247 if (y_previous == &y_regs[i]) | |
6248 fprintf(fp, "\""); | |
6249 c = get_register_name(i); | |
1893 | 6250 fprintf(fp, "\"%c", c); |
6251 if (c == execreg_lastc) | |
6252 fprintf(fp, "@"); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6253 fprintf(fp, "\t%s\t%d\n", type, (int)y_ptr->y_width); |
7 | 6254 |
6255 /* If max_num_lines < 0, then we save ALL the lines in the register */ | |
6256 if (max_num_lines > 0 && num_lines > max_num_lines) | |
6257 num_lines = max_num_lines; | |
6258 for (j = 0; j < num_lines; j++) | |
6259 { | |
6260 putc('\t', fp); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6261 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
|
6262 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6263 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6264 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6265 int flags = 0; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6266 int remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6267 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6268 /* 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
|
6269 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6270 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6271 * 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
|
6272 * REG_EXEC - used for @@ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6273 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6274 if (y_previous == &y_regs[i]) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6275 flags |= REG_PREVIOUS; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6276 if (c == execreg_lastc) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6277 flags |= REG_EXEC; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6278 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
|
6279 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
|
6280 (long)y_ptr->y_time_set); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6281 /* 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
|
6282 remaining = LSIZE - 71; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6283 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
|
6284 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6285 putc(',', fp); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6286 --remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6287 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
|
6288 remaining); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6289 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6290 putc('\n', fp); |
7 | 6291 } |
6292 } | |
6293 } | |
6294 #endif /* FEAT_VIMINFO */ | |
6295 | |
6296 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
6297 /* | |
6298 * SELECTION / PRIMARY ('*') | |
6299 * | |
6300 * Text selection stuff that uses the GUI selection register '*'. When using a | |
6301 * GUI this may be text from another window, otherwise it is the last text we | |
6302 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
6303 * button performs the paste, otherwise you will need to do <"*p>. " | |
6304 * If not under X, it is synonymous with the clipboard register '+'. | |
6305 * | |
6306 * X CLIPBOARD ('+') | |
6307 * | |
6308 * Text selection stuff that uses the GUI clipboard register '+'. | |
6309 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
6310 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
6311 * otherwise you will need to do <"+p>. " | |
6312 * If not under X, it is synonymous with the selection register '*'. | |
6313 */ | |
6314 | |
6315 /* | |
6316 * 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
|
6317 * so that the text is still available after Vim has exited. X selections |
7 | 6318 * only exist while the owning application exists, so we write to the |
6319 * permanent (while X runs) store CUT_BUFFER0. | |
6320 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
6321 * 'permanent' of the two), otherwise the PRIMARY one. | |
6322 * For now, use a hard-coded sanity limit of 1Mb of data. | |
6323 */ | |
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
6324 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
7 | 6325 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6326 x11_export_final_selection(void) |
7 | 6327 { |
6328 Display *dpy; | |
6329 char_u *str = NULL; | |
6330 long_u len = 0; | |
6331 int motion_type = -1; | |
6332 | |
6333 # ifdef FEAT_GUI | |
6334 if (gui.in_use) | |
6335 dpy = X_DISPLAY; | |
6336 else | |
6337 # endif | |
6338 # ifdef FEAT_XCLIPBOARD | |
6339 dpy = xterm_dpy; | |
6340 # else | |
6341 return; | |
6342 # endif | |
6343 | |
6344 /* Get selection to export */ | |
6345 if (clip_plus.owned) | |
6346 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
6347 else if (clip_star.owned) | |
6348 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
6349 | |
6350 /* Check it's OK */ | |
6351 if (dpy != NULL && str != NULL && motion_type >= 0 | |
6352 && len < 1024*1024 && len > 0) | |
6353 { | |
1924 | 6354 #ifdef FEAT_MBYTE |
4201 | 6355 int ok = TRUE; |
6356 | |
1924 | 6357 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
6358 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
6359 * encoding conversion usually doesn't work, so keep the text as-is. | |
6360 */ | |
6361 if (has_mbyte) | |
6362 { | |
6363 vimconv_T vc; | |
6364 | |
6365 vc.vc_type = CONV_NONE; | |
6366 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
6367 { | |
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6368 int intlen = len; |
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6369 char_u *conv_str; |
2007 | 6370 |
4201 | 6371 vc.vc_fail = TRUE; |
2007 | 6372 conv_str = string_convert(&vc, str, &intlen); |
6373 len = intlen; | |
1924 | 6374 if (conv_str != NULL) |
6375 { | |
6376 vim_free(str); | |
6377 str = conv_str; | |
6378 } | |
4201 | 6379 else |
6380 { | |
6381 ok = FALSE; | |
6382 } | |
1924 | 6383 convert_setup(&vc, NULL, NULL); |
6384 } | |
4201 | 6385 else |
6386 { | |
6387 ok = FALSE; | |
6388 } | |
1924 | 6389 } |
4201 | 6390 |
6391 /* Do not store the string if conversion failed. Better to use any | |
6392 * other selection than garbled text. */ | |
6393 if (ok) | |
6394 #endif | |
6395 { | |
6396 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
6397 XFlush(dpy); | |
6398 } | |
7 | 6399 } |
6400 | |
6401 vim_free(str); | |
6402 } | |
6403 #endif | |
6404 | |
6405 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6406 clip_free_selection(VimClipboard *cbd) |
7 | 6407 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6408 yankreg_T *y_ptr = y_current; |
7 | 6409 |
6410 if (cbd == &clip_plus) | |
6411 y_current = &y_regs[PLUS_REGISTER]; | |
6412 else | |
6413 y_current = &y_regs[STAR_REGISTER]; | |
6414 free_yank_all(); | |
6415 y_current->y_size = 0; | |
6416 y_current = y_ptr; | |
6417 } | |
6418 | |
6419 /* | |
6420 * Get the selected text and put it in the gui selection register '*' or '+'. | |
6421 */ | |
6422 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6423 clip_get_selection(VimClipboard *cbd) |
7 | 6424 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6425 yankreg_T *old_y_previous, *old_y_current; |
7 | 6426 pos_T old_cursor; |
6427 pos_T old_visual; | |
6428 int old_visual_mode; | |
6429 colnr_T old_curswant; | |
6430 int old_set_curswant; | |
6431 pos_T old_op_start, old_op_end; | |
6432 oparg_T oa; | |
6433 cmdarg_T ca; | |
6434 | |
6435 if (cbd->owned) | |
6436 { | |
6437 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
6438 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
6439 return; | |
6440 | |
6441 /* Get the text between clip_star.start & clip_star.end */ | |
6442 old_y_previous = y_previous; | |
6443 old_y_current = y_current; | |
6444 old_cursor = curwin->w_cursor; | |
6445 old_curswant = curwin->w_curswant; | |
6446 old_set_curswant = curwin->w_set_curswant; | |
6447 old_op_start = curbuf->b_op_start; | |
6448 old_op_end = curbuf->b_op_end; | |
6449 old_visual = VIsual; | |
6450 old_visual_mode = VIsual_mode; | |
6451 clear_oparg(&oa); | |
6452 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
6453 oa.op_type = OP_YANK; | |
6454 vim_memset(&ca, 0, sizeof(ca)); | |
6455 ca.oap = &oa; | |
6456 ca.cmdchar = 'y'; | |
6457 ca.count1 = 1; | |
6458 ca.retval = CA_NO_ADJ_OP_END; | |
6459 do_pending_operator(&ca, 0, TRUE); | |
6460 y_previous = old_y_previous; | |
6461 y_current = old_y_current; | |
6462 curwin->w_cursor = old_cursor; | |
688 | 6463 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
7 | 6464 curwin->w_curswant = old_curswant; |
6465 curwin->w_set_curswant = old_set_curswant; | |
6466 curbuf->b_op_start = old_op_start; | |
6467 curbuf->b_op_end = old_op_end; | |
6468 VIsual = old_visual; | |
6469 VIsual_mode = old_visual_mode; | |
6470 } | |
11273
96d83cd2904a
patch 8.0.0522: Win32: when 'clipboard' is "unnamed" yyp does not work
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
6471 else if (!is_clipboard_needs_update()) |
7 | 6472 { |
6473 clip_free_selection(cbd); | |
6474 | |
6475 /* Try to get selected text from another window */ | |
6476 clip_gen_request_selection(cbd); | |
6477 } | |
6478 } | |
6479 | |
2896 | 6480 /* |
6481 * Convert from the GUI selection string into the '*'/'+' register. | |
6482 */ | |
7 | 6483 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6484 clip_yank_selection( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6485 int type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6486 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6487 long len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6488 VimClipboard *cbd) |
7 | 6489 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6490 yankreg_T *y_ptr; |
7 | 6491 |
6492 if (cbd == &clip_plus) | |
6493 y_ptr = &y_regs[PLUS_REGISTER]; | |
6494 else | |
6495 y_ptr = &y_regs[STAR_REGISTER]; | |
6496 | |
6497 clip_free_selection(cbd); | |
6498 | |
5798 | 6499 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
7 | 6500 } |
6501 | |
6502 /* | |
6503 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
6504 * with length *len. | |
6505 * Returns the motion type, or -1 for failure. | |
6506 */ | |
6507 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6508 clip_convert_selection(char_u **str, long_u *len, VimClipboard *cbd) |
7 | 6509 { |
6510 char_u *p; | |
6511 int lnum; | |
6512 int i, j; | |
6513 int_u eolsize; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6514 yankreg_T *y_ptr; |
7 | 6515 |
6516 if (cbd == &clip_plus) | |
6517 y_ptr = &y_regs[PLUS_REGISTER]; | |
6518 else | |
6519 y_ptr = &y_regs[STAR_REGISTER]; | |
6520 | |
6521 #ifdef USE_CRNL | |
6522 eolsize = 2; | |
6523 #else | |
6524 eolsize = 1; | |
6525 #endif | |
6526 | |
6527 *str = NULL; | |
6528 *len = 0; | |
6529 if (y_ptr->y_array == NULL) | |
6530 return -1; | |
6531 | |
6532 for (i = 0; i < y_ptr->y_size; i++) | |
6533 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
6534 | |
6535 /* | |
6536 * Don't want newline character at end of last line if we're in MCHAR mode. | |
6537 */ | |
6538 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
6539 *len -= eolsize; | |
6540 | |
6541 p = *str = lalloc(*len + 1, TRUE); /* add one to avoid zero */ | |
6542 if (p == NULL) | |
6543 return -1; | |
6544 lnum = 0; | |
6545 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
6546 { | |
6547 if (y_ptr->y_array[lnum][j] == '\n') | |
6548 p[i] = NUL; | |
6549 else if (y_ptr->y_array[lnum][j] == NUL) | |
6550 { | |
6551 #ifdef USE_CRNL | |
6552 p[i++] = '\r'; | |
6553 #endif | |
6554 #ifdef USE_CR | |
6555 p[i] = '\r'; | |
6556 #else | |
6557 p[i] = '\n'; | |
6558 #endif | |
6559 lnum++; | |
6560 j = -1; | |
6561 } | |
6562 else | |
6563 p[i] = y_ptr->y_array[lnum][j]; | |
6564 } | |
6565 return y_ptr->y_type; | |
6566 } | |
6567 | |
6568 | |
6569 /* | |
6570 * If we have written to a clipboard register, send the text to the clipboard. | |
6571 */ | |
6572 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6573 may_set_selection(void) |
7 | 6574 { |
6575 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
6576 { | |
6577 clip_own_selection(&clip_star); | |
6578 clip_gen_set_selection(&clip_star); | |
6579 } | |
6580 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
6581 { | |
6582 clip_own_selection(&clip_plus); | |
6583 clip_gen_set_selection(&clip_plus); | |
6584 } | |
6585 } | |
6586 | |
6587 #endif /* FEAT_CLIPBOARD || PROTO */ | |
6588 | |
6589 | |
6590 #if defined(FEAT_DND) || defined(PROTO) | |
6591 /* | |
6592 * Replace the contents of the '~' register with str. | |
6593 */ | |
6594 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6595 dnd_yank_drag_data(char_u *str, long len) |
7 | 6596 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6597 yankreg_T *curr; |
7 | 6598 |
6599 curr = y_current; | |
6600 y_current = &y_regs[TILDE_REGISTER]; | |
6601 free_yank_all(); | |
5798 | 6602 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
7 | 6603 y_current = curr; |
6604 } | |
6605 #endif | |
6606 | |
6607 | |
6608 #if defined(FEAT_EVAL) || defined(PROTO) | |
6609 /* | |
6610 * Return the type of a register. | |
6611 * Used for getregtype() | |
6612 * Returns MAUTO for error. | |
6613 */ | |
6614 char_u | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6615 get_reg_type(int regname, long *reglen) |
7 | 6616 { |
6617 switch (regname) | |
6618 { | |
6619 case '%': /* file name */ | |
6620 case '#': /* alternate file name */ | |
6621 case '=': /* expression */ | |
6622 case ':': /* last command line */ | |
6623 case '/': /* last search-pattern */ | |
6624 case '.': /* last inserted text */ | |
6625 #ifdef FEAT_SEARCHPATH | |
6626 case Ctrl_F: /* Filename under cursor */ | |
6627 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
6628 #endif | |
6629 case Ctrl_W: /* word under cursor */ | |
6630 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
6631 case '_': /* black hole: always empty */ | |
6632 return MCHAR; | |
6633 } | |
6634 | |
6635 #ifdef FEAT_CLIPBOARD | |
6636 regname = may_get_selection(regname); | |
6637 #endif | |
6638 | |
5596 | 6639 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
|
6640 return MAUTO; |
5596 | 6641 |
7 | 6642 get_yank_register(regname, FALSE); |
6643 | |
6644 if (y_current->y_array != NULL) | |
6645 { | |
6646 if (reglen != NULL && y_current->y_type == MBLOCK) | |
6647 *reglen = y_current->y_width; | |
6648 return y_current->y_type; | |
6649 } | |
6650 return MAUTO; | |
6651 } | |
6652 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
6653 static char_u *getreg_wrap_one_line(char_u *s, int flags); |
5796 | 6654 |
6655 /* | |
6656 * When "flags" has GREG_LIST return a list with text "s". | |
6657 * Otherwise just return "s". | |
6658 */ | |
6659 static char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6660 getreg_wrap_one_line(char_u *s, int flags) |
5796 | 6661 { |
6662 if (flags & GREG_LIST) | |
6663 { | |
6664 list_T *list = list_alloc(); | |
6665 | |
6666 if (list != NULL) | |
6667 { | |
6668 if (list_append_string(list, NULL, -1) == FAIL) | |
6669 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6670 list_free(list); |
5796 | 6671 return NULL; |
6672 } | |
6673 list->lv_first->li_tv.vval.v_string = s; | |
6674 } | |
6675 return (char_u *)list; | |
6676 } | |
6677 return s; | |
6678 } | |
6679 | |
7 | 6680 /* |
6681 * Return the contents of a register as a single allocated string. | |
6682 * Used for "@r" in expressions and for getreg(). | |
6683 * Returns NULL for error. | |
5796 | 6684 * Flags: |
6685 * GREG_NO_EXPR Do not allow expression register | |
6686 * GREG_EXPR_SRC For the expression register: return expression itself, | |
6687 * not the result of its evaluation. | |
6688 * GREG_LIST Return a list of lines in place of a single string. | |
7 | 6689 */ |
6690 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6691 get_reg_contents(int regname, int flags) |
7 | 6692 { |
6693 long i; | |
6694 char_u *retval; | |
6695 int allocated; | |
6696 long len; | |
6697 | |
6698 /* Don't allow using an expression register inside an expression */ | |
6699 if (regname == '=') | |
6700 { | |
5796 | 6701 if (flags & GREG_NO_EXPR) |
6702 return NULL; | |
6703 if (flags & GREG_EXPR_SRC) | |
6704 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
6705 return getreg_wrap_one_line(get_expr_line(), flags); | |
7 | 6706 } |
6707 | |
6708 if (regname == '@') /* "@@" is used for unnamed register */ | |
6709 regname = '"'; | |
6710 | |
6711 /* check for valid regname */ | |
6712 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
6713 return NULL; | |
6714 | |
6715 #ifdef FEAT_CLIPBOARD | |
6716 regname = may_get_selection(regname); | |
6717 #endif | |
6718 | |
6719 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
6720 { | |
6721 if (retval == NULL) | |
6722 return NULL; | |
5796 | 6723 if (allocated) |
6724 return getreg_wrap_one_line(retval, flags); | |
6725 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
7 | 6726 } |
6727 | |
6728 get_yank_register(regname, FALSE); | |
6729 if (y_current->y_array == NULL) | |
6730 return NULL; | |
6731 | |
5796 | 6732 if (flags & GREG_LIST) |
6733 { | |
6734 list_T *list = list_alloc(); | |
6735 int error = FALSE; | |
6736 | |
6737 if (list == NULL) | |
6738 return NULL; | |
6739 for (i = 0; i < y_current->y_size; ++i) | |
6740 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
6741 error = TRUE; | |
6742 if (error) | |
6743 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6744 list_free(list); |
5796 | 6745 return NULL; |
6746 } | |
6747 return (char_u *)list; | |
6748 } | |
6749 | |
7 | 6750 /* |
6751 * Compute length of resulting string. | |
6752 */ | |
6753 len = 0; | |
6754 for (i = 0; i < y_current->y_size; ++i) | |
6755 { | |
6756 len += (long)STRLEN(y_current->y_array[i]); | |
6757 /* | |
6758 * Insert a newline between lines and after last line if | |
6759 * y_type is MLINE. | |
6760 */ | |
6761 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6762 ++len; | |
6763 } | |
6764 | |
6765 retval = lalloc(len + 1, TRUE); | |
6766 | |
6767 /* | |
6768 * Copy the lines of the yank register into the string. | |
6769 */ | |
6770 if (retval != NULL) | |
6771 { | |
6772 len = 0; | |
6773 for (i = 0; i < y_current->y_size; ++i) | |
6774 { | |
6775 STRCPY(retval + len, y_current->y_array[i]); | |
6776 len += (long)STRLEN(retval + len); | |
6777 | |
6778 /* | |
6779 * Insert a NL between lines and after the last line if y_type is | |
6780 * MLINE. | |
6781 */ | |
6782 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6783 retval[len++] = '\n'; | |
6784 } | |
6785 retval[len] = NUL; | |
6786 } | |
6787 | |
6788 return retval; | |
6789 } | |
6790 | |
5798 | 6791 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6792 init_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6793 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6794 yankreg_T **old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6795 yankreg_T **old_y_current, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6796 int must_append, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6797 int *yank_type UNUSED) |
5798 | 6798 { |
6799 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
6800 { | |
6801 emsg_invreg(name); | |
6802 return FAIL; | |
6803 } | |
6804 | |
6805 /* Don't want to change the current (unnamed) register */ | |
6806 *old_y_previous = y_previous; | |
6807 *old_y_current = y_current; | |
6808 | |
6809 get_yank_register(name, TRUE); | |
6810 if (!y_append && !must_append) | |
6811 free_yank_all(); | |
6812 return OK; | |
6813 } | |
6814 | |
6815 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6816 finish_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6817 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6818 yankreg_T *old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6819 yankreg_T *old_y_current) |
5798 | 6820 { |
6821 # ifdef FEAT_CLIPBOARD | |
6822 /* Send text of clipboard register to the clipboard. */ | |
6823 may_set_selection(); | |
6824 # endif | |
6825 | |
6826 /* ':let @" = "val"' should change the meaning of the "" register */ | |
6827 if (name != '"') | |
6828 y_previous = old_y_previous; | |
6829 y_current = old_y_current; | |
6830 } | |
6831 | |
7 | 6832 /* |
6833 * Store string "str" in register "name". | |
6834 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
6835 * If "must_append" is TRUE, always append to the register. Otherwise append | |
6836 * if "name" is an uppercase letter. | |
6837 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
6838 * Careful: 'str' is modified, you may have to use a copy! | |
6839 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
6840 */ | |
6841 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6842 write_reg_contents( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6843 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6844 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6845 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6846 int must_append) |
7 | 6847 { |
6848 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
6849 } | |
6850 | |
6851 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6852 write_reg_contents_lst( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6853 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6854 char_u **strings, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6855 int maxlen UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6856 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6857 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6858 long block_len) |
5798 | 6859 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6860 yankreg_T *old_y_previous, *old_y_current; |
5798 | 6861 |
6862 if (name == '/' | |
6863 #ifdef FEAT_EVAL | |
6864 || name == '=' | |
6865 #endif | |
6866 ) | |
6867 { | |
6868 char_u *s; | |
6869 | |
6870 if (strings[0] == NULL) | |
6871 s = (char_u *)""; | |
6872 else if (strings[1] != NULL) | |
6873 { | |
6874 EMSG(_("E883: search pattern and expression register may not " | |
6875 "contain two or more lines")); | |
6876 return; | |
6877 } | |
6878 else | |
6879 s = strings[0]; | |
6880 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
6881 return; | |
6882 } | |
6883 | |
6884 if (name == '_') /* black hole: nothing to do */ | |
6885 return; | |
6886 | |
6887 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
6888 &yank_type) == FAIL) | |
6889 return; | |
6890 | |
6891 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
6892 | |
6893 finish_write_reg(name, old_y_previous, old_y_current); | |
6894 } | |
6895 | |
6896 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6897 write_reg_contents_ex( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6898 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6899 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6900 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6901 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6902 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6903 long block_len) |
7 | 6904 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6905 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
|
6906 long len; |
7 | 6907 |
336 | 6908 if (maxlen >= 0) |
6909 len = maxlen; | |
6910 else | |
6911 len = (long)STRLEN(str); | |
6912 | |
7 | 6913 /* Special case: '/' search pattern */ |
6914 if (name == '/') | |
6915 { | |
6916 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
6917 return; | |
6918 } | |
6919 | |
6557 | 6920 if (name == '#') |
6921 { | |
6922 buf_T *buf; | |
6923 | |
6924 if (VIM_ISDIGIT(*str)) | |
6925 { | |
6926 int num = atoi((char *)str); | |
6927 | |
6928 buf = buflist_findnr(num); | |
6929 if (buf == NULL) | |
6930 EMSGN(_(e_nobufnr), (long)num); | |
6931 } | |
6932 else | |
6933 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
6934 TRUE, FALSE, FALSE)); | |
6935 if (buf == NULL) | |
6936 return; | |
6937 curwin->w_alt_fnum = buf->b_fnum; | |
6938 return; | |
6939 } | |
6940 | |
336 | 6941 #ifdef FEAT_EVAL |
6942 if (name == '=') | |
6943 { | |
6944 char_u *p, *s; | |
6945 | |
6946 p = vim_strnsave(str, (int)len); | |
6947 if (p == NULL) | |
6948 return; | |
6949 if (must_append) | |
6950 { | |
6951 s = concat_str(get_expr_line_src(), p); | |
6952 vim_free(p); | |
6953 p = s; | |
6954 } | |
6955 set_expr_line(p); | |
6956 return; | |
6957 } | |
6958 #endif | |
6959 | |
7 | 6960 if (name == '_') /* black hole: nothing to do */ |
6961 return; | |
6962 | |
5798 | 6963 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
6964 &yank_type) == FAIL) | |
6965 return; | |
6966 | |
6967 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
6968 | |
6969 finish_write_reg(name, old_y_previous, old_y_current); | |
7 | 6970 } |
6971 #endif /* FEAT_EVAL */ | |
6972 | |
6973 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
6974 /* | |
6975 * Put a string into a register. When the register is not empty, the string | |
6976 * is appended. | |
6977 */ | |
6978 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6979 str_to_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6980 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
|
6981 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
|
6982 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
|
6983 long len, /* length of string */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6984 long blocklen, /* width of Visual block */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6985 int str_list) /* TRUE if str is char_u ** */ |
7 | 6986 { |
2896 | 6987 int type; /* MCHAR, MLINE or MBLOCK */ |
7 | 6988 int lnum; |
6989 long start; | |
6990 long i; | |
6991 int extra; | |
6992 int newlines; /* number of lines added */ | |
6993 int extraline = 0; /* extra line at the end */ | |
6994 int append = FALSE; /* append to last line in register */ | |
6995 char_u *s; | |
5798 | 6996 char_u **ss; |
7 | 6997 char_u **pp; |
6998 long maxlen; | |
6999 | |
2000 | 7000 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
7 | 7001 y_ptr->y_size = 0; |
7002 | |
2896 | 7003 if (yank_type == MAUTO) |
5798 | 7004 type = ((str_list || (len > 0 && (str[len - 1] == NL |
7005 || str[len - 1] == CAR))) | |
2896 | 7006 ? MLINE : MCHAR); |
7007 else | |
7008 type = yank_type; | |
7009 | |
7 | 7010 /* |
7011 * Count the number of lines within the string | |
7012 */ | |
7013 newlines = 0; | |
5798 | 7014 if (str_list) |
7015 { | |
7016 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
7 | 7017 ++newlines; |
5798 | 7018 } |
7019 else | |
7020 { | |
7021 for (i = 0; i < len; i++) | |
7022 if (str[i] == '\n') | |
7023 ++newlines; | |
7024 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
7025 { | |
7026 extraline = 1; | |
7027 ++newlines; /* count extra newline at the end */ | |
7028 } | |
7029 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
7030 { | |
7031 append = TRUE; | |
7032 --newlines; /* uncount newline when appending first line */ | |
7033 } | |
7 | 7034 } |
7035 | |
6807 | 7036 /* Without any lines make the register empty. */ |
7037 if (y_ptr->y_size + newlines == 0) | |
7038 { | |
7039 vim_free(y_ptr->y_array); | |
7040 y_ptr->y_array = NULL; | |
7041 return; | |
7042 } | |
7043 | |
7 | 7044 /* |
7045 * Allocate an array to hold the pointers to the new register lines. | |
7046 * If the register was not empty, move the existing lines to the new array. | |
7047 */ | |
7048 pp = (char_u **)lalloc_clear((y_ptr->y_size + newlines) | |
7049 * sizeof(char_u *), TRUE); | |
7050 if (pp == NULL) /* out of memory */ | |
7051 return; | |
7052 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
7053 pp[lnum] = y_ptr->y_array[lnum]; | |
7054 vim_free(y_ptr->y_array); | |
7055 y_ptr->y_array = pp; | |
7056 maxlen = 0; | |
7057 | |
7058 /* | |
7059 * Find the end of each line and save it into the array. | |
7060 */ | |
5798 | 7061 if (str_list) |
7062 { | |
7063 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
7 | 7064 { |
5856 | 7065 i = (long)STRLEN(*ss); |
5798 | 7066 pp[lnum] = vim_strnsave(*ss, i); |
7067 if (i > maxlen) | |
7068 maxlen = i; | |
7 | 7069 } |
5798 | 7070 } |
7071 else | |
7072 { | |
7073 for (start = 0; start < len + extraline; start += i + 1) | |
7 | 7074 { |
5798 | 7075 for (i = start; i < len; ++i) /* find the end of the line */ |
7076 if (str[i] == '\n') | |
7077 break; | |
7078 i -= start; /* i is now length of line */ | |
7079 if (i > maxlen) | |
7080 maxlen = i; | |
7081 if (append) | |
7082 { | |
7083 --lnum; | |
7084 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
7085 } | |
7086 else | |
7087 extra = 0; | |
7088 s = alloc((unsigned)(i + extra + 1)); | |
7089 if (s == NULL) | |
7090 break; | |
7091 if (extra) | |
7092 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
7093 if (append) | |
7094 vim_free(y_ptr->y_array[lnum]); | |
7095 if (i) | |
7096 mch_memmove(s + extra, str + start, (size_t)i); | |
7097 extra += i; | |
7098 s[extra] = NUL; | |
7099 y_ptr->y_array[lnum++] = s; | |
7100 while (--extra >= 0) | |
7101 { | |
7102 if (*s == NUL) | |
7103 *s = '\n'; /* replace NUL with newline */ | |
7104 ++s; | |
7105 } | |
7106 append = FALSE; /* only first line is appended */ | |
7 | 7107 } |
7108 } | |
7109 y_ptr->y_type = type; | |
7110 y_ptr->y_size = lnum; | |
7111 if (type == MBLOCK) | |
7112 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
7113 else | |
7114 y_ptr->y_width = 0; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7115 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7116 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
|
7117 #endif |
7 | 7118 } |
7119 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
7120 | |
7121 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7122 clear_oparg(oparg_T *oap) |
7 | 7123 { |
7124 vim_memset(oap, 0, sizeof(oparg_T)); | |
7125 } | |
7126 | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7127 static varnumber_T line_count_info(char_u *line, varnumber_T *wc, varnumber_T *cc, varnumber_T limit, int eol_size); |
7 | 7128 |
7129 /* | |
161 | 7130 * Count the number of bytes, characters and "words" in a line. |
7 | 7131 * |
7132 * "Words" are counted by looking for boundaries between non-space and | |
7133 * space characters. (it seems to produce results that match 'wc'.) | |
7134 * | |
161 | 7135 * Return value is byte count; word count for the line is added to "*wc". |
7136 * Char count is added to "*cc". | |
7 | 7137 * |
7138 * The function will only examine the first "limit" characters in the | |
7139 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
7140 * case, eol_size will be added to the character count to account for | |
7141 * the size of the EOL character. | |
7142 */ | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7143 static varnumber_T |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7144 line_count_info( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7145 char_u *line, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7146 varnumber_T *wc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7147 varnumber_T *cc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7148 varnumber_T limit, |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7149 int eol_size) |
7 | 7150 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7151 varnumber_T i; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7152 varnumber_T words = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7153 varnumber_T chars = 0; |
7 | 7154 int is_word = 0; |
7155 | |
3626 | 7156 for (i = 0; i < limit && line[i] != NUL; ) |
7 | 7157 { |
7158 if (is_word) | |
7159 { | |
7160 if (vim_isspace(line[i])) | |
7161 { | |
7162 words++; | |
7163 is_word = 0; | |
7164 } | |
7165 } | |
7166 else if (!vim_isspace(line[i])) | |
7167 is_word = 1; | |
161 | 7168 ++chars; |
7169 #ifdef FEAT_MBYTE | |
474 | 7170 i += (*mb_ptr2len)(line + i); |
161 | 7171 #else |
7172 ++i; | |
7173 #endif | |
7 | 7174 } |
7175 | |
7176 if (is_word) | |
7177 words++; | |
7178 *wc += words; | |
7179 | |
7180 /* Add eol_size if the end of line was reached before hitting limit. */ | |
2996 | 7181 if (i < limit && line[i] == NUL) |
161 | 7182 { |
7 | 7183 i += eol_size; |
161 | 7184 chars += eol_size; |
7185 } | |
7186 *cc += chars; | |
7 | 7187 return i; |
7188 } | |
7189 | |
7190 /* | |
7191 * Give some info about the position of the cursor (for "g CTRL-G"). | |
7192 * In Visual mode, give some info about the selected region. (In this case, | |
7193 * 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
|
7194 * When "dict" is not NULL store the info there instead of showing it. |
7 | 7195 */ |
7196 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7197 cursor_pos_info(dict_T *dict) |
7 | 7198 { |
7199 char_u *p; | |
274 | 7200 char_u buf1[50]; |
7201 char_u buf2[40]; | |
7 | 7202 linenr_T lnum; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7203 varnumber_T byte_count = 0; |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7204 #ifdef FEAT_MBYTE |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7205 varnumber_T bom_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7206 #endif |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7207 varnumber_T byte_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7208 varnumber_T char_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7209 varnumber_T char_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7210 varnumber_T word_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7211 varnumber_T word_count_cursor = 0; |
7 | 7212 int eol_size; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7213 varnumber_T last_check = 100000L; |
7 | 7214 long line_count_selected = 0; |
7215 pos_T min_pos, max_pos; | |
7216 oparg_T oparg; | |
7217 struct block_def bd; | |
7218 | |
7219 /* | |
7220 * Compute the length of the file in characters. | |
7221 */ | |
7222 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
7223 { | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7224 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7225 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7226 MSG(_(no_lines_msg)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7227 return; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7228 } |
7 | 7229 } |
7230 else | |
7231 { | |
7232 if (get_fileformat(curbuf) == EOL_DOS) | |
7233 eol_size = 2; | |
7234 else | |
7235 eol_size = 1; | |
7236 | |
7237 if (VIsual_active) | |
7238 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
7239 if (LT_POS(VIsual, curwin->w_cursor)) |
7 | 7240 { |
7241 min_pos = VIsual; | |
7242 max_pos = curwin->w_cursor; | |
7243 } | |
7244 else | |
7245 { | |
7246 min_pos = curwin->w_cursor; | |
7247 max_pos = VIsual; | |
7248 } | |
7249 if (*p_sel == 'e' && max_pos.col > 0) | |
7250 --max_pos.col; | |
7251 | |
7252 if (VIsual_mode == Ctrl_V) | |
7253 { | |
1866 | 7254 #ifdef FEAT_LINEBREAK |
7255 char_u * saved_sbr = p_sbr; | |
7256 | |
7257 /* Make 'sbr' empty for a moment to get the correct size. */ | |
7258 p_sbr = empty_option; | |
7259 #endif | |
7 | 7260 oparg.is_VIsual = 1; |
7261 oparg.block_mode = TRUE; | |
7262 oparg.op_type = OP_NOP; | |
7263 getvcols(curwin, &min_pos, &max_pos, | |
688 | 7264 &oparg.start_vcol, &oparg.end_vcol); |
1866 | 7265 #ifdef FEAT_LINEBREAK |
7266 p_sbr = saved_sbr; | |
7267 #endif | |
688 | 7268 if (curwin->w_curswant == MAXCOL) |
7269 oparg.end_vcol = MAXCOL; | |
7 | 7270 /* Swap the start, end vcol if needed */ |
7271 if (oparg.end_vcol < oparg.start_vcol) | |
7272 { | |
7273 oparg.end_vcol += oparg.start_vcol; | |
7274 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
7275 oparg.end_vcol -= oparg.start_vcol; | |
7276 } | |
7277 } | |
7278 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
7279 } | |
7280 | |
7281 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
7282 { | |
7283 /* Check for a CTRL-C every 100000 characters. */ | |
161 | 7284 if (byte_count > last_check) |
7 | 7285 { |
7286 ui_breakcheck(); | |
7287 if (got_int) | |
7288 return; | |
161 | 7289 last_check = byte_count + 100000L; |
7 | 7290 } |
7291 | |
7292 /* Do extra processing for VIsual mode. */ | |
7293 if (VIsual_active | |
7294 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
7295 { | |
45 | 7296 char_u *s = NULL; |
7297 long len = 0L; | |
7298 | |
7 | 7299 switch (VIsual_mode) |
7300 { | |
7301 case Ctrl_V: | |
5735 | 7302 #ifdef FEAT_VIRTUALEDIT |
7 | 7303 virtual_op = virtual_active(); |
5735 | 7304 #endif |
7 | 7305 block_prep(&oparg, &bd, lnum, 0); |
5735 | 7306 #ifdef FEAT_VIRTUALEDIT |
7 | 7307 virtual_op = MAYBE; |
5735 | 7308 #endif |
45 | 7309 s = bd.textstart; |
7310 len = (long)bd.textlen; | |
7 | 7311 break; |
7312 case 'V': | |
45 | 7313 s = ml_get(lnum); |
7314 len = MAXCOL; | |
7 | 7315 break; |
7316 case 'v': | |
7317 { | |
7318 colnr_T start_col = (lnum == min_pos.lnum) | |
7319 ? min_pos.col : 0; | |
7320 colnr_T end_col = (lnum == max_pos.lnum) | |
7321 ? max_pos.col - start_col + 1 : MAXCOL; | |
7322 | |
45 | 7323 s = ml_get(lnum) + start_col; |
7324 len = end_col; | |
7 | 7325 } |
7326 break; | |
7327 } | |
45 | 7328 if (s != NULL) |
7329 { | |
161 | 7330 byte_count_cursor += line_count_info(s, &word_count_cursor, |
7331 &char_count_cursor, len, eol_size); | |
45 | 7332 if (lnum == curbuf->b_ml.ml_line_count |
7333 && !curbuf->b_p_eol | |
6933 | 7334 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
50 | 7335 && (long)STRLEN(s) < len) |
161 | 7336 byte_count_cursor -= eol_size; |
45 | 7337 } |
7 | 7338 } |
7339 else | |
7340 { | |
7341 /* In non-visual mode, check for the line the cursor is on */ | |
7342 if (lnum == curwin->w_cursor.lnum) | |
7343 { | |
7344 word_count_cursor += word_count; | |
161 | 7345 char_count_cursor += char_count; |
7346 byte_count_cursor = byte_count + | |
7347 line_count_info(ml_get(lnum), | |
7348 &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
|
7349 (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
|
7350 eol_size); |
7 | 7351 } |
7352 } | |
7353 /* Add to the running totals */ | |
161 | 7354 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
|
7355 &char_count, (varnumber_T)MAXCOL, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7356 eol_size); |
7 | 7357 } |
7358 | |
7359 /* Correction for when last line doesn't have an EOL. */ | |
6933 | 7360 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
161 | 7361 byte_count -= eol_size; |
7 | 7362 |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7363 if (dict == NULL) |
7 | 7364 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7365 if (VIsual_active) |
7 | 7366 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7367 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
|
7368 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7369 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
|
7370 &max_pos.col); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7371 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
|
7372 (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
|
7373 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7374 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7375 buf1[0] = NUL; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7376 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7377 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
|
7378 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7379 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7380 _("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
|
7381 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7382 (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
|
7383 word_count_cursor, word_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7384 byte_count_cursor, byte_count); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7385 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7386 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7387 _("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
|
7388 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7389 (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
|
7390 word_count_cursor, word_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7391 char_count_cursor, char_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7392 byte_count_cursor, byte_count); |
7 | 7393 } |
7394 else | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7395 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7396 p = ml_get_curline(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7397 validate_virtcol(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7398 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
|
7399 (int)curwin->w_virtcol + 1); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7400 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
|
7401 linetabsize(p)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7402 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7403 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
|
7404 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7405 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7406 _("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
|
7407 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7408 (long)curwin->w_cursor.lnum, |
7 | 7409 (long)curbuf->b_ml.ml_line_count, |
7410 word_count_cursor, word_count, | |
161 | 7411 byte_count_cursor, byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7412 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7413 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7414 _("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
|
7415 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7416 (long)curwin->w_cursor.lnum, |
161 | 7417 (long)curbuf->b_ml.ml_line_count, |
7418 word_count_cursor, word_count, | |
7419 char_count_cursor, char_count, | |
7420 byte_count_cursor, byte_count); | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7421 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7422 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7423 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7424 #ifdef FEAT_MBYTE |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7425 bom_count = bomb_size(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7426 if (bom_count > 0) |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7427 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
|
7428 _("(+%ld for BOM)"), bom_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7429 #endif |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7430 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7431 { |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7432 /* 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
|
7433 p = p_shm; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7434 p_shm = (char_u *)""; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7435 msg(IObuff); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7436 p_shm = p; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7437 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7438 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7439 #if defined(FEAT_EVAL) |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7440 if (dict != NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7441 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7442 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
|
7443 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
|
7444 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
|
7445 # ifdef FEAT_MBYTE |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7446 + bom_count |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7447 # endif |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7448 , NULL); |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7449 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
|
7450 byte_count_cursor, NULL); |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7451 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
|
7452 char_count_cursor, NULL); |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7453 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
|
7454 word_count_cursor, NULL); |
7 | 7455 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7456 #endif |
7 | 7457 } |