Mercurial > vim
annotate src/ops.c @ 10486:99896ee0cac5 v8.0.0136
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jan 2 14:57:08 2017 +0100
patch 8.0.0136
Problem: When using indent folding and changing indent the wrong fold is
opened. (Jonathan Fudger)
Solution: Open the fold under the cursor a bit later. (Christian Brabandt)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Mon, 02 Jan 2017 15:00:04 +0100 |
parents | b2dbe79639a2 |
children | 1e700d72561d |
rev | line source |
---|---|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9834
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
7 | 2 * |
3 * VIM - Vi IMproved by Bram Moolenaar | |
4 * | |
5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
6 * Do ":help credits" in Vim to see a list of people who contributed. | |
7 * See README.txt for an overview of the Vim source code. | |
8 */ | |
9 | |
10 /* | |
11 * ops.c: implementation of various operators: op_shift, op_delete, op_tilde, | |
12 * op_change, op_yank, do_put, do_join | |
13 */ | |
14 | |
15 #include "vim.h" | |
16 | |
17 /* | |
18 * Number of registers. | |
19 * 0 = unnamed register, for normal yanks and puts | |
20 * 1..9 = registers '1' to '9', for deletes | |
21 * 10..35 = registers 'a' to 'z' | |
22 * 36 = delete register '-' | |
23 * 37 = Selection register '*'. Only if FEAT_CLIPBOARD defined | |
24 * 38 = Clipboard register '+'. Only if FEAT_CLIPBOARD and FEAT_X11 defined | |
25 */ | |
26 /* | |
27 * Symbolic names for some registers. | |
28 */ | |
29 #define DELETION_REGISTER 36 | |
30 #ifdef FEAT_CLIPBOARD | |
31 # define STAR_REGISTER 37 | |
32 # ifdef FEAT_X11 | |
33 # define PLUS_REGISTER 38 | |
34 # else | |
35 # define PLUS_REGISTER STAR_REGISTER /* there is only one */ | |
36 # endif | |
37 #endif | |
38 #ifdef FEAT_DND | |
39 # define TILDE_REGISTER (PLUS_REGISTER + 1) | |
40 #endif | |
41 | |
42 #ifdef FEAT_CLIPBOARD | |
43 # ifdef FEAT_DND | |
44 # define NUM_REGISTERS (TILDE_REGISTER + 1) | |
45 # else | |
46 # define NUM_REGISTERS (PLUS_REGISTER + 1) | |
47 # endif | |
48 #else | |
49 # define NUM_REGISTERS 37 | |
50 #endif | |
51 | |
52 /* | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
53 * Each yank register has an array of pointers to lines. |
7 | 54 */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
55 typedef struct |
7 | 56 { |
57 char_u **y_array; /* pointer to array of line pointers */ | |
58 linenr_T y_size; /* number of lines in y_array */ | |
59 char_u y_type; /* MLINE, MCHAR or MBLOCK */ | |
60 colnr_T y_width; /* only set if y_type == MBLOCK */ | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
61 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
62 time_t y_time_set; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
63 #endif |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
64 } yankreg_T; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
65 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
66 static yankreg_T y_regs[NUM_REGISTERS]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
67 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
68 static yankreg_T *y_current; /* ptr to current yankreg */ |
7 | 69 static int y_append; /* TRUE when appending */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
70 static yankreg_T *y_previous = NULL; /* ptr to last written yankreg */ |
7 | 71 |
72 /* | |
73 * structure used by block_prep, op_delete and op_yank for blockwise operators | |
74 * also op_change, op_shift, op_insert, op_replace - AKelly | |
75 */ | |
76 struct block_def | |
77 { | |
1839 | 78 int startspaces; /* 'extra' cols before first char */ |
79 int endspaces; /* 'extra' cols after last char */ | |
7 | 80 int textlen; /* chars in block */ |
1839 | 81 char_u *textstart; /* pointer to 1st char (partially) in block */ |
82 colnr_T textcol; /* index of chars (partially) in block */ | |
7 | 83 colnr_T start_vcol; /* start col of 1st char wholly inside block */ |
84 colnr_T end_vcol; /* start col of 1st char wholly after block */ | |
85 #ifdef FEAT_VISUALEXTRA | |
86 int is_short; /* TRUE if line is too short to fit in block */ | |
87 int is_MAX; /* TRUE if curswant==MAXCOL when starting */ | |
88 int is_oneChar; /* TRUE if block within one character */ | |
89 int pre_whitesp; /* screen cols of ws before block */ | |
90 int pre_whitesp_c; /* chars of ws before block */ | |
91 colnr_T end_char_vcols; /* number of vcols of post-block char */ | |
92 #endif | |
93 colnr_T start_char_vcols; /* number of vcols of pre-block char */ | |
94 }; | |
95 | |
96 #ifdef FEAT_VISUALEXTRA | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
97 static void shift_block(oparg_T *oap, int amount); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
98 static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def*bdp); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
99 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
100 static int stuff_yank(int, char_u *); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
101 static void put_reedit_in_typebuf(int silent); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
102 static int put_in_typebuf(char_u *s, int esc, int colon, |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
103 int silent); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
104 static void stuffescaped(char_u *arg, int literally); |
7 | 105 #ifdef FEAT_MBYTE |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
106 static void mb_adjust_opend(oparg_T *oap); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
107 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
108 static void free_yank(long); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
109 static void free_yank_all(void); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
110 static int yank_copy_line(struct block_def *bd, long y_idx); |
7 | 111 #ifdef FEAT_CLIPBOARD |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
112 static void copy_yank_reg(yankreg_T *reg); |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
113 static void may_set_selection(void); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
114 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
115 static void dis_msg(char_u *p, int skip_esc); |
3562 | 116 #if defined(FEAT_COMMENTS) || defined(PROTO) |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
117 static char_u *skip_comment(char_u *line, int process, int include_space, int *is_comment); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
118 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
119 static void block_prep(oparg_T *oap, struct block_def *, linenr_T, int); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
120 static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1); |
7 | 121 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
122 static void str_to_reg(yankreg_T *y_ptr, int yank_type, char_u *str, long len, long blocklen, int str_list); |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
123 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
124 static int ends_in_white(linenr_T lnum); |
7 | 125 #ifdef FEAT_COMMENTS |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
126 static int same_leader(linenr_T lnum, int, char_u *, int, char_u *); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
127 static int fmt_check_par(linenr_T, int *, char_u **, int do_comments); |
7 | 128 #else |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
129 static int fmt_check_par(linenr_T); |
7 | 130 #endif |
131 | |
132 /* | |
133 * The names of operators. | |
134 * IMPORTANT: Index must correspond with defines in vim.h!!! | |
135 * The third field indicates whether the operator always works on lines. | |
136 */ | |
137 static char opchars[][3] = | |
138 { | |
139 {NUL, NUL, FALSE}, /* OP_NOP */ | |
140 {'d', NUL, FALSE}, /* OP_DELETE */ | |
141 {'y', NUL, FALSE}, /* OP_YANK */ | |
142 {'c', NUL, FALSE}, /* OP_CHANGE */ | |
143 {'<', NUL, TRUE}, /* OP_LSHIFT */ | |
144 {'>', NUL, TRUE}, /* OP_RSHIFT */ | |
145 {'!', NUL, TRUE}, /* OP_FILTER */ | |
146 {'g', '~', FALSE}, /* OP_TILDE */ | |
147 {'=', NUL, TRUE}, /* OP_INDENT */ | |
148 {'g', 'q', TRUE}, /* OP_FORMAT */ | |
149 {':', NUL, TRUE}, /* OP_COLON */ | |
150 {'g', 'U', FALSE}, /* OP_UPPER */ | |
151 {'g', 'u', FALSE}, /* OP_LOWER */ | |
152 {'J', NUL, TRUE}, /* DO_JOIN */ | |
153 {'g', 'J', TRUE}, /* DO_JOIN_NS */ | |
154 {'g', '?', FALSE}, /* OP_ROT13 */ | |
155 {'r', NUL, FALSE}, /* OP_REPLACE */ | |
156 {'I', NUL, FALSE}, /* OP_INSERT */ | |
157 {'A', NUL, FALSE}, /* OP_APPEND */ | |
158 {'z', 'f', TRUE}, /* OP_FOLD */ | |
159 {'z', 'o', TRUE}, /* OP_FOLDOPEN */ | |
160 {'z', 'O', TRUE}, /* OP_FOLDOPENREC */ | |
161 {'z', 'c', TRUE}, /* OP_FOLDCLOSE */ | |
162 {'z', 'C', TRUE}, /* OP_FOLDCLOSEREC */ | |
163 {'z', 'd', TRUE}, /* OP_FOLDDEL */ | |
164 {'z', 'D', TRUE}, /* OP_FOLDDELREC */ | |
165 {'g', 'w', TRUE}, /* OP_FORMAT2 */ | |
603 | 166 {'g', '@', FALSE}, /* OP_FUNCTION */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
167 {Ctrl_A, NUL, FALSE}, /* OP_NR_ADD */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
168 {Ctrl_X, NUL, FALSE}, /* OP_NR_SUB */ |
7 | 169 }; |
170 | |
171 /* | |
172 * Translate a command name into an operator type. | |
173 * Must only be called with a valid operator name! | |
174 */ | |
175 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
176 get_op_type(int char1, int char2) |
7 | 177 { |
178 int i; | |
179 | |
180 if (char1 == 'r') /* ignore second character */ | |
181 return OP_REPLACE; | |
182 if (char1 == '~') /* when tilde is an operator */ | |
183 return OP_TILDE; | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
184 if (char1 == 'g' && char2 == Ctrl_A) /* add */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
185 return OP_NR_ADD; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
186 if (char1 == 'g' && char2 == Ctrl_X) /* subtract */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
187 return OP_NR_SUB; |
7 | 188 for (i = 0; ; ++i) |
189 if (opchars[i][0] == char1 && opchars[i][1] == char2) | |
190 break; | |
191 return i; | |
192 } | |
193 | |
194 /* | |
195 * Return TRUE if operator "op" always works on whole lines. | |
196 */ | |
197 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
198 op_on_lines(int op) |
7 | 199 { |
200 return opchars[op][2]; | |
201 } | |
202 | |
203 /* | |
204 * Get first operator command character. | |
205 * Returns 'g' or 'z' if there is another command character. | |
206 */ | |
207 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
208 get_op_char(int optype) |
7 | 209 { |
210 return opchars[optype][0]; | |
211 } | |
212 | |
213 /* | |
214 * Get second operator command character. | |
215 */ | |
216 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
217 get_extra_op_char(int optype) |
7 | 218 { |
219 return opchars[optype][1]; | |
220 } | |
221 | |
222 /* | |
223 * op_shift - handle a shift operation | |
224 */ | |
225 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
226 op_shift(oparg_T *oap, int curs_top, int amount) |
7 | 227 { |
228 long i; | |
229 int first_char; | |
230 char_u *s; | |
231 int block_col = 0; | |
232 | |
233 if (u_save((linenr_T)(oap->start.lnum - 1), | |
234 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
235 return; | |
236 | |
237 if (oap->block_mode) | |
238 block_col = curwin->w_cursor.col; | |
239 | |
240 for (i = oap->line_count; --i >= 0; ) | |
241 { | |
242 first_char = *ml_get_curline(); | |
243 if (first_char == NUL) /* empty line */ | |
244 curwin->w_cursor.col = 0; | |
245 #ifdef FEAT_VISUALEXTRA | |
246 else if (oap->block_mode) | |
247 shift_block(oap, amount); | |
248 #endif | |
249 else | |
250 /* Move the line right if it doesn't start with '#', 'smartindent' | |
251 * isn't set or 'cindent' isn't set or '#' isn't in 'cino'. */ | |
252 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
253 if (first_char != '#' || !preprocs_left()) | |
254 #endif | |
255 { | |
1516 | 256 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE); |
7 | 257 } |
258 ++curwin->w_cursor.lnum; | |
259 } | |
260 | |
261 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
262 if (oap->block_mode) | |
263 { | |
264 curwin->w_cursor.lnum = oap->start.lnum; | |
265 curwin->w_cursor.col = block_col; | |
266 } | |
5735 | 267 else if (curs_top) /* put cursor on first line, for ">>" */ |
7 | 268 { |
269 curwin->w_cursor.lnum = oap->start.lnum; | |
270 beginline(BL_SOL | BL_FIX); /* shift_line() may have set cursor.col */ | |
271 } | |
272 else | |
273 --curwin->w_cursor.lnum; /* put cursor on last line, for ":>" */ | |
274 | |
10486
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
275 #ifdef FEAT_FOLDING |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
276 /* The cursor line is not in a closed fold */ |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
277 foldOpenCursor(); |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
278 #endif |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
279 |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
280 |
7 | 281 if (oap->line_count > p_report) |
282 { | |
283 if (oap->op_type == OP_RSHIFT) | |
284 s = (char_u *)">"; | |
285 else | |
286 s = (char_u *)"<"; | |
287 if (oap->line_count == 1) | |
288 { | |
289 if (amount == 1) | |
290 sprintf((char *)IObuff, _("1 line %sed 1 time"), s); | |
291 else | |
292 sprintf((char *)IObuff, _("1 line %sed %d times"), s, amount); | |
293 } | |
294 else | |
295 { | |
296 if (amount == 1) | |
297 sprintf((char *)IObuff, _("%ld lines %sed 1 time"), | |
298 oap->line_count, s); | |
299 else | |
300 sprintf((char *)IObuff, _("%ld lines %sed %d times"), | |
301 oap->line_count, s, amount); | |
302 } | |
303 msg(IObuff); | |
304 } | |
305 | |
306 /* | |
307 * Set "'[" and "']" marks. | |
308 */ | |
309 curbuf->b_op_start = oap->start; | |
310 curbuf->b_op_end.lnum = oap->end.lnum; | |
311 curbuf->b_op_end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
312 if (curbuf->b_op_end.col > 0) | |
313 --curbuf->b_op_end.col; | |
314 } | |
315 | |
316 /* | |
317 * shift the current line one shiftwidth left (if left != 0) or right | |
318 * leaves cursor on first blank in the line | |
319 */ | |
320 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
321 shift_line( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
322 int left, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
323 int round, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
324 int amount, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
325 int call_changed_bytes) /* call changed_bytes() */ |
7 | 326 { |
327 int count; | |
328 int i, j; | |
5438 | 329 int p_sw = (int)get_sw_value(curbuf); |
7 | 330 |
331 count = get_indent(); /* get current indent */ | |
332 | |
333 if (round) /* round off indent */ | |
334 { | |
335 i = count / p_sw; /* number of p_sw rounded down */ | |
336 j = count % p_sw; /* extra spaces */ | |
337 if (j && left) /* first remove extra spaces */ | |
338 --amount; | |
339 if (left) | |
340 { | |
341 i -= amount; | |
342 if (i < 0) | |
343 i = 0; | |
344 } | |
345 else | |
346 i += amount; | |
347 count = i * p_sw; | |
348 } | |
349 else /* original vi indent */ | |
350 { | |
351 if (left) | |
352 { | |
353 count -= p_sw * amount; | |
354 if (count < 0) | |
355 count = 0; | |
356 } | |
357 else | |
358 count += p_sw * amount; | |
359 } | |
360 | |
361 /* Set new indent */ | |
362 #ifdef FEAT_VREPLACE | |
363 if (State & VREPLACE_FLAG) | |
1516 | 364 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes); |
7 | 365 else |
366 #endif | |
1516 | 367 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0); |
7 | 368 } |
369 | |
370 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
371 /* | |
372 * Shift one line of the current block one shiftwidth right or left. | |
373 * Leaves cursor on first character in block. | |
374 */ | |
375 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
376 shift_block(oparg_T *oap, int amount) |
7 | 377 { |
378 int left = (oap->op_type == OP_LSHIFT); | |
379 int oldstate = State; | |
1839 | 380 int total; |
381 char_u *newp, *oldp; | |
7 | 382 int oldcol = curwin->w_cursor.col; |
5438 | 383 int p_sw = (int)get_sw_value(curbuf); |
7 | 384 int p_ts = (int)curbuf->b_p_ts; |
385 struct block_def bd; | |
386 int incr; | |
1839 | 387 colnr_T ws_vcol; |
7 | 388 int i = 0, j = 0; |
389 int len; | |
390 #ifdef FEAT_RIGHTLEFT | |
391 int old_p_ri = p_ri; | |
392 | |
4352 | 393 p_ri = 0; /* don't want revins in indent */ |
7 | 394 #endif |
395 | |
396 State = INSERT; /* don't want REPLACE for State */ | |
397 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); | |
398 if (bd.is_short) | |
399 return; | |
400 | |
401 /* total is number of screen columns to be inserted/removed */ | |
402 total = amount * p_sw; | |
403 oldp = ml_get_curline(); | |
404 | |
405 if (!left) | |
406 { | |
407 /* | |
408 * 1. Get start vcol | |
409 * 2. Total ws vcols | |
410 * 3. Divvy into TABs & spp | |
411 * 4. Construct new string | |
412 */ | |
413 total += bd.pre_whitesp; /* all virtual WS upto & incl a split TAB */ | |
414 ws_vcol = bd.start_vcol - bd.pre_whitesp; | |
415 if (bd.startspaces) | |
416 { | |
417 #ifdef FEAT_MBYTE | |
418 if (has_mbyte) | |
8399
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
419 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
420 if ((*mb_ptr2len)(bd.textstart) == 1) |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
421 ++bd.textstart; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
422 else |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
423 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
424 ws_vcol = 0; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
425 bd.startspaces = 0; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
426 } |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
427 } |
1995 | 428 else |
429 #endif | |
430 ++bd.textstart; | |
7 | 431 } |
432 for ( ; vim_iswhite(*bd.textstart); ) | |
433 { | |
5995 | 434 /* TODO: is passing bd.textstart for start of the line OK? */ |
435 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, | |
436 (colnr_T)(bd.start_vcol)); | |
7 | 437 total += incr; |
438 bd.start_vcol += incr; | |
439 } | |
440 /* OK, now total=all the VWS reqd, and textstart points at the 1st | |
441 * non-ws char in the block. */ | |
442 if (!curbuf->b_p_et) | |
443 i = ((ws_vcol % p_ts) + total) / p_ts; /* number of tabs */ | |
444 if (i) | |
445 j = ((ws_vcol % p_ts) + total) % p_ts; /* number of spp */ | |
446 else | |
447 j = total; | |
448 /* if we're splitting a TAB, allow for it */ | |
449 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0); | |
450 len = (int)STRLEN(bd.textstart) + 1; | |
451 newp = alloc_check((unsigned)(bd.textcol + i + j + len)); | |
452 if (newp == NULL) | |
453 return; | |
454 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len)); | |
455 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
6929 | 456 vim_memset(newp + bd.textcol, TAB, (size_t)i); |
457 vim_memset(newp + bd.textcol + i, ' ', (size_t)j); | |
7 | 458 /* the end */ |
459 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len); | |
460 } | |
461 else /* left */ | |
462 { | |
1839 | 463 colnr_T destination_col; /* column to which text in block will |
464 be shifted */ | |
465 char_u *verbatim_copy_end; /* end of the part of the line which is | |
466 copied verbatim */ | |
467 colnr_T verbatim_copy_width;/* the (displayed) width of this part | |
468 of line */ | |
469 unsigned fill; /* nr of spaces that replace a TAB */ | |
470 unsigned new_line_len; /* the length of the line after the | |
471 block shift */ | |
472 size_t block_space_width; | |
473 size_t shift_amount; | |
474 char_u *non_white = bd.textstart; | |
475 colnr_T non_white_col; | |
476 | |
477 /* | |
478 * Firstly, let's find the first non-whitespace character that is | |
479 * displayed after the block's start column and the character's column | |
480 * number. Also, let's calculate the width of all the whitespace | |
481 * characters that are displayed in the block and precede the searched | |
482 * non-whitespace character. | |
483 */ | |
484 | |
485 /* If "bd.startspaces" is set, "bd.textstart" points to the character, | |
486 * the part of which is displayed at the block's beginning. Let's start | |
487 * searching from the next character. */ | |
488 if (bd.startspaces) | |
489 mb_ptr_adv(non_white); | |
490 | |
491 /* The character's column is in "bd.start_vcol". */ | |
492 non_white_col = bd.start_vcol; | |
493 | |
494 while (vim_iswhite(*non_white)) | |
7 | 495 { |
5995 | 496 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col); |
1839 | 497 non_white_col += incr; |
7 | 498 } |
1839 | 499 |
500 block_space_width = non_white_col - oap->start_vcol; | |
501 /* We will shift by "total" or "block_space_width", whichever is less. | |
502 */ | |
1860 | 503 shift_amount = (block_space_width < (size_t)total |
504 ? block_space_width : (size_t)total); | |
1839 | 505 |
506 /* The column to which we will shift the text. */ | |
1860 | 507 destination_col = (colnr_T)(non_white_col - shift_amount); |
1839 | 508 |
509 /* Now let's find out how much of the beginning of the line we can | |
510 * reuse without modification. */ | |
511 verbatim_copy_end = bd.textstart; | |
512 verbatim_copy_width = bd.start_vcol; | |
513 | |
514 /* If "bd.startspaces" is set, "bd.textstart" points to the character | |
515 * preceding the block. We have to subtract its width to obtain its | |
516 * column number. */ | |
517 if (bd.startspaces) | |
518 verbatim_copy_width -= bd.start_char_vcols; | |
519 while (verbatim_copy_width < destination_col) | |
7 | 520 { |
5995 | 521 char_u *line = verbatim_copy_end; |
522 | |
523 /* TODO: is passing verbatim_copy_end for start of the line OK? */ | |
524 incr = lbr_chartabsize(line, verbatim_copy_end, | |
525 verbatim_copy_width); | |
1839 | 526 if (verbatim_copy_width + incr > destination_col) |
527 break; | |
528 verbatim_copy_width += incr; | |
529 mb_ptr_adv(verbatim_copy_end); | |
7 | 530 } |
531 | |
1839 | 532 /* If "destination_col" is different from the width of the initial |
533 * part of the line that will be copied, it means we encountered a tab | |
534 * character, which we will have to partly replace with spaces. */ | |
535 fill = destination_col - verbatim_copy_width; | |
536 | |
537 /* The replacement line will consist of: | |
538 * - the beginning of the original line up to "verbatim_copy_end", | |
539 * - "fill" number of spaces, | |
540 * - the rest of the line, pointed to by non_white. */ | |
541 new_line_len = (unsigned)(verbatim_copy_end - oldp) | |
542 + fill | |
543 + (unsigned)STRLEN(non_white) + 1; | |
544 | |
545 newp = alloc_check(new_line_len); | |
7 | 546 if (newp == NULL) |
547 return; | |
1839 | 548 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); |
6929 | 549 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill); |
1839 | 550 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); |
7 | 551 } |
552 /* replace the line */ | |
553 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
554 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol); | |
555 State = oldstate; | |
556 curwin->w_cursor.col = oldcol; | |
557 #ifdef FEAT_RIGHTLEFT | |
558 p_ri = old_p_ri; | |
559 #endif | |
560 } | |
561 #endif | |
562 | |
563 #ifdef FEAT_VISUALEXTRA | |
564 /* | |
565 * Insert string "s" (b_insert ? before : after) block :AKelly | |
566 * Caller must prepare for undo. | |
567 */ | |
568 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
569 block_insert( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
570 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
571 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
572 int b_insert, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
573 struct block_def *bdp) |
7 | 574 { |
575 int p_ts; | |
576 int count = 0; /* extra spaces to replace a cut TAB */ | |
577 int spaces = 0; /* non-zero if cutting a TAB */ | |
578 colnr_T offset; /* pointer along new line */ | |
579 unsigned s_len; /* STRLEN(s) */ | |
580 char_u *newp, *oldp; /* new, old lines */ | |
581 linenr_T lnum; /* loop var */ | |
582 int oldstate = State; | |
583 | |
584 State = INSERT; /* don't want REPLACE for State */ | |
585 s_len = (unsigned)STRLEN(s); | |
586 | |
587 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) | |
588 { | |
589 block_prep(oap, bdp, lnum, TRUE); | |
590 if (bdp->is_short && b_insert) | |
591 continue; /* OP_INSERT, line ends before block start */ | |
592 | |
593 oldp = ml_get(lnum); | |
594 | |
595 if (b_insert) | |
596 { | |
597 p_ts = bdp->start_char_vcols; | |
598 spaces = bdp->startspaces; | |
599 if (spaces != 0) | |
600 count = p_ts - 1; /* we're cutting a TAB */ | |
601 offset = bdp->textcol; | |
602 } | |
603 else /* append */ | |
604 { | |
605 p_ts = bdp->end_char_vcols; | |
606 if (!bdp->is_short) /* spaces = padding after block */ | |
607 { | |
608 spaces = (bdp->endspaces ? p_ts - bdp->endspaces : 0); | |
609 if (spaces != 0) | |
610 count = p_ts - 1; /* we're cutting a TAB */ | |
611 offset = bdp->textcol + bdp->textlen - (spaces != 0); | |
612 } | |
613 else /* spaces = padding to block edge */ | |
614 { | |
615 /* if $ used, just append to EOL (ie spaces==0) */ | |
616 if (!bdp->is_MAX) | |
617 spaces = (oap->end_vcol - bdp->end_vcol) + 1; | |
618 count = spaces; | |
619 offset = bdp->textcol + bdp->textlen; | |
620 } | |
621 } | |
622 | |
6140 | 623 #ifdef FEAT_MBYTE |
624 if (has_mbyte && spaces > 0) | |
625 { | |
6460 | 626 int off; |
627 | |
6140 | 628 /* Avoid starting halfway a multi-byte character. */ |
629 if (b_insert) | |
630 { | |
6460 | 631 off = (*mb_head_off)(oldp, oldp + offset + spaces); |
6140 | 632 } |
633 else | |
634 { | |
6460 | 635 off = (*mb_off_next)(oldp, oldp + offset); |
6140 | 636 offset += off; |
637 } | |
6460 | 638 spaces -= off; |
639 count -= off; | |
6140 | 640 } |
641 #endif | |
642 | |
7 | 643 newp = alloc_check((unsigned)(STRLEN(oldp)) + s_len + count + 1); |
644 if (newp == NULL) | |
645 continue; | |
646 | |
647 /* copy up to shifted part */ | |
648 mch_memmove(newp, oldp, (size_t)(offset)); | |
649 oldp += offset; | |
650 | |
651 /* insert pre-padding */ | |
6929 | 652 vim_memset(newp + offset, ' ', (size_t)spaces); |
7 | 653 |
654 /* copy the new text */ | |
655 mch_memmove(newp + offset + spaces, s, (size_t)s_len); | |
656 offset += s_len; | |
657 | |
658 if (spaces && !bdp->is_short) | |
659 { | |
660 /* insert post-padding */ | |
6929 | 661 vim_memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces)); |
7 | 662 /* We're splitting a TAB, don't copy it. */ |
663 oldp++; | |
664 /* We allowed for that TAB, remember this now */ | |
665 count++; | |
666 } | |
667 | |
668 if (spaces > 0) | |
669 offset += count; | |
1622 | 670 STRMOVE(newp + offset, oldp); |
7 | 671 |
672 ml_replace(lnum, newp, FALSE); | |
673 | |
674 if (lnum == oap->end.lnum) | |
675 { | |
676 /* Set "']" mark to the end of the block instead of the end of | |
677 * the insert in the first line. */ | |
678 curbuf->b_op_end.lnum = oap->end.lnum; | |
679 curbuf->b_op_end.col = offset; | |
680 } | |
681 } /* for all lnum */ | |
682 | |
683 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
684 | |
685 State = oldstate; | |
686 } | |
687 #endif | |
688 | |
689 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(PROTO) | |
690 /* | |
691 * op_reindent - handle reindenting a block of lines. | |
692 */ | |
693 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
694 op_reindent(oparg_T *oap, int (*how)(void)) |
7 | 695 { |
696 long i; | |
697 char_u *l; | |
6971 | 698 int amount; |
7 | 699 linenr_T first_changed = 0; |
700 linenr_T last_changed = 0; | |
701 linenr_T start_lnum = curwin->w_cursor.lnum; | |
702 | |
216 | 703 /* Don't even try when 'modifiable' is off. */ |
704 if (!curbuf->b_p_ma) | |
705 { | |
706 EMSG(_(e_modifiable)); | |
707 return; | |
708 } | |
709 | |
7 | 710 for (i = oap->line_count; --i >= 0 && !got_int; ) |
711 { | |
712 /* it's a slow thing to do, so give feedback so there's no worry that | |
713 * the computer's just hung. */ | |
714 | |
715 if (i > 1 | |
716 && (i % 50 == 0 || i == oap->line_count - 1) | |
717 && oap->line_count > p_report) | |
718 smsg((char_u *)_("%ld lines to indent... "), i); | |
719 | |
720 /* | |
721 * Be vi-compatible: For lisp indenting the first line is not | |
722 * indented, unless there is only one line. | |
723 */ | |
724 #ifdef FEAT_LISP | |
725 if (i != oap->line_count - 1 || oap->line_count == 1 | |
726 || how != get_lisp_indent) | |
727 #endif | |
728 { | |
729 l = skipwhite(ml_get_curline()); | |
730 if (*l == NUL) /* empty or blank line */ | |
6971 | 731 amount = 0; |
7 | 732 else |
6971 | 733 amount = how(); /* get the indent for this line */ |
734 | |
735 if (amount >= 0 && set_indent(amount, SIN_UNDO)) | |
7 | 736 { |
737 /* did change the indent, call changed_lines() later */ | |
738 if (first_changed == 0) | |
739 first_changed = curwin->w_cursor.lnum; | |
740 last_changed = curwin->w_cursor.lnum; | |
741 } | |
742 } | |
743 ++curwin->w_cursor.lnum; | |
1550 | 744 curwin->w_cursor.col = 0; /* make sure it's valid */ |
7 | 745 } |
746 | |
747 /* put cursor on first non-blank of indented line */ | |
748 curwin->w_cursor.lnum = start_lnum; | |
749 beginline(BL_SOL | BL_FIX); | |
750 | |
751 /* Mark changed lines so that they will be redrawn. When Visual | |
752 * highlighting was present, need to continue until the last line. When | |
753 * there is no change still need to remove the Visual highlighting. */ | |
754 if (last_changed != 0) | |
755 changed_lines(first_changed, 0, | |
756 oap->is_VIsual ? start_lnum + oap->line_count : | |
757 last_changed + 1, 0L); | |
758 else if (oap->is_VIsual) | |
759 redraw_curbuf_later(INVERTED); | |
760 | |
761 if (oap->line_count > p_report) | |
762 { | |
763 i = oap->line_count - (i + 1); | |
764 if (i == 1) | |
765 MSG(_("1 line indented ")); | |
766 else | |
767 smsg((char_u *)_("%ld lines indented "), i); | |
768 } | |
769 /* set '[ and '] marks */ | |
770 curbuf->b_op_start = oap->start; | |
771 curbuf->b_op_end = oap->end; | |
772 } | |
773 #endif /* defined(FEAT_LISP) || defined(FEAT_CINDENT) */ | |
774 | |
775 #if defined(FEAT_EVAL) || defined(PROTO) | |
776 /* | |
777 * Keep the last expression line here, for repeating. | |
778 */ | |
779 static char_u *expr_line = NULL; | |
780 | |
781 /* | |
782 * Get an expression for the "\"=expr1" or "CTRL-R =expr1" | |
783 * Returns '=' when OK, NUL otherwise. | |
784 */ | |
785 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
786 get_expr_register(void) |
7 | 787 { |
788 char_u *new_line; | |
789 | |
790 new_line = getcmdline('=', 0L, 0); | |
791 if (new_line == NULL) | |
792 return NUL; | |
793 if (*new_line == NUL) /* use previous line */ | |
794 vim_free(new_line); | |
795 else | |
796 set_expr_line(new_line); | |
797 return '='; | |
798 } | |
799 | |
800 /* | |
801 * Set the expression for the '=' register. | |
802 * Argument must be an allocated string. | |
803 */ | |
804 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
805 set_expr_line(char_u *new_line) |
7 | 806 { |
807 vim_free(expr_line); | |
808 expr_line = new_line; | |
809 } | |
810 | |
811 /* | |
812 * Get the result of the '=' register expression. | |
813 * Returns a pointer to allocated memory, or NULL for failure. | |
814 */ | |
815 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
816 get_expr_line(void) |
7 | 817 { |
818 char_u *expr_copy; | |
819 char_u *rv; | |
994 | 820 static int nested = 0; |
7 | 821 |
822 if (expr_line == NULL) | |
823 return NULL; | |
824 | |
825 /* Make a copy of the expression, because evaluating it may cause it to be | |
826 * changed. */ | |
827 expr_copy = vim_strsave(expr_line); | |
828 if (expr_copy == NULL) | |
829 return NULL; | |
830 | |
994 | 831 /* When we are invoked recursively limit the evaluation to 10 levels. |
832 * Then return the string as-is. */ | |
833 if (nested >= 10) | |
834 return expr_copy; | |
835 | |
836 ++nested; | |
714 | 837 rv = eval_to_string(expr_copy, NULL, TRUE); |
994 | 838 --nested; |
7 | 839 vim_free(expr_copy); |
840 return rv; | |
841 } | |
283 | 842 |
843 /* | |
844 * Get the '=' register expression itself, without evaluating it. | |
845 */ | |
846 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
847 get_expr_line_src(void) |
283 | 848 { |
849 if (expr_line == NULL) | |
850 return NULL; | |
851 return vim_strsave(expr_line); | |
852 } | |
7 | 853 #endif /* FEAT_EVAL */ |
854 | |
855 /* | |
856 * Check if 'regname' is a valid name of a yank register. | |
857 * Note: There is no check for 0 (default register), caller should do this | |
858 */ | |
859 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
860 valid_yank_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
861 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
862 int writing) /* if TRUE check for writable registers */ |
7 | 863 { |
864 if ( (regname > 0 && ASCII_ISALNUM(regname)) | |
865 || (!writing && vim_strchr((char_u *) | |
866 #ifdef FEAT_EVAL | |
6557 | 867 "/.%:=" |
7 | 868 #else |
6557 | 869 "/.%:" |
7 | 870 #endif |
871 , regname) != NULL) | |
6557 | 872 || regname == '#' |
7 | 873 || regname == '"' |
874 || regname == '-' | |
875 || regname == '_' | |
876 #ifdef FEAT_CLIPBOARD | |
877 || regname == '*' | |
878 || regname == '+' | |
879 #endif | |
880 #ifdef FEAT_DND | |
881 || (!writing && regname == '~') | |
882 #endif | |
883 ) | |
884 return TRUE; | |
885 return FALSE; | |
886 } | |
887 | |
888 /* | |
889 * Set y_current and y_append, according to the value of "regname". | |
890 * Cannot handle the '_' register. | |
140 | 891 * Must only be called with a valid register name! |
7 | 892 * |
893 * If regname is 0 and writing, use register 0 | |
894 * If regname is 0 and reading, use previous register | |
895 */ | |
15 | 896 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
897 get_yank_register(int regname, int writing) |
7 | 898 { |
899 int i; | |
900 | |
901 y_append = FALSE; | |
902 if ((regname == 0 || regname == '"') && !writing && y_previous != NULL) | |
903 { | |
904 y_current = y_previous; | |
905 return; | |
906 } | |
907 i = regname; | |
908 if (VIM_ISDIGIT(i)) | |
909 i -= '0'; | |
910 else if (ASCII_ISLOWER(i)) | |
911 i = CharOrdLow(i) + 10; | |
912 else if (ASCII_ISUPPER(i)) | |
913 { | |
914 i = CharOrdUp(i) + 10; | |
915 y_append = TRUE; | |
916 } | |
917 else if (regname == '-') | |
918 i = DELETION_REGISTER; | |
919 #ifdef FEAT_CLIPBOARD | |
920 /* When selection is not available, use register 0 instead of '*' */ | |
921 else if (clip_star.available && regname == '*') | |
922 i = STAR_REGISTER; | |
923 /* When clipboard is not available, use register 0 instead of '+' */ | |
924 else if (clip_plus.available && regname == '+') | |
925 i = PLUS_REGISTER; | |
926 #endif | |
927 #ifdef FEAT_DND | |
928 else if (!writing && regname == '~') | |
929 i = TILDE_REGISTER; | |
930 #endif | |
931 else /* not 0-9, a-z, A-Z or '-': use register 0 */ | |
932 i = 0; | |
933 y_current = &(y_regs[i]); | |
934 if (writing) /* remember the register we write into for do_put() */ | |
935 y_previous = y_current; | |
936 } | |
937 | |
15 | 938 #if defined(FEAT_CLIPBOARD) || defined(PROTO) |
7 | 939 /* |
940 * When "regname" is a clipboard register, obtain the selection. If it's not | |
941 * available return zero, otherwise return "regname". | |
942 */ | |
15 | 943 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
944 may_get_selection(int regname) |
7 | 945 { |
946 if (regname == '*') | |
947 { | |
948 if (!clip_star.available) | |
949 regname = 0; | |
950 else | |
951 clip_get_selection(&clip_star); | |
952 } | |
953 else if (regname == '+') | |
954 { | |
955 if (!clip_plus.available) | |
956 regname = 0; | |
957 else | |
958 clip_get_selection(&clip_plus); | |
959 } | |
960 return regname; | |
961 } | |
962 #endif | |
963 | |
964 /* | |
965 * Obtain the contents of a "normal" register. The register is made empty. | |
966 * The returned pointer has allocated memory, use put_register() later. | |
967 */ | |
968 void * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
969 get_register( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
970 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
971 int copy) /* make a copy, if FALSE make register empty. */ |
7 | 972 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
973 yankreg_T *reg; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
974 int i; |
7 | 975 |
976 #ifdef FEAT_CLIPBOARD | |
977 /* When Visual area changed, may have to update selection. Obtain the | |
978 * selection too. */ | |
1435 | 979 if (name == '*' && clip_star.available) |
7 | 980 { |
3674 | 981 if (clip_isautosel_star()) |
982 clip_update_selection(&clip_star); | |
983 may_get_selection(name); | |
984 } | |
985 if (name == '+' && clip_plus.available) | |
986 { | |
987 if (clip_isautosel_plus()) | |
988 clip_update_selection(&clip_plus); | |
7 | 989 may_get_selection(name); |
990 } | |
991 #endif | |
992 | |
993 get_yank_register(name, 0); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
994 reg = (yankreg_T *)alloc((unsigned)sizeof(yankreg_T)); |
7 | 995 if (reg != NULL) |
996 { | |
997 *reg = *y_current; | |
998 if (copy) | |
999 { | |
1000 /* If we run out of memory some or all of the lines are empty. */ | |
1001 if (reg->y_size == 0) | |
1002 reg->y_array = NULL; | |
1003 else | |
1004 reg->y_array = (char_u **)alloc((unsigned)(sizeof(char_u *) | |
1005 * reg->y_size)); | |
1006 if (reg->y_array != NULL) | |
1007 { | |
1008 for (i = 0; i < reg->y_size; ++i) | |
1009 reg->y_array[i] = vim_strsave(y_current->y_array[i]); | |
1010 } | |
1011 } | |
1012 else | |
1013 y_current->y_array = NULL; | |
1014 } | |
1015 return (void *)reg; | |
1016 } | |
1017 | |
1018 /* | |
1451 | 1019 * Put "reg" into register "name". Free any previous contents and "reg". |
7 | 1020 */ |
1021 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1022 put_register(int name, void *reg) |
7 | 1023 { |
1024 get_yank_register(name, 0); | |
1025 free_yank_all(); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1026 *y_current = *(yankreg_T *)reg; |
1451 | 1027 vim_free(reg); |
7 | 1028 |
5735 | 1029 #ifdef FEAT_CLIPBOARD |
7 | 1030 /* Send text written to clipboard register to the clipboard. */ |
1031 may_set_selection(); | |
5735 | 1032 #endif |
7 | 1033 } |
4209 | 1034 |
1035 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1036 free_register(void *reg) |
4209 | 1037 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1038 yankreg_T tmp; |
4209 | 1039 |
1040 tmp = *y_current; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1041 *y_current = *(yankreg_T *)reg; |
4209 | 1042 free_yank_all(); |
1043 vim_free(reg); | |
1044 *y_current = tmp; | |
1045 } | |
7 | 1046 |
1047 #if defined(FEAT_MOUSE) || defined(PROTO) | |
1048 /* | |
1049 * return TRUE if the current yank register has type MLINE | |
1050 */ | |
1051 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1052 yank_register_mline(int regname) |
7 | 1053 { |
1054 if (regname != 0 && !valid_yank_reg(regname, FALSE)) | |
1055 return FALSE; | |
1056 if (regname == '_') /* black hole is always empty */ | |
1057 return FALSE; | |
1058 get_yank_register(regname, FALSE); | |
1059 return (y_current->y_type == MLINE); | |
1060 } | |
1061 #endif | |
1062 | |
1063 /* | |
1157 | 1064 * Start or stop recording into a yank register. |
7 | 1065 * |
1157 | 1066 * Return FAIL for failure, OK otherwise. |
7 | 1067 */ |
1068 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1069 do_record(int c) |
7 | 1070 { |
1157 | 1071 char_u *p; |
1072 static int regname; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1073 yankreg_T *old_y_previous, *old_y_current; |
1157 | 1074 int retval; |
7 | 1075 |
1076 if (Recording == FALSE) /* start recording */ | |
1077 { | |
1078 /* registers 0-9, a-z and " are allowed */ | |
1079 if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) | |
1080 retval = FAIL; | |
1081 else | |
1082 { | |
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7011
diff
changeset
|
1083 Recording = c; |
7 | 1084 showmode(); |
1085 regname = c; | |
1086 retval = OK; | |
1087 } | |
1088 } | |
1089 else /* stop recording */ | |
1090 { | |
1091 /* | |
1157 | 1092 * Get the recorded key hits. K_SPECIAL and CSI will be escaped, this |
1093 * needs to be removed again to put it in a register. exec_reg then | |
1094 * adds the escaping back later. | |
7 | 1095 */ |
1096 Recording = FALSE; | |
1097 MSG(""); | |
1098 p = get_recorded(); | |
1099 if (p == NULL) | |
1100 retval = FAIL; | |
1101 else | |
1102 { | |
1081 | 1103 /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ |
1104 vim_unescape_csi(p); | |
1105 | |
7 | 1106 /* |
1107 * We don't want to change the default register here, so save and | |
1108 * restore the current register name. | |
1109 */ | |
1110 old_y_previous = y_previous; | |
1111 old_y_current = y_current; | |
1112 | |
1113 retval = stuff_yank(regname, p); | |
1114 | |
1115 y_previous = old_y_previous; | |
1116 y_current = old_y_current; | |
1117 } | |
1118 } | |
1119 return retval; | |
1120 } | |
1121 | |
1122 /* | |
1123 * Stuff string "p" into yank register "regname" as a single line (append if | |
1124 * uppercase). "p" must have been alloced. | |
1125 * | |
1126 * return FAIL for failure, OK otherwise | |
1127 */ | |
1128 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1129 stuff_yank(int regname, char_u *p) |
7 | 1130 { |
1131 char_u *lp; | |
1132 char_u **pp; | |
1133 | |
1134 /* check for read-only register */ | |
1135 if (regname != 0 && !valid_yank_reg(regname, TRUE)) | |
1136 { | |
1137 vim_free(p); | |
1138 return FAIL; | |
1139 } | |
1140 if (regname == '_') /* black hole: don't do anything */ | |
1141 { | |
1142 vim_free(p); | |
1143 return OK; | |
1144 } | |
1145 get_yank_register(regname, TRUE); | |
1146 if (y_append && y_current->y_array != NULL) | |
1147 { | |
1148 pp = &(y_current->y_array[y_current->y_size - 1]); | |
1149 lp = lalloc((long_u)(STRLEN(*pp) + STRLEN(p) + 1), TRUE); | |
1150 if (lp == NULL) | |
1151 { | |
1152 vim_free(p); | |
1153 return FAIL; | |
1154 } | |
1155 STRCPY(lp, *pp); | |
1156 STRCAT(lp, p); | |
1157 vim_free(p); | |
1158 vim_free(*pp); | |
1159 *pp = lp; | |
1160 } | |
1161 else | |
1162 { | |
1163 free_yank_all(); | |
1164 if ((y_current->y_array = | |
1165 (char_u **)alloc((unsigned)sizeof(char_u *))) == NULL) | |
1166 { | |
1167 vim_free(p); | |
1168 return FAIL; | |
1169 } | |
1170 y_current->y_array[0] = p; | |
1171 y_current->y_size = 1; | |
1172 y_current->y_type = MCHAR; /* used to be MLINE, why? */ | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1173 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1174 y_current->y_time_set = vim_time(); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1175 #endif |
7 | 1176 } |
1177 return OK; | |
1178 } | |
1179 | |
1893 | 1180 static int execreg_lastc = NUL; |
1181 | |
7 | 1182 /* |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1183 * Execute a yank register: copy it into the stuff buffer. |
7 | 1184 * |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1185 * Return FAIL for failure, OK otherwise. |
7 | 1186 */ |
1187 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1188 do_execreg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1189 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1190 int colon, /* insert ':' before each line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1191 int addcr, /* always add '\n' to end of line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1192 int silent) /* set "silent" flag in typeahead buffer */ |
7 | 1193 { |
1194 long i; | |
1195 char_u *p; | |
1196 int retval = OK; | |
1197 int remap; | |
1198 | |
1199 if (regname == '@') /* repeat previous one */ | |
168 | 1200 { |
1893 | 1201 if (execreg_lastc == NUL) |
168 | 1202 { |
1203 EMSG(_("E748: No previously used register")); | |
1204 return FAIL; | |
1205 } | |
1893 | 1206 regname = execreg_lastc; |
168 | 1207 } |
7 | 1208 /* check for valid regname */ |
1209 if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) | |
168 | 1210 { |
1211 emsg_invreg(regname); | |
7 | 1212 return FAIL; |
168 | 1213 } |
1893 | 1214 execreg_lastc = regname; |
7 | 1215 |
1216 #ifdef FEAT_CLIPBOARD | |
1217 regname = may_get_selection(regname); | |
1218 #endif | |
1219 | |
1220 if (regname == '_') /* black hole: don't stuff anything */ | |
1221 return OK; | |
1222 | |
1223 #ifdef FEAT_CMDHIST | |
1224 if (regname == ':') /* use last command line */ | |
1225 { | |
1226 if (last_cmdline == NULL) | |
1227 { | |
1228 EMSG(_(e_nolastcmd)); | |
1229 return FAIL; | |
1230 } | |
1231 vim_free(new_last_cmdline); /* don't keep the cmdline containing @: */ | |
1232 new_last_cmdline = NULL; | |
16 | 1233 /* Escape all control characters with a CTRL-V */ |
1234 p = vim_strsave_escaped_ext(last_cmdline, | |
20 | 1235 (char_u *)"\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037", Ctrl_V, FALSE); |
16 | 1236 if (p != NULL) |
480 | 1237 { |
1238 /* When in Visual mode "'<,'>" will be prepended to the command. | |
1239 * Remove it when it's already there. */ | |
1240 if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) | |
1077 | 1241 retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); |
480 | 1242 else |
1077 | 1243 retval = put_in_typebuf(p, TRUE, TRUE, silent); |
480 | 1244 } |
16 | 1245 vim_free(p); |
7 | 1246 } |
1247 #endif | |
1248 #ifdef FEAT_EVAL | |
1249 else if (regname == '=') | |
1250 { | |
1251 p = get_expr_line(); | |
1252 if (p == NULL) | |
1253 return FAIL; | |
1077 | 1254 retval = put_in_typebuf(p, TRUE, colon, silent); |
7 | 1255 vim_free(p); |
1256 } | |
1257 #endif | |
1258 else if (regname == '.') /* use last inserted text */ | |
1259 { | |
1260 p = get_last_insert_save(); | |
1261 if (p == NULL) | |
1262 { | |
1263 EMSG(_(e_noinstext)); | |
1264 return FAIL; | |
1265 } | |
1077 | 1266 retval = put_in_typebuf(p, FALSE, colon, silent); |
7 | 1267 vim_free(p); |
1268 } | |
1269 else | |
1270 { | |
1271 get_yank_register(regname, FALSE); | |
1272 if (y_current->y_array == NULL) | |
1273 return FAIL; | |
1274 | |
1275 /* Disallow remaping for ":@r". */ | |
1276 remap = colon ? REMAP_NONE : REMAP_YES; | |
1277 | |
1278 /* | |
1279 * Insert lines into typeahead buffer, from last one to first one. | |
1280 */ | |
1034 | 1281 put_reedit_in_typebuf(silent); |
7 | 1282 for (i = y_current->y_size; --i >= 0; ) |
1283 { | |
1077 | 1284 char_u *escaped; |
1285 | |
7 | 1286 /* insert NL between lines and after last line if type is MLINE */ |
1287 if (y_current->y_type == MLINE || i < y_current->y_size - 1 | |
1288 || addcr) | |
1289 { | |
1034 | 1290 if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) |
7 | 1291 return FAIL; |
1292 } | |
1077 | 1293 escaped = vim_strsave_escape_csi(y_current->y_array[i]); |
1294 if (escaped == NULL) | |
1295 return FAIL; | |
1296 retval = ins_typebuf(escaped, remap, 0, TRUE, silent); | |
1297 vim_free(escaped); | |
1298 if (retval == FAIL) | |
7 | 1299 return FAIL; |
1034 | 1300 if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) |
7 | 1301 == FAIL) |
1302 return FAIL; | |
1303 } | |
1304 Exec_reg = TRUE; /* disable the 'q' command */ | |
1305 } | |
1306 return retval; | |
1307 } | |
1308 | |
1309 /* | |
1310 * If "restart_edit" is not zero, put it in the typeahead buffer, so that it's | |
1311 * used only after other typeahead has been processed. | |
1312 */ | |
1313 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1314 put_reedit_in_typebuf(int silent) |
7 | 1315 { |
1316 char_u buf[3]; | |
1317 | |
1318 if (restart_edit != NUL) | |
1319 { | |
1320 if (restart_edit == 'V') | |
1321 { | |
1322 buf[0] = 'g'; | |
1323 buf[1] = 'R'; | |
1324 buf[2] = NUL; | |
1325 } | |
1326 else | |
1327 { | |
1328 buf[0] = restart_edit == 'I' ? 'i' : restart_edit; | |
1329 buf[1] = NUL; | |
1330 } | |
1034 | 1331 if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK) |
7 | 1332 restart_edit = NUL; |
1333 } | |
1334 } | |
1335 | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1336 /* |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1337 * Insert register contents "s" into the typeahead buffer, so that it will be |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1338 * executed again. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1339 * When "esc" is TRUE it is to be taken literally: Escape CSI characters and |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1340 * no remapping. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1341 */ |
7 | 1342 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1343 put_in_typebuf( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1344 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1345 int esc, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1346 int colon, /* add ':' before the line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1347 int silent) |
7 | 1348 { |
1349 int retval = OK; | |
1350 | |
1034 | 1351 put_reedit_in_typebuf(silent); |
7 | 1352 if (colon) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1353 retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent); |
7 | 1354 if (retval == OK) |
1077 | 1355 { |
1356 char_u *p; | |
1357 | |
1358 if (esc) | |
1359 p = vim_strsave_escape_csi(s); | |
1360 else | |
1361 p = s; | |
1362 if (p == NULL) | |
1363 retval = FAIL; | |
1364 else | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1365 retval = ins_typebuf(p, esc ? REMAP_NONE : REMAP_YES, |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1366 0, TRUE, silent); |
1077 | 1367 if (esc) |
1368 vim_free(p); | |
1369 } | |
7 | 1370 if (colon && retval == OK) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1371 retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent); |
7 | 1372 return retval; |
1373 } | |
1374 | |
1375 /* | |
1376 * Insert a yank register: copy it into the Read buffer. | |
1377 * Used by CTRL-R command and middle mouse button in insert mode. | |
1378 * | |
1379 * return FAIL for failure, OK otherwise | |
1380 */ | |
1381 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1382 insert_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1383 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1384 int literally) /* insert literally, not as if typed */ |
7 | 1385 { |
1386 long i; | |
1387 int retval = OK; | |
1388 char_u *arg; | |
1389 int allocated; | |
1390 | |
1391 /* | |
1392 * It is possible to get into an endless loop by having CTRL-R a in | |
1393 * register a and then, in insert mode, doing CTRL-R a. | |
1394 * If you hit CTRL-C, the loop will be broken here. | |
1395 */ | |
1396 ui_breakcheck(); | |
1397 if (got_int) | |
1398 return FAIL; | |
1399 | |
1400 /* check for valid regname */ | |
1401 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
1402 return FAIL; | |
1403 | |
1404 #ifdef FEAT_CLIPBOARD | |
1405 regname = may_get_selection(regname); | |
1406 #endif | |
1407 | |
1408 if (regname == '.') /* insert last inserted text */ | |
1409 retval = stuff_inserted(NUL, 1L, TRUE); | |
1410 else if (get_spec_reg(regname, &arg, &allocated, TRUE)) | |
1411 { | |
1412 if (arg == NULL) | |
1413 return FAIL; | |
1414 stuffescaped(arg, literally); | |
1415 if (allocated) | |
1416 vim_free(arg); | |
1417 } | |
1418 else /* name or number register */ | |
1419 { | |
1420 get_yank_register(regname, FALSE); | |
1421 if (y_current->y_array == NULL) | |
1422 retval = FAIL; | |
1423 else | |
1424 { | |
1425 for (i = 0; i < y_current->y_size; ++i) | |
1426 { | |
1427 stuffescaped(y_current->y_array[i], literally); | |
1428 /* | |
1429 * Insert a newline between lines and after last line if | |
1430 * y_type is MLINE. | |
1431 */ | |
1432 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
1433 stuffcharReadbuff('\n'); | |
1434 } | |
1435 } | |
1436 } | |
1437 | |
1438 return retval; | |
1439 } | |
1440 | |
1441 /* | |
1442 * Stuff a string into the typeahead buffer, such that edit() will insert it | |
1443 * literally ("literally" TRUE) or interpret is as typed characters. | |
1444 */ | |
1445 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1446 stuffescaped(char_u *arg, int literally) |
7 | 1447 { |
1448 int c; | |
1449 char_u *start; | |
1450 | |
1451 while (*arg != NUL) | |
1452 { | |
1453 /* Stuff a sequence of normal ASCII characters, that's fast. Also | |
1454 * stuff K_SPECIAL to get the effect of a special key when "literally" | |
1455 * is TRUE. */ | |
1456 start = arg; | |
1457 while ((*arg >= ' ' | |
1458 #ifndef EBCDIC | |
1459 && *arg < DEL /* EBCDIC: chars above space are normal */ | |
1460 #endif | |
1461 ) | |
1462 || (*arg == K_SPECIAL && !literally)) | |
1463 ++arg; | |
1464 if (arg > start) | |
1465 stuffReadbuffLen(start, (long)(arg - start)); | |
1466 | |
1467 /* stuff a single special character */ | |
1468 if (*arg != NUL) | |
1469 { | |
1470 #ifdef FEAT_MBYTE | |
1471 if (has_mbyte) | |
2446
348f64c129df
Fixed: CTRL-R in Insert mode doesn't insert composing characters.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1472 c = mb_cptr2char_adv(&arg); |
7 | 1473 else |
1474 #endif | |
1475 c = *arg++; | |
1476 if (literally && ((c < ' ' && c != TAB) || c == DEL)) | |
1477 stuffcharReadbuff(Ctrl_V); | |
1478 stuffcharReadbuff(c); | |
1479 } | |
1480 } | |
1481 } | |
1482 | |
1483 /* | |
1157 | 1484 * If "regname" is a special register, return TRUE and store a pointer to its |
1485 * value in "argp". | |
7 | 1486 */ |
15 | 1487 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1488 get_spec_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1489 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1490 char_u **argp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1491 int *allocated, /* return: TRUE when value was allocated */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1492 int errmsg) /* give error message when failing */ |
7 | 1493 { |
1494 int cnt; | |
1495 | |
1496 *argp = NULL; | |
1497 *allocated = FALSE; | |
1498 switch (regname) | |
1499 { | |
1500 case '%': /* file name */ | |
1501 if (errmsg) | |
1502 check_fname(); /* will give emsg if not set */ | |
1503 *argp = curbuf->b_fname; | |
1504 return TRUE; | |
1505 | |
1506 case '#': /* alternate file name */ | |
1507 *argp = getaltfname(errmsg); /* may give emsg if not set */ | |
1508 return TRUE; | |
1509 | |
1510 #ifdef FEAT_EVAL | |
1511 case '=': /* result of expression */ | |
1512 *argp = get_expr_line(); | |
1513 *allocated = TRUE; | |
1514 return TRUE; | |
1515 #endif | |
1516 | |
1517 case ':': /* last command line */ | |
1518 if (last_cmdline == NULL && errmsg) | |
1519 EMSG(_(e_nolastcmd)); | |
1520 *argp = last_cmdline; | |
1521 return TRUE; | |
1522 | |
1523 case '/': /* last search-pattern */ | |
1524 if (last_search_pat() == NULL && errmsg) | |
1525 EMSG(_(e_noprevre)); | |
1526 *argp = last_search_pat(); | |
1527 return TRUE; | |
1528 | |
1529 case '.': /* last inserted text */ | |
1530 *argp = get_last_insert_save(); | |
1531 *allocated = TRUE; | |
1532 if (*argp == NULL && errmsg) | |
1533 EMSG(_(e_noinstext)); | |
1534 return TRUE; | |
1535 | |
1536 #ifdef FEAT_SEARCHPATH | |
1537 case Ctrl_F: /* Filename under cursor */ | |
1538 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
1539 if (!errmsg) | |
1540 return FALSE; | |
1541 *argp = file_name_at_cursor(FNAME_MESS | FNAME_HYP | |
681 | 1542 | (regname == Ctrl_P ? FNAME_EXP : 0), 1L, NULL); |
7 | 1543 *allocated = TRUE; |
1544 return TRUE; | |
1545 #endif | |
1546 | |
1547 case Ctrl_W: /* word under cursor */ | |
1548 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
1549 if (!errmsg) | |
1550 return FALSE; | |
1551 cnt = find_ident_under_cursor(argp, regname == Ctrl_W | |
1552 ? (FIND_IDENT|FIND_STRING) : FIND_STRING); | |
1553 *argp = cnt ? vim_strnsave(*argp, cnt) : NULL; | |
1554 *allocated = TRUE; | |
1555 return TRUE; | |
1556 | |
1557 case '_': /* black hole: always empty */ | |
1558 *argp = (char_u *)""; | |
1559 return TRUE; | |
1560 } | |
1561 | |
1562 return FALSE; | |
1563 } | |
1564 | |
1565 /* | |
15 | 1566 * Paste a yank register into the command line. |
1567 * Only for non-special registers. | |
1568 * Used by CTRL-R command in command-line mode | |
7 | 1569 * insert_reg() can't be used here, because special characters from the |
1570 * register contents will be interpreted as commands. | |
1571 * | |
1572 * return FAIL for failure, OK otherwise | |
1573 */ | |
1574 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1575 cmdline_paste_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1576 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1577 int literally, /* Insert text literally instead of "as typed" */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1578 int remcr) /* don't add CR characters */ |
7 | 1579 { |
1580 long i; | |
1581 | |
1582 get_yank_register(regname, FALSE); | |
1583 if (y_current->y_array == NULL) | |
1584 return FAIL; | |
1585 | |
1586 for (i = 0; i < y_current->y_size; ++i) | |
1587 { | |
1588 cmdline_paste_str(y_current->y_array[i], literally); | |
1589 | |
1015 | 1590 /* Insert ^M between lines and after last line if type is MLINE. |
7336
4c5f53a60543
commit https://github.com/vim/vim/commit/6f62fed349bf829da2adb02619dc9acba13c8ab6
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
1591 * Don't do this when "remcr" is TRUE. */ |
4c5f53a60543
commit https://github.com/vim/vim/commit/6f62fed349bf829da2adb02619dc9acba13c8ab6
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
1592 if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr) |
7 | 1593 cmdline_paste_str((char_u *)"\r", literally); |
1594 | |
1595 /* Check for CTRL-C, in case someone tries to paste a few thousand | |
1596 * lines and gets bored. */ | |
1597 ui_breakcheck(); | |
1598 if (got_int) | |
1599 return FAIL; | |
1600 } | |
1601 return OK; | |
1602 } | |
1603 | |
1604 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
1605 /* | |
1606 * Adjust the register name pointed to with "rp" for the clipboard being | |
1607 * used always and the clipboard being available. | |
1608 */ | |
1609 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1610 adjust_clip_reg(int *rp) |
7 | 1611 { |
2654 | 1612 /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', |
1613 * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ | |
6116 | 1614 if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0)) |
1615 { | |
1616 if (clip_unnamed != 0) | |
1617 *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
2654 | 1618 ? '+' : '*'; |
6116 | 1619 else |
1620 *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
1621 ? '+' : '*'; | |
1622 } | |
7 | 1623 if (!clip_star.available && *rp == '*') |
1624 *rp = 0; | |
1625 if (!clip_plus.available && *rp == '+') | |
1626 *rp = 0; | |
1627 } | |
1628 #endif | |
1629 | |
1630 /* | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1631 * Handle a delete operation. |
7 | 1632 * |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1633 * Return FAIL if undo failed, OK otherwise. |
7 | 1634 */ |
1635 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1636 op_delete(oparg_T *oap) |
7 | 1637 { |
1638 int n; | |
1639 linenr_T lnum; | |
1640 char_u *ptr; | |
1641 char_u *newp, *oldp; | |
1642 struct block_def bd; | |
1643 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
1644 int did_yank = FALSE; | |
3782 | 1645 int orig_regname = oap->regname; |
7 | 1646 |
1647 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
1648 return OK; | |
1649 | |
1650 /* Nothing to delete, return here. Do prepare undo, for op_change(). */ | |
1651 if (oap->empty) | |
1652 return u_save_cursor(); | |
1653 | |
1654 if (!curbuf->b_p_ma) | |
1655 { | |
1656 EMSG(_(e_modifiable)); | |
1657 return FAIL; | |
1658 } | |
1659 | |
1660 #ifdef FEAT_CLIPBOARD | |
1661 adjust_clip_reg(&oap->regname); | |
1662 #endif | |
1663 | |
1664 #ifdef FEAT_MBYTE | |
1665 if (has_mbyte) | |
1666 mb_adjust_opend(oap); | |
1667 #endif | |
1668 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1669 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1670 * 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
|
1671 * 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
|
1672 * 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
|
1673 */ |
7 | 1674 if ( oap->motion_type == MCHAR |
1675 && !oap->is_VIsual | |
50 | 1676 && !oap->block_mode |
7 | 1677 && oap->line_count > 1 |
3254 | 1678 && oap->motion_force == NUL |
7 | 1679 && oap->op_type == OP_DELETE) |
1680 { | |
2957 | 1681 ptr = ml_get(oap->end.lnum) + oap->end.col; |
1682 if (*ptr != NUL) | |
1683 ptr += oap->inclusive; | |
7 | 1684 ptr = skipwhite(ptr); |
1685 if (*ptr == NUL && inindent(0)) | |
1686 oap->motion_type = MLINE; | |
1687 } | |
1688 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1689 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1690 * 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
|
1691 * 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
|
1692 */ |
7 | 1693 if ( oap->motion_type == MCHAR |
1694 && oap->line_count == 1 | |
1695 && oap->op_type == OP_DELETE | |
1696 && *ml_get(oap->start.lnum) == NUL) | |
1697 { | |
1698 /* | |
446 | 1699 * It's an error to operate on an empty region, when 'E' included in |
7 | 1700 * 'cpoptions' (Vi compatible). |
1701 */ | |
446 | 1702 #ifdef FEAT_VIRTUALEDIT |
1703 if (virtual_op) | |
1704 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
1705 * marks as if it happened. */ | |
1706 goto setmarks; | |
1707 #endif | |
7 | 1708 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
1709 beep_flush(); | |
1710 return OK; | |
1711 } | |
1712 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1713 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1714 * 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
|
1715 * 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
|
1716 * 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
|
1717 */ |
7 | 1718 if (oap->regname != '_') |
1719 { | |
1720 if (oap->regname != 0) | |
1721 { | |
1722 /* check for read-only register */ | |
1723 if (!valid_yank_reg(oap->regname, TRUE)) | |
1724 { | |
1725 beep_flush(); | |
1726 return OK; | |
1727 } | |
1728 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
1729 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
1730 did_yank = TRUE; | |
1731 } | |
1732 | |
1733 /* | |
1734 * Put deleted text into register 1 and shift number registers if the | |
1735 * delete contains a line break, or when a regname has been specified. | |
3782 | 1736 * Use the register name from before adjust_clip_reg() may have |
1737 * changed it. | |
7 | 1738 */ |
3782 | 1739 if (orig_regname != 0 || oap->motion_type == MLINE |
7 | 1740 || oap->line_count > 1 || oap->use_reg_one) |
1741 { | |
1742 y_current = &y_regs[9]; | |
1743 free_yank_all(); /* free register nine */ | |
1744 for (n = 9; n > 1; --n) | |
1745 y_regs[n] = y_regs[n - 1]; | |
1746 y_previous = y_current = &y_regs[1]; | |
1747 y_regs[1].y_array = NULL; /* set register one to empty */ | |
1748 if (op_yank(oap, TRUE, FALSE) == OK) | |
1749 did_yank = TRUE; | |
1750 } | |
1751 | |
3468 | 1752 /* Yank into small delete register when no named register specified |
1753 * and the delete is within one line. */ | |
1754 if (( | |
1755 #ifdef FEAT_CLIPBOARD | |
3584 | 1756 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
1757 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
3468 | 1758 #endif |
1759 oap->regname == 0) && oap->motion_type != MLINE | |
7 | 1760 && oap->line_count == 1) |
1761 { | |
1762 oap->regname = '-'; | |
1763 get_yank_register(oap->regname, TRUE); | |
1764 if (op_yank(oap, TRUE, FALSE) == OK) | |
1765 did_yank = TRUE; | |
1766 oap->regname = 0; | |
1767 } | |
1768 | |
1769 /* | |
1770 * If there's too much stuff to fit in the yank register, then get a | |
1771 * confirmation before doing the delete. This is crude, but simple. | |
1772 * And it avoids doing a delete of something we can't put back if we | |
1773 * want. | |
1774 */ | |
1775 if (!did_yank) | |
1776 { | |
1777 int msg_silent_save = msg_silent; | |
1778 | |
1779 msg_silent = 0; /* must display the prompt */ | |
1780 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
1781 msg_silent = msg_silent_save; | |
1782 if (n != 'y') | |
1783 { | |
1784 EMSG(_(e_abort)); | |
1785 return FAIL; | |
1786 } | |
1787 } | |
1788 } | |
1789 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1790 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1791 * 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
|
1792 */ |
7 | 1793 if (oap->block_mode) |
1794 { | |
1795 if (u_save((linenr_T)(oap->start.lnum - 1), | |
1796 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
1797 return FAIL; | |
1798 | |
1799 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
1800 { | |
1801 block_prep(oap, &bd, lnum, TRUE); | |
1802 if (bd.textlen == 0) /* nothing to delete */ | |
1803 continue; | |
1804 | |
1805 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
1806 if (lnum == curwin->w_cursor.lnum) | |
1807 { | |
1808 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
1809 # ifdef FEAT_VIRTUALEDIT | |
1810 curwin->w_cursor.coladd = 0; | |
1811 # endif | |
1812 } | |
1813 | |
1814 /* n == number of chars deleted | |
1815 * If we delete a TAB, it may be replaced by several characters. | |
1816 * Thus the number of characters may increase! | |
1817 */ | |
1818 n = bd.textlen - bd.startspaces - bd.endspaces; | |
1819 oldp = ml_get(lnum); | |
1820 newp = alloc_check((unsigned)STRLEN(oldp) + 1 - n); | |
1821 if (newp == NULL) | |
1822 continue; | |
1823 /* copy up to deleted part */ | |
1824 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
1825 /* insert spaces */ | |
6929 | 1826 vim_memset(newp + bd.textcol, ' ', |
7 | 1827 (size_t)(bd.startspaces + bd.endspaces)); |
1828 /* copy the part after the deleted part */ | |
1829 oldp += bd.textcol + bd.textlen; | |
1622 | 1830 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
7 | 1831 /* replace the line */ |
1832 ml_replace(lnum, newp, FALSE); | |
1833 } | |
1834 | |
1835 check_cursor_col(); | |
1836 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
1837 oap->end.lnum + 1, 0L); | |
1838 oap->line_count = 0; /* no lines deleted */ | |
1839 } | |
5735 | 1840 else if (oap->motion_type == MLINE) |
7 | 1841 { |
1842 if (oap->op_type == OP_CHANGE) | |
1843 { | |
1844 /* Delete the lines except the first one. Temporarily move the | |
1845 * cursor to the next line. Save the current line number, if the | |
1846 * last line is deleted it may be changed. | |
1847 */ | |
1848 if (oap->line_count > 1) | |
1849 { | |
1850 lnum = curwin->w_cursor.lnum; | |
1851 ++curwin->w_cursor.lnum; | |
1852 del_lines((long)(oap->line_count - 1), TRUE); | |
1853 curwin->w_cursor.lnum = lnum; | |
1854 } | |
1855 if (u_save_cursor() == FAIL) | |
1856 return FAIL; | |
1857 if (curbuf->b_p_ai) /* don't delete indent */ | |
1858 { | |
1859 beginline(BL_WHITE); /* cursor on first non-white */ | |
1860 did_ai = TRUE; /* delete the indent when ESC hit */ | |
1861 ai_col = curwin->w_cursor.col; | |
1862 } | |
1863 else | |
1864 beginline(0); /* cursor in column 0 */ | |
1865 truncate_line(FALSE); /* delete the rest of the line */ | |
1866 /* leave cursor past last char in line */ | |
1867 if (oap->line_count > 1) | |
1868 u_clearline(); /* "U" command not possible after "2cc" */ | |
1869 } | |
1870 else | |
1871 { | |
1872 del_lines(oap->line_count, TRUE); | |
1873 beginline(BL_WHITE | BL_FIX); | |
1874 u_clearline(); /* "U" command not possible after "dd" */ | |
1875 } | |
1876 } | |
1877 else | |
1878 { | |
1879 #ifdef FEAT_VIRTUALEDIT | |
1880 if (virtual_op) | |
1881 { | |
1882 int endcol = 0; | |
1883 | |
1884 /* For virtualedit: break the tabs that are partly included. */ | |
1885 if (gchar_pos(&oap->start) == '\t') | |
1886 { | |
1887 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
1888 return FAIL; | |
1889 if (oap->line_count == 1) | |
1890 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
1891 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
1892 oap->start = curwin->w_cursor; | |
1893 if (oap->line_count == 1) | |
1894 { | |
1895 coladvance(endcol); | |
1896 oap->end.col = curwin->w_cursor.col; | |
1897 oap->end.coladd = curwin->w_cursor.coladd; | |
1898 curwin->w_cursor = oap->start; | |
1899 } | |
1900 } | |
1901 | |
1902 /* Break a tab only when it's included in the area. */ | |
1903 if (gchar_pos(&oap->end) == '\t' | |
1904 && (int)oap->end.coladd < oap->inclusive) | |
1905 { | |
1906 /* save last line for undo */ | |
1907 if (u_save((linenr_T)(oap->end.lnum - 1), | |
1908 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
1909 return FAIL; | |
1910 curwin->w_cursor = oap->end; | |
1911 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
1912 oap->end = curwin->w_cursor; | |
1913 curwin->w_cursor = oap->start; | |
1914 } | |
1915 } | |
1916 #endif | |
1917 | |
1918 if (oap->line_count == 1) /* delete characters within one line */ | |
1919 { | |
1920 if (u_save_cursor() == FAIL) /* save line for undo */ | |
1921 return FAIL; | |
1922 | |
1923 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
5735 | 1924 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
7 | 1925 && oap->op_type == OP_CHANGE |
1926 && oap->end.lnum == curwin->w_cursor.lnum | |
5735 | 1927 && !oap->is_VIsual) |
7 | 1928 display_dollar(oap->end.col - !oap->inclusive); |
1929 | |
1930 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
1931 | |
1932 #ifdef FEAT_VIRTUALEDIT | |
1933 if (virtual_op) | |
1934 { | |
1935 /* fix up things for virtualedit-delete: | |
1936 * break the tabs which are going to get in our way | |
1937 */ | |
1938 char_u *curline = ml_get_curline(); | |
1939 int len = (int)STRLEN(curline); | |
1940 | |
1941 if (oap->end.coladd != 0 | |
1942 && (int)oap->end.col >= len - 1 | |
1943 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
1944 n++; | |
1945 /* Delete at least one char (e.g, when on a control char). */ | |
1946 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
1947 n = 1; | |
1948 | |
1949 /* When deleted a char in the line, reset coladd. */ | |
1950 if (gchar_cursor() != NUL) | |
1951 curwin->w_cursor.coladd = 0; | |
1952 } | |
1953 #endif | |
6826 | 1954 (void)del_bytes((long)n, !virtual_op, |
1955 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
7 | 1956 } |
1957 else /* delete characters between lines */ | |
1958 { | |
1959 pos_T curpos; | |
1960 | |
1961 /* save deleted and changed lines for undo */ | |
1962 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
1963 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
1964 return FAIL; | |
1965 | |
1966 truncate_line(TRUE); /* delete from cursor to end of line */ | |
1967 | |
1968 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
1969 ++curwin->w_cursor.lnum; | |
1970 del_lines((long)(oap->line_count - 2), FALSE); | |
1971 | |
6826 | 1972 /* delete from start of line until op_end */ |
2957 | 1973 n = (oap->end.col + 1 - !oap->inclusive); |
6826 | 1974 curwin->w_cursor.col = 0; |
1975 (void)del_bytes((long)n, !virtual_op, | |
1976 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
1977 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
1978 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
7 | 1979 } |
1980 } | |
1981 | |
1982 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
1983 | |
446 | 1984 #ifdef FEAT_VIRTUALEDIT |
1985 setmarks: | |
1986 #endif | |
7 | 1987 if (oap->block_mode) |
1988 { | |
1989 curbuf->b_op_end.lnum = oap->end.lnum; | |
1990 curbuf->b_op_end.col = oap->start.col; | |
1991 } | |
1992 else | |
1993 curbuf->b_op_end = oap->start; | |
1994 curbuf->b_op_start = oap->start; | |
1995 | |
1996 return OK; | |
1997 } | |
1998 | |
1999 #ifdef FEAT_MBYTE | |
2000 /* | |
2001 * Adjust end of operating area for ending on a multi-byte character. | |
2002 * Used for deletion. | |
2003 */ | |
2004 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2005 mb_adjust_opend(oparg_T *oap) |
7 | 2006 { |
2007 char_u *p; | |
2008 | |
2009 if (oap->inclusive) | |
2010 { | |
2011 p = ml_get(oap->end.lnum); | |
2012 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
2013 } | |
2014 } | |
2015 #endif | |
2016 | |
2017 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
2018 /* | |
2019 * Replace a whole area with one character. | |
2020 */ | |
2021 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2022 op_replace(oparg_T *oap, int c) |
7 | 2023 { |
2024 int n, numc; | |
2025 #ifdef FEAT_MBYTE | |
2026 int num_chars; | |
2027 #endif | |
2028 char_u *newp, *oldp; | |
2029 size_t oldlen; | |
2030 struct block_def bd; | |
5428 | 2031 char_u *after_p = NULL; |
2032 int had_ctrl_v_cr = (c == -1 || c == -2); | |
7 | 2033 |
2034 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
2035 return OK; /* nothing to do */ | |
2036 | |
5428 | 2037 if (had_ctrl_v_cr) |
2038 c = (c == -1 ? '\r' : '\n'); | |
2039 | |
7 | 2040 #ifdef FEAT_MBYTE |
2041 if (has_mbyte) | |
2042 mb_adjust_opend(oap); | |
2043 #endif | |
2044 | |
2045 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2046 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2047 return FAIL; | |
2048 | |
2049 /* | |
2050 * block mode replace | |
2051 */ | |
2052 if (oap->block_mode) | |
2053 { | |
2054 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2055 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
2056 { | |
1982 | 2057 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
7 | 2058 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
2059 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
2060 continue; /* nothing to replace */ | |
2061 | |
2062 /* n == number of extra chars required | |
2063 * If we split a TAB, it may be replaced by several characters. | |
2064 * Thus the number of characters may increase! | |
2065 */ | |
2066 #ifdef FEAT_VIRTUALEDIT | |
2067 /* If the range starts in virtual space, count the initial | |
2068 * coladd offset as part of "startspaces" */ | |
2069 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
2070 { | |
2071 pos_T vpos; | |
2072 | |
1982 | 2073 vpos.lnum = curwin->w_cursor.lnum; |
7 | 2074 getvpos(&vpos, oap->start_vcol); |
2075 bd.startspaces += vpos.coladd; | |
2076 n = bd.startspaces; | |
2077 } | |
2078 else | |
2079 #endif | |
2080 /* allow for pre spaces */ | |
2081 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
2082 | |
2083 /* allow for post spp */ | |
2084 n += (bd.endspaces | |
2085 #ifdef FEAT_VIRTUALEDIT | |
2086 && !bd.is_oneChar | |
2087 #endif | |
2088 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
2089 /* Figure out how many characters to replace. */ | |
2090 numc = oap->end_vcol - oap->start_vcol + 1; | |
2091 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
2092 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
2093 | |
2094 #ifdef FEAT_MBYTE | |
2095 /* A double-wide character can be replaced only up to half the | |
2096 * times. */ | |
2097 if ((*mb_char2cells)(c) > 1) | |
2098 { | |
2099 if ((numc & 1) && !bd.is_short) | |
2100 { | |
2101 ++bd.endspaces; | |
2102 ++n; | |
2103 } | |
2104 numc = numc / 2; | |
2105 } | |
2106 | |
2107 /* Compute bytes needed, move character count to num_chars. */ | |
2108 num_chars = numc; | |
2109 numc *= (*mb_char2len)(c); | |
2110 #endif | |
2111 /* oldlen includes textlen, so don't double count */ | |
2112 n += numc - bd.textlen; | |
2113 | |
2114 oldp = ml_get_curline(); | |
2115 oldlen = STRLEN(oldp); | |
2116 newp = alloc_check((unsigned)oldlen + 1 + n); | |
2117 if (newp == NULL) | |
2118 continue; | |
2119 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
2120 /* copy up to deleted part */ | |
2121 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2122 oldp += bd.textcol + bd.textlen; | |
2123 /* insert pre-spaces */ | |
6929 | 2124 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
7 | 2125 /* insert replacement chars CHECK FOR ALLOCATED SPACE */ |
5428 | 2126 /* -1/-2 is used for entering CR literally. */ |
2127 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) | |
7 | 2128 { |
5428 | 2129 #ifdef FEAT_MBYTE |
2130 if (has_mbyte) | |
2131 { | |
2132 n = (int)STRLEN(newp); | |
2133 while (--num_chars >= 0) | |
2134 n += (*mb_char2bytes)(c, newp + n); | |
2135 } | |
2136 else | |
2137 #endif | |
6929 | 2138 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
5428 | 2139 if (!bd.is_short) |
2140 { | |
2141 /* insert post-spaces */ | |
6929 | 2142 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
5428 | 2143 /* copy the part after the changed part */ |
2144 STRMOVE(newp + STRLEN(newp), oldp); | |
2145 } | |
7 | 2146 } |
2147 else | |
2148 { | |
5428 | 2149 /* Replacing with \r or \n means splitting the line. */ |
5475 | 2150 after_p = alloc_check( |
2151 (unsigned)(oldlen + 1 + n - STRLEN(newp))); | |
5428 | 2152 if (after_p != NULL) |
2153 STRMOVE(after_p, oldp); | |
7 | 2154 } |
2155 /* replace the line */ | |
2156 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
5428 | 2157 if (after_p != NULL) |
2158 { | |
2159 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
2160 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
2161 oap->end.lnum++; | |
2162 vim_free(after_p); | |
2163 } | |
7 | 2164 } |
2165 } | |
2166 else | |
2167 { | |
2168 /* | |
2169 * MCHAR and MLINE motion replace. | |
2170 */ | |
2171 if (oap->motion_type == MLINE) | |
2172 { | |
2173 oap->start.col = 0; | |
2174 curwin->w_cursor.col = 0; | |
2175 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2176 if (oap->end.col) | |
2177 --oap->end.col; | |
2178 } | |
2179 else if (!oap->inclusive) | |
2180 dec(&(oap->end)); | |
2181 | |
2182 while (ltoreq(curwin->w_cursor, oap->end)) | |
2183 { | |
2184 n = gchar_cursor(); | |
2185 if (n != NUL) | |
2186 { | |
2187 #ifdef FEAT_MBYTE | |
2188 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
2189 { | |
2190 /* This is slow, but it handles replacing a single-byte | |
2191 * with a multi-byte and the other way around. */ | |
4203 | 2192 if (curwin->w_cursor.lnum == oap->end.lnum) |
2193 oap->end.col += (*mb_char2len)(c) - (*mb_char2len)(n); | |
7 | 2194 n = State; |
2195 State = REPLACE; | |
2196 ins_char(c); | |
2197 State = n; | |
2198 /* Backup to the replaced character. */ | |
2199 dec_cursor(); | |
2200 } | |
2201 else | |
2202 #endif | |
2203 { | |
2204 #ifdef FEAT_VIRTUALEDIT | |
2205 if (n == TAB) | |
2206 { | |
2207 int end_vcol = 0; | |
2208 | |
2209 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2210 { | |
2211 /* oap->end has to be recalculated when | |
2212 * the tab breaks */ | |
2213 end_vcol = getviscol2(oap->end.col, | |
2214 oap->end.coladd); | |
2215 } | |
2216 coladvance_force(getviscol()); | |
2217 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2218 getvpos(&oap->end, end_vcol); | |
2219 } | |
2220 #endif | |
2221 pchar(curwin->w_cursor, c); | |
2222 } | |
2223 } | |
2224 #ifdef FEAT_VIRTUALEDIT | |
2225 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
2226 { | |
2227 int virtcols = oap->end.coladd; | |
2228 | |
2229 if (curwin->w_cursor.lnum == oap->start.lnum | |
2230 && oap->start.col == oap->end.col && oap->start.coladd) | |
2231 virtcols -= oap->start.coladd; | |
2232 | |
2233 /* oap->end has been trimmed so it's effectively inclusive; | |
2234 * as a result an extra +1 must be counted so we don't | |
2235 * trample the NUL byte. */ | |
2236 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
2237 curwin->w_cursor.col -= (virtcols + 1); | |
2238 for (; virtcols >= 0; virtcols--) | |
2239 { | |
2240 pchar(curwin->w_cursor, c); | |
2241 if (inc(&curwin->w_cursor) == -1) | |
2242 break; | |
2243 } | |
2244 } | |
2245 #endif | |
2246 | |
2247 /* Advance to next character, stop at the end of the file. */ | |
2248 if (inc_cursor() == -1) | |
2249 break; | |
2250 } | |
2251 } | |
2252 | |
2253 curwin->w_cursor = oap->start; | |
2254 check_cursor(); | |
2255 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
2256 | |
2257 /* Set "'[" and "']" marks. */ | |
2258 curbuf->b_op_start = oap->start; | |
2259 curbuf->b_op_end = oap->end; | |
2260 | |
2261 return OK; | |
2262 } | |
2263 #endif | |
2264 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2265 static int swapchars(int op_type, pos_T *pos, int length); |
1525 | 2266 |
7 | 2267 /* |
2268 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
2269 */ | |
2270 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2271 op_tilde(oparg_T *oap) |
7 | 2272 { |
2273 pos_T pos; | |
2274 struct block_def bd; | |
1528 | 2275 int did_change = FALSE; |
7 | 2276 |
2277 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2278 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2279 return; | |
2280 | |
2281 pos = oap->start; | |
2282 if (oap->block_mode) /* Visual block mode */ | |
2283 { | |
2284 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
2285 { | |
1766 | 2286 int one_change; |
2287 | |
7 | 2288 block_prep(oap, &bd, pos.lnum, FALSE); |
2289 pos.col = bd.textcol; | |
1766 | 2290 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
2291 did_change |= one_change; | |
1525 | 2292 |
5735 | 2293 #ifdef FEAT_NETBEANS_INTG |
2210 | 2294 if (netbeans_active() && one_change) |
7 | 2295 { |
2296 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2297 | |
33 | 2298 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
2299 (long)bd.textlen); | |
7 | 2300 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
2210 | 2301 &ptr[bd.textcol], bd.textlen); |
7 | 2302 } |
5735 | 2303 #endif |
7 | 2304 } |
2305 if (did_change) | |
2306 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
2307 } | |
2308 else /* not block mode */ | |
2309 { | |
2310 if (oap->motion_type == MLINE) | |
2311 { | |
2312 oap->start.col = 0; | |
2313 pos.col = 0; | |
2314 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2315 if (oap->end.col) | |
2316 --oap->end.col; | |
2317 } | |
2318 else if (!oap->inclusive) | |
2319 dec(&(oap->end)); | |
2320 | |
1528 | 2321 if (pos.lnum == oap->end.lnum) |
2322 did_change = swapchars(oap->op_type, &pos, | |
2323 oap->end.col - pos.col + 1); | |
2324 else | |
2325 for (;;) | |
2326 { | |
2327 did_change |= swapchars(oap->op_type, &pos, | |
2328 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
2329 (int)STRLEN(ml_get_pos(&pos))); | |
2330 if (ltoreq(oap->end, pos) || inc(&pos) == -1) | |
2331 break; | |
2332 } | |
7 | 2333 if (did_change) |
2334 { | |
2335 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
2336 0L); | |
2337 #ifdef FEAT_NETBEANS_INTG | |
2210 | 2338 if (netbeans_active() && did_change) |
7 | 2339 { |
2340 char_u *ptr; | |
2341 int count; | |
2342 | |
2343 pos = oap->start; | |
2344 while (pos.lnum < oap->end.lnum) | |
2345 { | |
2346 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
835 | 2347 count = (int)STRLEN(ptr) - pos.col; |
33 | 2348 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2349 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2350 &ptr[pos.col], count); |
7 | 2351 pos.col = 0; |
2352 pos.lnum++; | |
2353 } | |
2354 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2355 count = oap->end.col - pos.col + 1; | |
33 | 2356 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2357 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2358 &ptr[pos.col], count); |
7 | 2359 } |
2360 #endif | |
2361 } | |
2362 } | |
2363 | |
2364 if (!did_change && oap->is_VIsual) | |
2365 /* No change: need to remove the Visual selection */ | |
2366 redraw_curbuf_later(INVERTED); | |
2367 | |
2368 /* | |
2369 * Set '[ and '] marks. | |
2370 */ | |
2371 curbuf->b_op_start = oap->start; | |
2372 curbuf->b_op_end = oap->end; | |
2373 | |
2374 if (oap->line_count > p_report) | |
2375 { | |
2376 if (oap->line_count == 1) | |
2377 MSG(_("1 line changed")); | |
2378 else | |
2379 smsg((char_u *)_("%ld lines changed"), oap->line_count); | |
2380 } | |
2381 } | |
2382 | |
2383 /* | |
1525 | 2384 * Invoke swapchar() on "length" bytes at position "pos". |
2385 * "pos" is advanced to just after the changed characters. | |
2386 * "length" is rounded up to include the whole last multi-byte character. | |
2387 * Also works correctly when the number of bytes changes. | |
2388 * Returns TRUE if some character was changed. | |
2389 */ | |
2390 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2391 swapchars(int op_type, pos_T *pos, int length) |
1525 | 2392 { |
2393 int todo; | |
2394 int did_change = 0; | |
2395 | |
2396 for (todo = length; todo > 0; --todo) | |
2397 { | |
2398 # ifdef FEAT_MBYTE | |
2399 if (has_mbyte) | |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2400 { |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2401 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2402 |
1525 | 2403 /* we're counting bytes, not characters */ |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2404 if (len > 0) |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2405 todo -= len - 1; |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2406 } |
1525 | 2407 # endif |
2408 did_change |= swapchar(op_type, pos); | |
2409 if (inc(pos) == -1) /* at end of file */ | |
2410 break; | |
2411 } | |
2412 return did_change; | |
2413 } | |
2414 | |
2415 /* | |
7 | 2416 * If op_type == OP_UPPER: make uppercase, |
2417 * if op_type == OP_LOWER: make lowercase, | |
2418 * if op_type == OP_ROT13: do rot13 encoding, | |
2419 * else swap case of character at 'pos' | |
2420 * returns TRUE when something actually changed. | |
2421 */ | |
2422 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2423 swapchar(int op_type, pos_T *pos) |
7 | 2424 { |
2425 int c; | |
2426 int nc; | |
2427 | |
2428 c = gchar_pos(pos); | |
2429 | |
2430 /* Only do rot13 encoding for ASCII characters. */ | |
2431 if (c >= 0x80 && op_type == OP_ROT13) | |
2432 return FALSE; | |
2433 | |
2434 #ifdef FEAT_MBYTE | |
1525 | 2435 if (op_type == OP_UPPER && c == 0xdf |
2436 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
493 | 2437 { |
2438 pos_T sp = curwin->w_cursor; | |
2439 | |
2440 /* Special handling of German sharp s: change to "SS". */ | |
2441 curwin->w_cursor = *pos; | |
2442 del_char(FALSE); | |
2443 ins_char('S'); | |
2444 ins_char('S'); | |
2445 curwin->w_cursor = sp; | |
2446 inc(pos); | |
2447 } | |
2448 | |
7 | 2449 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
2450 return FALSE; | |
2451 #endif | |
2452 nc = c; | |
2453 if (MB_ISLOWER(c)) | |
2454 { | |
2455 if (op_type == OP_ROT13) | |
2456 nc = ROT13(c, 'a'); | |
2457 else if (op_type != OP_LOWER) | |
2458 nc = MB_TOUPPER(c); | |
2459 } | |
2460 else if (MB_ISUPPER(c)) | |
2461 { | |
2462 if (op_type == OP_ROT13) | |
2463 nc = ROT13(c, 'A'); | |
2464 else if (op_type != OP_UPPER) | |
2465 nc = MB_TOLOWER(c); | |
2466 } | |
2467 if (nc != c) | |
2468 { | |
2469 #ifdef FEAT_MBYTE | |
2470 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
2471 { | |
2472 pos_T sp = curwin->w_cursor; | |
2473 | |
2474 curwin->w_cursor = *pos; | |
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2475 /* 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
|
2476 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
7 | 2477 ins_char(nc); |
2478 curwin->w_cursor = sp; | |
2479 } | |
2480 else | |
2481 #endif | |
2482 pchar(*pos, nc); | |
2483 return TRUE; | |
2484 } | |
2485 return FALSE; | |
2486 } | |
2487 | |
2488 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
2489 /* | |
2490 * op_insert - Insert and append operators for Visual mode. | |
2491 */ | |
2492 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2493 op_insert(oparg_T *oap, long count1) |
7 | 2494 { |
2495 long ins_len, pre_textlen = 0; | |
2496 char_u *firstline, *ins_text; | |
2497 struct block_def bd; | |
2498 int i; | |
6579 | 2499 pos_T t1; |
7 | 2500 |
2501 /* edit() changes this - record it for OP_APPEND */ | |
2502 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2503 | |
2504 /* vis block is still marked. Get rid of it now. */ | |
2505 curwin->w_cursor.lnum = oap->start.lnum; | |
2506 update_screen(INVERTED); | |
2507 | |
2508 if (oap->block_mode) | |
2509 { | |
2510 #ifdef FEAT_VIRTUALEDIT | |
2511 /* When 'virtualedit' is used, need to insert the extra spaces before | |
2512 * doing block_prep(). When only "block" is used, virtual edit is | |
2513 * already disabled, but still need it when calling | |
2514 * coladvance_force(). */ | |
2515 if (curwin->w_cursor.coladd > 0) | |
2516 { | |
2517 int old_ve_flags = ve_flags; | |
2518 | |
2519 ve_flags = VE_ALL; | |
2520 if (u_save_cursor() == FAIL) | |
2521 return; | |
2522 coladvance_force(oap->op_type == OP_APPEND | |
2523 ? oap->end_vcol + 1 : getviscol()); | |
2524 if (oap->op_type == OP_APPEND) | |
2525 --curwin->w_cursor.col; | |
2526 ve_flags = old_ve_flags; | |
2527 } | |
2528 #endif | |
2529 /* Get the info about the block before entering the text */ | |
2530 block_prep(oap, &bd, oap->start.lnum, TRUE); | |
2531 firstline = ml_get(oap->start.lnum) + bd.textcol; | |
2532 if (oap->op_type == OP_APPEND) | |
2533 firstline += bd.textlen; | |
2534 pre_textlen = (long)STRLEN(firstline); | |
2535 } | |
2536 | |
2537 if (oap->op_type == OP_APPEND) | |
2538 { | |
2539 if (oap->block_mode | |
2540 #ifdef FEAT_VIRTUALEDIT | |
2541 && curwin->w_cursor.coladd == 0 | |
2542 #endif | |
2543 ) | |
2544 { | |
2545 /* Move the cursor to the character right of the block. */ | |
2546 curwin->w_set_curswant = TRUE; | |
2547 while (*ml_get_cursor() != NUL | |
2548 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
2549 ++curwin->w_cursor.col; | |
2550 if (bd.is_short && !bd.is_MAX) | |
2551 { | |
2552 /* First line was too short, make it longer and adjust the | |
2553 * values in "bd". */ | |
2554 if (u_save_cursor() == FAIL) | |
2555 return; | |
2556 for (i = 0; i < bd.endspaces; ++i) | |
2557 ins_char(' '); | |
2558 bd.textlen += bd.endspaces; | |
2559 } | |
2560 } | |
2561 else | |
2562 { | |
2563 curwin->w_cursor = oap->end; | |
893 | 2564 check_cursor_col(); |
7 | 2565 |
2566 /* Works just like an 'i'nsert on the next character. */ | |
2567 if (!lineempty(curwin->w_cursor.lnum) | |
2568 && oap->start_vcol != oap->end_vcol) | |
2569 inc_cursor(); | |
2570 } | |
2571 } | |
2572 | |
6579 | 2573 t1 = oap->start; |
7 | 2574 edit(NUL, FALSE, (linenr_T)count1); |
2575 | |
6579 | 2576 /* When a tab was inserted, and the characters in front of the tab |
2577 * have been converted to a tab as well, the column of the cursor | |
2578 * might have actually been reduced, so need to adjust here. */ | |
2579 if (t1.lnum == curbuf->b_op_start_orig.lnum | |
2580 && lt(curbuf->b_op_start_orig, t1)) | |
2581 oap->start = curbuf->b_op_start_orig; | |
2582 | |
1477 | 2583 /* If user has moved off this line, we don't know what to do, so do |
2584 * nothing. | |
2585 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
2586 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
7 | 2587 return; |
2588 | |
2589 if (oap->block_mode) | |
2590 { | |
2591 struct block_def bd2; | |
2592 | |
5471 | 2593 /* The user may have moved the cursor before inserting something, try |
2594 * to adjust the block for that. */ | |
5680 | 2595 if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX) |
5471 | 2596 { |
2597 if (oap->op_type == OP_INSERT | |
5730 | 2598 && oap->start.col |
2599 #ifdef FEAT_VIRTUALEDIT | |
2600 + oap->start.coladd | |
2601 #endif | |
2602 != curbuf->b_op_start_orig.col | |
2603 #ifdef FEAT_VIRTUALEDIT | |
2604 + curbuf->b_op_start_orig.coladd | |
2605 #endif | |
2606 ) | |
5471 | 2607 { |
6579 | 2608 int t = getviscol2(curbuf->b_op_start_orig.col, |
2609 curbuf->b_op_start_orig.coladd); | |
5680 | 2610 oap->start.col = curbuf->b_op_start_orig.col; |
6579 | 2611 pre_textlen -= t - oap->start_vcol; |
2612 oap->start_vcol = t; | |
5471 | 2613 } |
2614 else if (oap->op_type == OP_APPEND | |
5730 | 2615 && oap->end.col |
2616 #ifdef FEAT_VIRTUALEDIT | |
2617 + oap->end.coladd | |
2618 #endif | |
2619 >= curbuf->b_op_start_orig.col | |
2620 #ifdef FEAT_VIRTUALEDIT | |
2621 + curbuf->b_op_start_orig.coladd | |
2622 #endif | |
2623 ) | |
5471 | 2624 { |
6579 | 2625 int t = getviscol2(curbuf->b_op_start_orig.col, |
2626 curbuf->b_op_start_orig.coladd); | |
5680 | 2627 oap->start.col = curbuf->b_op_start_orig.col; |
5471 | 2628 /* reset pre_textlen to the value of OP_INSERT */ |
2629 pre_textlen += bd.textlen; | |
6579 | 2630 pre_textlen -= t - oap->start_vcol; |
2631 oap->start_vcol = t; | |
5471 | 2632 oap->op_type = OP_INSERT; |
2633 } | |
2634 } | |
2635 | |
7 | 2636 /* |
2637 * Spaces and tabs in the indent may have changed to other spaces and | |
1392 | 2638 * tabs. Get the starting column again and correct the length. |
7 | 2639 * Don't do this when "$" used, end-of-line will have changed. |
2640 */ | |
2641 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
2642 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
2643 { | |
2644 if (oap->op_type == OP_APPEND) | |
2645 { | |
2646 pre_textlen += bd2.textlen - bd.textlen; | |
2647 if (bd2.endspaces) | |
2648 --bd2.textlen; | |
2649 } | |
2650 bd.textcol = bd2.textcol; | |
2651 bd.textlen = bd2.textlen; | |
2652 } | |
2653 | |
2654 /* | |
2655 * Subsequent calls to ml_get() flush the firstline data - take a | |
2656 * copy of the required string. | |
2657 */ | |
2658 firstline = ml_get(oap->start.lnum) + bd.textcol; | |
2659 if (oap->op_type == OP_APPEND) | |
2660 firstline += bd.textlen; | |
3421 | 2661 if (pre_textlen >= 0 |
2662 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
7 | 2663 { |
2664 ins_text = vim_strnsave(firstline, (int)ins_len); | |
2665 if (ins_text != NULL) | |
2666 { | |
2667 /* block handled here */ | |
2668 if (u_save(oap->start.lnum, | |
2669 (linenr_T)(oap->end.lnum + 1)) == OK) | |
2670 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
2671 &bd); | |
2672 | |
2673 curwin->w_cursor.col = oap->start.col; | |
2674 check_cursor(); | |
2675 vim_free(ins_text); | |
2676 } | |
2677 } | |
2678 } | |
2679 } | |
2680 #endif | |
2681 | |
2682 /* | |
2683 * op_change - handle a change operation | |
2684 * | |
2685 * return TRUE if edit() returns because of a CTRL-O command | |
2686 */ | |
2687 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2688 op_change(oparg_T *oap) |
7 | 2689 { |
2690 colnr_T l; | |
2691 int retval; | |
2692 #ifdef FEAT_VISUALEXTRA | |
2693 long offset; | |
2694 linenr_T linenr; | |
1392 | 2695 long ins_len; |
2696 long pre_textlen = 0; | |
2697 long pre_indent = 0; | |
7 | 2698 char_u *firstline; |
2699 char_u *ins_text, *newp, *oldp; | |
2700 struct block_def bd; | |
2701 #endif | |
2702 | |
2703 l = oap->start.col; | |
2704 if (oap->motion_type == MLINE) | |
2705 { | |
2706 l = 0; | |
2707 #ifdef FEAT_SMARTINDENT | |
2708 if (!p_paste && curbuf->b_p_si | |
2709 # ifdef FEAT_CINDENT | |
2710 && !curbuf->b_p_cin | |
2711 # endif | |
2712 ) | |
2713 can_si = TRUE; /* It's like opening a new line, do si */ | |
2714 #endif | |
2715 } | |
2716 | |
2717 /* First delete the text in the region. In an empty buffer only need to | |
2718 * save for undo */ | |
2719 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
2720 { | |
2721 if (u_save_cursor() == FAIL) | |
2722 return FALSE; | |
2723 } | |
2724 else if (op_delete(oap) == FAIL) | |
2725 return FALSE; | |
2726 | |
2727 if ((l > curwin->w_cursor.col) && !lineempty(curwin->w_cursor.lnum) | |
2728 && !virtual_op) | |
2729 inc_cursor(); | |
2730 | |
2731 #ifdef FEAT_VISUALEXTRA | |
2732 /* check for still on same line (<CR> in inserted text meaningless) */ | |
2733 /* skip blank lines too */ | |
2734 if (oap->block_mode) | |
2735 { | |
2736 # ifdef FEAT_VIRTUALEDIT | |
2737 /* Add spaces before getting the current line length. */ | |
2738 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
2739 || gchar_cursor() == NUL)) | |
2740 coladvance_force(getviscol()); | |
2741 # endif | |
1392 | 2742 firstline = ml_get(oap->start.lnum); |
2743 pre_textlen = (long)STRLEN(firstline); | |
2744 pre_indent = (long)(skipwhite(firstline) - firstline); | |
7 | 2745 bd.textcol = curwin->w_cursor.col; |
2746 } | |
2747 #endif | |
2748 | |
2749 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
2750 if (oap->motion_type == MLINE) | |
2751 fix_indent(); | |
2752 #endif | |
2753 | |
2754 retval = edit(NUL, FALSE, (linenr_T)1); | |
2755 | |
2756 #ifdef FEAT_VISUALEXTRA | |
2757 /* | |
39 | 2758 * In Visual block mode, handle copying the new text to all lines of the |
7 | 2759 * block. |
1477 | 2760 * Don't repeat the insert when Insert mode ended with CTRL-C. |
7 | 2761 */ |
1477 | 2762 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
7 | 2763 { |
1392 | 2764 /* Auto-indenting may have changed the indent. If the cursor was past |
2765 * the indent, exclude that indent change from the inserted text. */ | |
7 | 2766 firstline = ml_get(oap->start.lnum); |
1403 | 2767 if (bd.textcol > (colnr_T)pre_indent) |
7 | 2768 { |
1392 | 2769 long new_indent = (long)(skipwhite(firstline) - firstline); |
2770 | |
2771 pre_textlen += new_indent - pre_indent; | |
2772 bd.textcol += new_indent - pre_indent; | |
2773 } | |
2774 | |
2775 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
2776 if (ins_len > 0) | |
2777 { | |
2778 /* Subsequent calls to ml_get() flush the firstline data - take a | |
2779 * copy of the inserted text. */ | |
7 | 2780 if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL) |
2781 { | |
419 | 2782 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
7 | 2783 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
2784 linenr++) | |
2785 { | |
2786 block_prep(oap, &bd, linenr, TRUE); | |
2787 if (!bd.is_short || virtual_op) | |
2788 { | |
2789 # ifdef FEAT_VIRTUALEDIT | |
2790 pos_T vpos; | |
2791 | |
2792 /* If the block starts in virtual space, count the | |
2793 * initial coladd offset as part of "startspaces" */ | |
2794 if (bd.is_short) | |
2795 { | |
1982 | 2796 vpos.lnum = linenr; |
7 | 2797 (void)getvpos(&vpos, oap->start_vcol); |
2798 } | |
2799 else | |
2800 vpos.coladd = 0; | |
2801 # endif | |
2802 oldp = ml_get(linenr); | |
2803 newp = alloc_check((unsigned)(STRLEN(oldp) | |
2804 # ifdef FEAT_VIRTUALEDIT | |
2805 + vpos.coladd | |
2806 # endif | |
2807 + ins_len + 1)); | |
2808 if (newp == NULL) | |
2809 continue; | |
2810 /* copy up to block start */ | |
2811 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2812 offset = bd.textcol; | |
2813 # ifdef FEAT_VIRTUALEDIT | |
6929 | 2814 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
7 | 2815 offset += vpos.coladd; |
2816 # endif | |
2817 mch_memmove(newp + offset, ins_text, (size_t)ins_len); | |
2818 offset += ins_len; | |
2819 oldp += bd.textcol; | |
1622 | 2820 STRMOVE(newp + offset, oldp); |
7 | 2821 ml_replace(linenr, newp, FALSE); |
2822 } | |
2823 } | |
2824 check_cursor(); | |
2825 | |
2826 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
2827 } | |
2828 vim_free(ins_text); | |
2829 } | |
2830 } | |
2831 #endif | |
2832 | |
2833 return retval; | |
2834 } | |
2835 | |
2836 /* | |
2837 * set all the yank registers to empty (called from main()) | |
2838 */ | |
2839 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2840 init_yank(void) |
7 | 2841 { |
2842 int i; | |
2843 | |
2844 for (i = 0; i < NUM_REGISTERS; ++i) | |
2845 y_regs[i].y_array = NULL; | |
2846 } | |
2847 | |
356 | 2848 #if defined(EXITFREE) || defined(PROTO) |
2849 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2850 clear_registers(void) |
356 | 2851 { |
2852 int i; | |
2853 | |
2854 for (i = 0; i < NUM_REGISTERS; ++i) | |
2855 { | |
2856 y_current = &y_regs[i]; | |
2857 if (y_current->y_array != NULL) | |
2858 free_yank_all(); | |
2859 } | |
2860 } | |
2861 #endif | |
2862 | |
7 | 2863 /* |
2864 * Free "n" lines from the current yank register. | |
2865 * Called for normal freeing and in case of error. | |
2866 */ | |
2867 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2868 free_yank(long n) |
7 | 2869 { |
2870 if (y_current->y_array != NULL) | |
2871 { | |
2872 long i; | |
2873 | |
2874 for (i = n; --i >= 0; ) | |
2875 { | |
2876 #ifdef AMIGA /* only for very slow machines */ | |
2877 if ((i & 1023) == 1023) /* this may take a while */ | |
2878 { | |
2879 /* | |
2880 * This message should never cause a hit-return message. | |
2881 * Overwrite this message with any next message. | |
2882 */ | |
2883 ++no_wait_return; | |
2884 smsg((char_u *)_("freeing %ld lines"), i + 1); | |
2885 --no_wait_return; | |
2886 msg_didout = FALSE; | |
2887 msg_col = 0; | |
2888 } | |
2889 #endif | |
2890 vim_free(y_current->y_array[i]); | |
2891 } | |
2892 vim_free(y_current->y_array); | |
2893 y_current->y_array = NULL; | |
2894 #ifdef AMIGA | |
2895 if (n >= 1000) | |
2896 MSG(""); | |
2897 #endif | |
2898 } | |
2899 } | |
2900 | |
2901 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2902 free_yank_all(void) |
7 | 2903 { |
2904 free_yank(y_current->y_size); | |
2905 } | |
2906 | |
2907 /* | |
2908 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
2909 * If we are to append (uppercase register), we first yank into a new yank | |
2910 * register and then concatenate the old and the new one (so we keep the old | |
2911 * one in case of out-of-memory). | |
2912 * | |
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
2913 * Return FAIL for failure, OK otherwise. |
7 | 2914 */ |
2915 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2916 op_yank(oparg_T *oap, int deleting, int mess) |
7 | 2917 { |
2918 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
|
2919 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
|
2920 yankreg_T newreg; /* new yank register when appending */ |
7 | 2921 char_u **new_ptr; |
2922 linenr_T lnum; /* current line number */ | |
2923 long j; | |
2924 int yanktype = oap->motion_type; | |
2925 long yanklines = oap->line_count; | |
2926 linenr_T yankendlnum = oap->end.lnum; | |
2927 char_u *p; | |
2928 char_u *pnew; | |
2929 struct block_def bd; | |
2658 | 2930 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
2654 | 2931 int did_star = FALSE; |
2658 | 2932 #endif |
7 | 2933 |
2934 /* check for read-only register */ | |
2935 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
2936 { | |
2937 beep_flush(); | |
2938 return FAIL; | |
2939 } | |
2940 if (oap->regname == '_') /* black hole: nothing to do */ | |
2941 return OK; | |
2942 | |
2943 #ifdef FEAT_CLIPBOARD | |
2944 if (!clip_star.available && oap->regname == '*') | |
2945 oap->regname = 0; | |
2946 else if (!clip_plus.available && oap->regname == '+') | |
2947 oap->regname = 0; | |
2948 #endif | |
2949 | |
2950 if (!deleting) /* op_delete() already set y_current */ | |
2951 get_yank_register(oap->regname, TRUE); | |
2952 | |
2953 curr = y_current; | |
2954 /* append to existing contents */ | |
2955 if (y_append && y_current->y_array != NULL) | |
2956 y_current = &newreg; | |
2957 else | |
2958 free_yank_all(); /* free previously yanked lines */ | |
2959 | |
593 | 2960 /* |
2961 * If the cursor was in column 1 before and after the movement, and the | |
2962 * operator is not inclusive, the yank is always linewise. | |
2963 */ | |
7 | 2964 if ( oap->motion_type == MCHAR |
2965 && oap->start.col == 0 | |
2966 && !oap->inclusive | |
2967 && (!oap->is_VIsual || *p_sel == 'o') | |
50 | 2968 && !oap->block_mode |
7 | 2969 && oap->end.col == 0 |
2970 && yanklines > 1) | |
2971 { | |
2972 yanktype = MLINE; | |
2973 --yankendlnum; | |
2974 --yanklines; | |
2975 } | |
2976 | |
2977 y_current->y_size = yanklines; | |
2978 y_current->y_type = yanktype; /* set the yank register type */ | |
2979 y_current->y_width = 0; | |
2980 y_current->y_array = (char_u **)lalloc_clear((long_u)(sizeof(char_u *) * | |
2981 yanklines), TRUE); | |
2982 if (y_current->y_array == NULL) | |
2983 { | |
2984 y_current = curr; | |
2985 return FAIL; | |
2986 } | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
2987 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
2988 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
|
2989 #endif |
7 | 2990 |
2991 y_idx = 0; | |
2992 lnum = oap->start.lnum; | |
2993 | |
2994 if (oap->block_mode) | |
2995 { | |
2996 /* Visual block mode */ | |
2997 y_current->y_type = MBLOCK; /* set the yank register type */ | |
2998 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
2999 | |
3000 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
3001 y_current->y_width--; | |
3002 } | |
3003 | |
3004 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
3005 { | |
3006 switch (y_current->y_type) | |
3007 { | |
3008 case MBLOCK: | |
3009 block_prep(oap, &bd, lnum, FALSE); | |
3010 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3011 goto fail; | |
3012 break; | |
3013 | |
3014 case MLINE: | |
3015 if ((y_current->y_array[y_idx] = | |
3016 vim_strsave(ml_get(lnum))) == NULL) | |
3017 goto fail; | |
3018 break; | |
3019 | |
3020 case MCHAR: | |
3021 { | |
3022 colnr_T startcol = 0, endcol = MAXCOL; | |
3023 #ifdef FEAT_VIRTUALEDIT | |
3024 int is_oneChar = FALSE; | |
3025 colnr_T cs, ce; | |
3026 #endif | |
3027 p = ml_get(lnum); | |
3028 bd.startspaces = 0; | |
3029 bd.endspaces = 0; | |
3030 | |
3031 if (lnum == oap->start.lnum) | |
3032 { | |
3033 startcol = oap->start.col; | |
3034 #ifdef FEAT_VIRTUALEDIT | |
3035 if (virtual_op) | |
3036 { | |
3037 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
3038 if (ce != cs && oap->start.coladd > 0) | |
3039 { | |
3040 /* Part of a tab selected -- but don't | |
3041 * double-count it. */ | |
3042 bd.startspaces = (ce - cs + 1) | |
3043 - oap->start.coladd; | |
3044 startcol++; | |
3045 } | |
3046 } | |
3047 #endif | |
3048 } | |
3049 | |
3050 if (lnum == oap->end.lnum) | |
3051 { | |
3052 endcol = oap->end.col; | |
3053 #ifdef FEAT_VIRTUALEDIT | |
3054 if (virtual_op) | |
3055 { | |
3056 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
3057 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
3058 # ifdef FEAT_MBYTE | |
3059 /* Don't add space for double-wide | |
3060 * char; endcol will be on last byte | |
3061 * of multi-byte char. */ | |
3062 && (*mb_head_off)(p, p + endcol) == 0 | |
3063 # endif | |
3064 )) | |
3065 { | |
3066 if (oap->start.lnum == oap->end.lnum | |
3067 && oap->start.col == oap->end.col) | |
3068 { | |
3069 /* Special case: inside a single char */ | |
3070 is_oneChar = TRUE; | |
3071 bd.startspaces = oap->end.coladd | |
3072 - oap->start.coladd + oap->inclusive; | |
3073 endcol = startcol; | |
3074 } | |
3075 else | |
3076 { | |
3077 bd.endspaces = oap->end.coladd | |
3078 + oap->inclusive; | |
3079 endcol -= oap->inclusive; | |
3080 } | |
3081 } | |
3082 } | |
3083 #endif | |
3084 } | |
3510 | 3085 if (endcol == MAXCOL) |
3086 endcol = (colnr_T)STRLEN(p); | |
7 | 3087 if (startcol > endcol |
3088 #ifdef FEAT_VIRTUALEDIT | |
3089 || is_oneChar | |
3090 #endif | |
3091 ) | |
3092 bd.textlen = 0; | |
3093 else | |
3094 { | |
3095 bd.textlen = endcol - startcol + oap->inclusive; | |
3096 } | |
3097 bd.textstart = p + startcol; | |
3098 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3099 goto fail; | |
3100 break; | |
3101 } | |
3102 /* NOTREACHED */ | |
3103 } | |
3104 } | |
3105 | |
3106 if (curr != y_current) /* append the new block to the old block */ | |
3107 { | |
3108 new_ptr = (char_u **)lalloc((long_u)(sizeof(char_u *) * | |
3109 (curr->y_size + y_current->y_size)), TRUE); | |
3110 if (new_ptr == NULL) | |
3111 goto fail; | |
3112 for (j = 0; j < curr->y_size; ++j) | |
3113 new_ptr[j] = curr->y_array[j]; | |
3114 vim_free(curr->y_array); | |
3115 curr->y_array = new_ptr; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3116 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3117 curr->y_time_set = vim_time(); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3118 #endif |
7 | 3119 |
3120 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
3121 curr->y_type = MLINE; | |
3122 | |
164 | 3123 /* Concatenate the last line of the old block with the first line of |
3124 * the new block, unless being Vi compatible. */ | |
3125 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
7 | 3126 { |
3127 pnew = lalloc((long_u)(STRLEN(curr->y_array[curr->y_size - 1]) | |
3128 + STRLEN(y_current->y_array[0]) + 1), TRUE); | |
3129 if (pnew == NULL) | |
3130 { | |
3131 y_idx = y_current->y_size - 1; | |
3132 goto fail; | |
3133 } | |
3134 STRCPY(pnew, curr->y_array[--j]); | |
3135 STRCAT(pnew, y_current->y_array[0]); | |
3136 vim_free(curr->y_array[j]); | |
3137 vim_free(y_current->y_array[0]); | |
3138 curr->y_array[j++] = pnew; | |
3139 y_idx = 1; | |
3140 } | |
3141 else | |
3142 y_idx = 0; | |
3143 while (y_idx < y_current->y_size) | |
3144 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
3145 curr->y_size = j; | |
3146 vim_free(y_current->y_array); | |
3147 y_current = curr; | |
3148 } | |
5981 | 3149 if (curwin->w_p_rnu) |
3150 redraw_later(SOME_VALID); /* cursor moved to start */ | |
7 | 3151 if (mess) /* Display message about yank? */ |
3152 { | |
3153 if (yanktype == MCHAR | |
3154 && !oap->block_mode | |
3155 && yanklines == 1) | |
3156 yanklines = 0; | |
3157 /* Some versions of Vi use ">=" here, some don't... */ | |
3158 if (yanklines > p_report) | |
3159 { | |
3160 /* redisplay now, so message is not deleted */ | |
3161 update_topline_redraw(); | |
3162 if (yanklines == 1) | |
205 | 3163 { |
3164 if (oap->block_mode) | |
3165 MSG(_("block of 1 line yanked")); | |
3166 else | |
3167 MSG(_("1 line yanked")); | |
3168 } | |
3169 else if (oap->block_mode) | |
3170 smsg((char_u *)_("block of %ld lines yanked"), yanklines); | |
7 | 3171 else |
3172 smsg((char_u *)_("%ld lines yanked"), yanklines); | |
3173 } | |
3174 } | |
3175 | |
3176 /* | |
3177 * Set "'[" and "']" marks. | |
3178 */ | |
3179 curbuf->b_op_start = oap->start; | |
3180 curbuf->b_op_end = oap->end; | |
5735 | 3181 if (yanktype == MLINE && !oap->block_mode) |
36 | 3182 { |
3183 curbuf->b_op_start.col = 0; | |
3184 curbuf->b_op_end.col = MAXCOL; | |
3185 } | |
7 | 3186 |
3187 #ifdef FEAT_CLIPBOARD | |
3188 /* | |
3189 * If we were yanking to the '*' register, send result to clipboard. | |
3190 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
3191 * to the '*' register. | |
3192 */ | |
3193 if (clip_star.available | |
3194 && (curr == &(y_regs[STAR_REGISTER]) | |
2654 | 3195 || (!deleting && oap->regname == 0 |
6116 | 3196 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
7 | 3197 { |
3198 if (curr != &(y_regs[STAR_REGISTER])) | |
3199 /* Copy the text from register 0 to the clipboard register. */ | |
3200 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3201 | |
3202 clip_own_selection(&clip_star); | |
3203 clip_gen_set_selection(&clip_star); | |
2658 | 3204 # ifdef FEAT_X11 |
2654 | 3205 did_star = TRUE; |
2658 | 3206 # endif |
7 | 3207 } |
3208 | |
3209 # ifdef FEAT_X11 | |
3210 /* | |
3211 * If we were yanking to the '+' register, send result to selection. | |
3212 * Also copy to the '*' register, in case auto-select is off. | |
3213 */ | |
2654 | 3214 if (clip_plus.available |
3215 && (curr == &(y_regs[PLUS_REGISTER]) | |
3216 || (!deleting && oap->regname == 0 | |
6116 | 3217 && ((clip_unnamed | clip_unnamed_saved) & |
3218 CLIP_UNNAMED_PLUS)))) | |
7 | 3219 { |
2654 | 3220 if (curr != &(y_regs[PLUS_REGISTER])) |
3221 /* Copy the text from register 0 to the clipboard register. */ | |
3222 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
3223 | |
7 | 3224 clip_own_selection(&clip_plus); |
3225 clip_gen_set_selection(&clip_plus); | |
3674 | 3226 if (!clip_isautosel_star() && !did_star |
3227 && curr == &(y_regs[PLUS_REGISTER])) | |
7 | 3228 { |
3229 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3230 clip_own_selection(&clip_star); | |
3231 clip_gen_set_selection(&clip_star); | |
3232 } | |
3233 } | |
3234 # endif | |
3235 #endif | |
3236 | |
3237 return OK; | |
3238 | |
3239 fail: /* free the allocated lines */ | |
3240 free_yank(y_idx + 1); | |
3241 y_current = curr; | |
3242 return FAIL; | |
3243 } | |
3244 | |
3245 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3246 yank_copy_line(struct block_def *bd, long y_idx) |
7 | 3247 { |
3248 char_u *pnew; | |
3249 | |
3250 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
3251 == NULL) | |
3252 return FAIL; | |
3253 y_current->y_array[y_idx] = pnew; | |
6929 | 3254 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
7 | 3255 pnew += bd->startspaces; |
3256 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
3257 pnew += bd->textlen; | |
6929 | 3258 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
7 | 3259 pnew += bd->endspaces; |
3260 *pnew = NUL; | |
3261 return OK; | |
3262 } | |
3263 | |
3264 #ifdef FEAT_CLIPBOARD | |
3265 /* | |
3266 * Make a copy of the y_current register to register "reg". | |
3267 */ | |
3268 static void | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3269 copy_yank_reg(yankreg_T *reg) |
7 | 3270 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3271 yankreg_T *curr = y_current; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3272 long j; |
7 | 3273 |
3274 y_current = reg; | |
3275 free_yank_all(); | |
3276 *y_current = *curr; | |
3277 y_current->y_array = (char_u **)lalloc_clear( | |
3278 (long_u)(sizeof(char_u *) * y_current->y_size), TRUE); | |
3279 if (y_current->y_array == NULL) | |
3280 y_current->y_size = 0; | |
3281 else | |
3282 for (j = 0; j < y_current->y_size; ++j) | |
3283 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
3284 { | |
3285 free_yank(j); | |
3286 y_current->y_size = 0; | |
3287 break; | |
3288 } | |
3289 y_current = curr; | |
3290 } | |
3291 #endif | |
3292 | |
3293 /* | |
140 | 3294 * Put contents of register "regname" into the text. |
3295 * Caller must check "regname" to be valid! | |
3296 * "flags": PUT_FIXINDENT make indent look nice | |
3297 * PUT_CURSEND leave cursor after end of new text | |
3298 * PUT_LINE force linewise put (":put") | |
7 | 3299 */ |
3300 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3301 do_put( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3302 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3303 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
|
3304 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3305 int flags) |
7 | 3306 { |
3307 char_u *ptr; | |
3308 char_u *newp, *oldp; | |
3309 int yanklen; | |
3310 int totlen = 0; /* init for gcc */ | |
3311 linenr_T lnum; | |
3312 colnr_T col; | |
3313 long i; /* index in y_array[] */ | |
3314 int y_type; | |
3315 long y_size; | |
3316 int oldlen; | |
3317 long y_width = 0; | |
3318 colnr_T vcol; | |
3319 int delcount; | |
3320 int incr = 0; | |
3321 long j; | |
3322 struct block_def bd; | |
3323 char_u **y_array = NULL; | |
3324 long nr_lines = 0; | |
3325 pos_T new_cursor; | |
3326 int indent; | |
3327 int orig_indent = 0; /* init for gcc */ | |
3328 int indent_diff = 0; /* init for gcc */ | |
3329 int first_indent = TRUE; | |
3330 int lendiff = 0; | |
3331 pos_T old_pos; | |
3332 char_u *insert_string = NULL; | |
3333 int allocated = FALSE; | |
3334 long cnt; | |
3335 | |
3336 #ifdef FEAT_CLIPBOARD | |
3337 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
3338 adjust_clip_reg(®name); | |
3339 (void)may_get_selection(regname); | |
3340 #endif | |
3341 | |
3342 if (flags & PUT_FIXINDENT) | |
3343 orig_indent = get_indent(); | |
3344 | |
3345 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3346 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3347 | |
3348 /* | |
3349 * Using inserted text works differently, because the register includes | |
3350 * special characters (newlines, etc.). | |
3351 */ | |
3352 if (regname == '.') | |
3353 { | |
3354 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : | |
3355 (count == -1 ? 'O' : 'i')), count, FALSE); | |
3356 /* Putting the text is done later, so can't really move the cursor to | |
3357 * the next character. Use "l" to simulate it. */ | |
3358 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
3359 stuffcharReadbuff('l'); | |
3360 return; | |
3361 } | |
3362 | |
3363 /* | |
3364 * For special registers '%' (file name), '#' (alternate file name) and | |
3365 * ':' (last command line), etc. we have to create a fake yank register. | |
3366 */ | |
3367 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
3368 { | |
3369 if (insert_string == NULL) | |
3370 return; | |
3371 } | |
3372 | |
4005 | 3373 #ifdef FEAT_AUTOCMD |
3374 /* Autocommands may be executed when saving lines for undo, which may make | |
3375 * y_array invalid. Start undo now to avoid that. */ | |
3376 u_save(curwin->w_cursor.lnum, curwin->w_cursor.lnum + 1); | |
3377 #endif | |
3378 | |
7 | 3379 if (insert_string != NULL) |
3380 { | |
3381 y_type = MCHAR; | |
3382 #ifdef FEAT_EVAL | |
3383 if (regname == '=') | |
3384 { | |
3385 /* For the = register we need to split the string at NL | |
3093 | 3386 * characters. |
3387 * Loop twice: count the number of lines and save them. */ | |
7 | 3388 for (;;) |
3389 { | |
3390 y_size = 0; | |
3391 ptr = insert_string; | |
3392 while (ptr != NULL) | |
3393 { | |
3394 if (y_array != NULL) | |
3395 y_array[y_size] = ptr; | |
3396 ++y_size; | |
3397 ptr = vim_strchr(ptr, '\n'); | |
3398 if (ptr != NULL) | |
3399 { | |
3400 if (y_array != NULL) | |
3401 *ptr = NUL; | |
3402 ++ptr; | |
3093 | 3403 /* A trailing '\n' makes the register linewise. */ |
7 | 3404 if (*ptr == NUL) |
3405 { | |
3406 y_type = MLINE; | |
3407 break; | |
3408 } | |
3409 } | |
3410 } | |
3411 if (y_array != NULL) | |
3412 break; | |
3413 y_array = (char_u **)alloc((unsigned) | |
3414 (y_size * sizeof(char_u *))); | |
3415 if (y_array == NULL) | |
3416 goto end; | |
3417 } | |
3418 } | |
3419 else | |
3420 #endif | |
3421 { | |
3422 y_size = 1; /* use fake one-line yank register */ | |
3423 y_array = &insert_string; | |
3424 } | |
3425 } | |
3426 else | |
3427 { | |
3428 get_yank_register(regname, FALSE); | |
3429 | |
3430 y_type = y_current->y_type; | |
3431 y_width = y_current->y_width; | |
3432 y_size = y_current->y_size; | |
3433 y_array = y_current->y_array; | |
3434 } | |
3435 | |
3436 if (y_type == MLINE) | |
3437 { | |
3438 if (flags & PUT_LINE_SPLIT) | |
3439 { | |
6845 | 3440 char_u *p; |
3441 | |
7 | 3442 /* "p" or "P" in Visual mode: split the lines to put the text in |
3443 * between. */ | |
3444 if (u_save_cursor() == FAIL) | |
3445 goto end; | |
6845 | 3446 p = ml_get_cursor(); |
3447 if (dir == FORWARD && *p != NUL) | |
3448 mb_ptr_adv(p); | |
3449 ptr = vim_strsave(p); | |
7 | 3450 if (ptr == NULL) |
3451 goto end; | |
3452 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
3453 vim_free(ptr); | |
3454 | |
6845 | 3455 oldp = ml_get_curline(); |
3456 p = oldp + curwin->w_cursor.col; | |
3457 if (dir == FORWARD && *p != NUL) | |
3458 mb_ptr_adv(p); | |
3459 ptr = vim_strnsave(oldp, p - oldp); | |
7 | 3460 if (ptr == NULL) |
3461 goto end; | |
3462 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
3463 ++nr_lines; | |
3464 dir = FORWARD; | |
3465 } | |
3466 if (flags & PUT_LINE_FORWARD) | |
3467 { | |
3468 /* Must be "p" for a Visual block, put lines below the block. */ | |
692 | 3469 curwin->w_cursor = curbuf->b_visual.vi_end; |
7 | 3470 dir = FORWARD; |
3471 } | |
3472 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3473 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3474 } | |
3475 | |
3476 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
3477 y_type = MLINE; | |
3478 | |
3479 if (y_size == 0 || y_array == NULL) | |
3480 { | |
3481 EMSG2(_("E353: Nothing in register %s"), | |
3482 regname == 0 ? (char_u *)"\"" : transchar(regname)); | |
3483 goto end; | |
3484 } | |
3485 | |
3486 if (y_type == MBLOCK) | |
3487 { | |
3488 lnum = curwin->w_cursor.lnum + y_size + 1; | |
3489 if (lnum > curbuf->b_ml.ml_line_count) | |
3490 lnum = curbuf->b_ml.ml_line_count + 1; | |
3491 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
3492 goto end; | |
3493 } | |
5735 | 3494 else if (y_type == MLINE) |
7 | 3495 { |
3496 lnum = curwin->w_cursor.lnum; | |
3497 #ifdef FEAT_FOLDING | |
3498 /* Correct line number for closed fold. Don't move the cursor yet, | |
3499 * u_save() uses it. */ | |
3500 if (dir == BACKWARD) | |
3501 (void)hasFolding(lnum, &lnum, NULL); | |
3502 else | |
3503 (void)hasFolding(lnum, NULL, &lnum); | |
3504 #endif | |
3505 if (dir == FORWARD) | |
3506 ++lnum; | |
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3507 /* 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
|
3508 * it in the saved lines. */ |
5100
18b43970fb7a
updated for version 7.3.1293
Bram Moolenaar <bram@vim.org>
parents:
5053
diff
changeset
|
3509 if ((bufempty() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
7 | 3510 goto end; |
3511 #ifdef FEAT_FOLDING | |
3512 if (dir == FORWARD) | |
3513 curwin->w_cursor.lnum = lnum - 1; | |
3514 else | |
3515 curwin->w_cursor.lnum = lnum; | |
3516 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
3517 #endif | |
3518 } | |
3519 else if (u_save_cursor() == FAIL) | |
3520 goto end; | |
3521 | |
3522 yanklen = (int)STRLEN(y_array[0]); | |
3523 | |
3524 #ifdef FEAT_VIRTUALEDIT | |
3525 if (ve_flags == VE_ALL && y_type == MCHAR) | |
3526 { | |
3527 if (gchar_cursor() == TAB) | |
3528 { | |
3529 /* Don't need to insert spaces when "p" on the last position of a | |
3530 * tab or "P" on the first position. */ | |
3531 if (dir == FORWARD | |
3532 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
3533 : curwin->w_cursor.coladd > 0) | |
3534 coladvance_force(getviscol()); | |
3535 else | |
3536 curwin->w_cursor.coladd = 0; | |
3537 } | |
3538 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
3539 coladvance_force(getviscol() + (dir == FORWARD)); | |
3540 } | |
3541 #endif | |
3542 | |
3543 lnum = curwin->w_cursor.lnum; | |
3544 col = curwin->w_cursor.col; | |
3545 | |
3546 /* | |
3547 * Block mode | |
3548 */ | |
3549 if (y_type == MBLOCK) | |
3550 { | |
3551 char c = gchar_cursor(); | |
3552 colnr_T endcol2 = 0; | |
3553 | |
3554 if (dir == FORWARD && c != NUL) | |
3555 { | |
3556 #ifdef FEAT_VIRTUALEDIT | |
3557 if (ve_flags == VE_ALL) | |
3558 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3559 else | |
3560 #endif | |
3561 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
3562 | |
3563 #ifdef FEAT_MBYTE | |
3564 if (has_mbyte) | |
3565 /* move to start of next multi-byte character */ | |
474 | 3566 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
7 | 3567 else |
3568 #endif | |
3569 #ifdef FEAT_VIRTUALEDIT | |
3570 if (c != TAB || ve_flags != VE_ALL) | |
3571 #endif | |
3572 ++curwin->w_cursor.col; | |
3573 ++col; | |
3574 } | |
3575 else | |
3576 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3577 | |
3578 #ifdef FEAT_VIRTUALEDIT | |
3579 col += curwin->w_cursor.coladd; | |
1304 | 3580 if (ve_flags == VE_ALL |
3581 && (curwin->w_cursor.coladd > 0 | |
3582 || endcol2 == curwin->w_cursor.col)) | |
7 | 3583 { |
3584 if (dir == FORWARD && c == NUL) | |
3585 ++col; | |
3586 if (dir != FORWARD && c != NUL) | |
3587 ++curwin->w_cursor.col; | |
3588 if (c == TAB) | |
3589 { | |
3590 if (dir == BACKWARD && curwin->w_cursor.col) | |
3591 curwin->w_cursor.col--; | |
3592 if (dir == FORWARD && col - 1 == endcol2) | |
3593 curwin->w_cursor.col++; | |
3594 } | |
3595 } | |
3596 curwin->w_cursor.coladd = 0; | |
3597 #endif | |
699 | 3598 bd.textcol = 0; |
7 | 3599 for (i = 0; i < y_size; ++i) |
3600 { | |
3601 int spaces; | |
3602 char shortline; | |
3603 | |
3604 bd.startspaces = 0; | |
3605 bd.endspaces = 0; | |
3606 vcol = 0; | |
3607 delcount = 0; | |
3608 | |
3609 /* add a new line */ | |
3610 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
3611 { | |
3612 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
3613 (colnr_T)1, FALSE) == FAIL) | |
3614 break; | |
3615 ++nr_lines; | |
3616 } | |
3617 /* get the old line and advance to the position to insert at */ | |
3618 oldp = ml_get_curline(); | |
3619 oldlen = (int)STRLEN(oldp); | |
3620 for (ptr = oldp; vcol < col && *ptr; ) | |
3621 { | |
3622 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 3623 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
7 | 3624 vcol += incr; |
3625 } | |
3626 bd.textcol = (colnr_T)(ptr - oldp); | |
3627 | |
3628 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
3629 | |
3630 if (vcol < col) /* line too short, padd with spaces */ | |
3631 bd.startspaces = col - vcol; | |
3632 else if (vcol > col) | |
3633 { | |
3634 bd.endspaces = vcol - col; | |
3635 bd.startspaces = incr - bd.endspaces; | |
3636 --bd.textcol; | |
3637 delcount = 1; | |
3638 #ifdef FEAT_MBYTE | |
3639 if (has_mbyte) | |
3640 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
3641 #endif | |
3642 if (oldp[bd.textcol] != TAB) | |
3643 { | |
3644 /* Only a Tab can be split into spaces. Other | |
3645 * characters will have to be moved to after the | |
3646 * block, causing misalignment. */ | |
3647 delcount = 0; | |
3648 bd.endspaces = 0; | |
3649 } | |
3650 } | |
3651 | |
3652 yanklen = (int)STRLEN(y_array[i]); | |
3653 | |
3654 /* calculate number of spaces required to fill right side of block*/ | |
3655 spaces = y_width + 1; | |
3656 for (j = 0; j < yanklen; j++) | |
5995 | 3657 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
7 | 3658 if (spaces < 0) |
3659 spaces = 0; | |
3660 | |
3661 /* insert the new text */ | |
3662 totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces; | |
3663 newp = alloc_check((unsigned)totlen + oldlen + 1); | |
3664 if (newp == NULL) | |
3665 break; | |
3666 /* copy part up to cursor to new line */ | |
3667 ptr = newp; | |
3668 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
3669 ptr += bd.textcol; | |
3670 /* may insert some spaces before the new text */ | |
6929 | 3671 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
7 | 3672 ptr += bd.startspaces; |
3673 /* insert the new text */ | |
3674 for (j = 0; j < count; ++j) | |
3675 { | |
3676 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
3677 ptr += yanklen; | |
3678 | |
3679 /* insert block's trailing spaces only if there's text behind */ | |
3680 if ((j < count - 1 || !shortline) && spaces) | |
3681 { | |
6929 | 3682 vim_memset(ptr, ' ', (size_t)spaces); |
7 | 3683 ptr += spaces; |
3684 } | |
3685 } | |
3686 /* may insert some spaces after the new text */ | |
6929 | 3687 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
7 | 3688 ptr += bd.endspaces; |
3689 /* move the text after the cursor to the end of the line. */ | |
3690 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
3691 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
3692 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
3693 | |
3694 ++curwin->w_cursor.lnum; | |
3695 if (i == 0) | |
3696 curwin->w_cursor.col += bd.startspaces; | |
3697 } | |
3698 | |
3699 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
3700 | |
3701 /* Set '[ mark. */ | |
3702 curbuf->b_op_start = curwin->w_cursor; | |
3703 curbuf->b_op_start.lnum = lnum; | |
3704 | |
3705 /* adjust '] mark */ | |
3706 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
3707 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
237 | 3708 # ifdef FEAT_VIRTUALEDIT |
7 | 3709 curbuf->b_op_end.coladd = 0; |
237 | 3710 # endif |
7 | 3711 if (flags & PUT_CURSEND) |
3712 { | |
916 | 3713 colnr_T len; |
3714 | |
7 | 3715 curwin->w_cursor = curbuf->b_op_end; |
3716 curwin->w_cursor.col++; | |
916 | 3717 |
3718 /* in Insert mode we might be after the NUL, correct for that */ | |
3719 len = (colnr_T)STRLEN(ml_get_curline()); | |
3720 if (curwin->w_cursor.col > len) | |
3721 curwin->w_cursor.col = len; | |
7 | 3722 } |
3723 else | |
3724 curwin->w_cursor.lnum = lnum; | |
3725 } | |
3726 else | |
3727 { | |
3728 /* | |
3729 * Character or Line mode | |
3730 */ | |
3731 if (y_type == MCHAR) | |
3732 { | |
3733 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
3734 * char */ | |
3735 if (dir == FORWARD && gchar_cursor() != NUL) | |
3736 { | |
3737 #ifdef FEAT_MBYTE | |
3738 if (has_mbyte) | |
3739 { | |
474 | 3740 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
7 | 3741 |
3742 /* put it on the next of the multi-byte character. */ | |
3743 col += bytelen; | |
3744 if (yanklen) | |
3745 { | |
3746 curwin->w_cursor.col += bytelen; | |
3747 curbuf->b_op_end.col += bytelen; | |
3748 } | |
3749 } | |
3750 else | |
3751 #endif | |
3752 { | |
3753 ++col; | |
3754 if (yanklen) | |
3755 { | |
3756 ++curwin->w_cursor.col; | |
3757 ++curbuf->b_op_end.col; | |
3758 } | |
3759 } | |
3760 } | |
3761 curbuf->b_op_start = curwin->w_cursor; | |
3762 } | |
3763 /* | |
3764 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
3765 */ | |
3766 else if (dir == BACKWARD) | |
3767 --lnum; | |
699 | 3768 new_cursor = curwin->w_cursor; |
7 | 3769 |
3770 /* | |
3771 * simple case: insert into current line | |
3772 */ | |
3773 if (y_type == MCHAR && y_size == 1) | |
3774 { | |
5365 | 3775 do { |
3776 totlen = count * yanklen; | |
3777 if (totlen > 0) | |
7 | 3778 { |
5365 | 3779 oldp = ml_get(lnum); |
3780 newp = alloc_check((unsigned)(STRLEN(oldp) + totlen + 1)); | |
3781 if (newp == NULL) | |
3782 goto end; /* alloc() gave an error message */ | |
3783 mch_memmove(newp, oldp, (size_t)col); | |
3784 ptr = newp + col; | |
3785 for (i = 0; i < count; ++i) | |
3786 { | |
3787 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
3788 ptr += yanklen; | |
3789 } | |
3790 STRMOVE(ptr, oldp + col); | |
3791 ml_replace(lnum, newp, FALSE); | |
3792 /* Place cursor on last putted char. */ | |
3793 if (lnum == curwin->w_cursor.lnum) | |
5496 | 3794 { |
3795 /* make sure curwin->w_virtcol is updated */ | |
3796 changed_cline_bef_curs(); | |
5365 | 3797 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
5496 | 3798 } |
7 | 3799 } |
5365 | 3800 if (VIsual_active) |
3801 lnum++; | |
5735 | 3802 } while (VIsual_active && lnum <= curbuf->b_visual.vi_end.lnum); |
5365 | 3803 |
6379 | 3804 if (VIsual_active) /* reset lnum to the last visual line */ |
3805 lnum--; | |
3806 | |
7 | 3807 curbuf->b_op_end = curwin->w_cursor; |
3808 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
3809 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
3810 ++curwin->w_cursor.col; | |
3811 changed_bytes(lnum, col); | |
3812 } | |
3813 else | |
3814 { | |
3815 /* | |
3816 * Insert at least one line. When y_type is MCHAR, break the first | |
3817 * line in two. | |
3818 */ | |
3819 for (cnt = 1; cnt <= count; ++cnt) | |
3820 { | |
3821 i = 0; | |
3822 if (y_type == MCHAR) | |
3823 { | |
3824 /* | |
3825 * Split the current line in two at the insert position. | |
3826 * First insert y_array[size - 1] in front of second line. | |
3827 * Then append y_array[0] to first line. | |
3828 */ | |
3829 lnum = new_cursor.lnum; | |
3830 ptr = ml_get(lnum) + col; | |
3831 totlen = (int)STRLEN(y_array[y_size - 1]); | |
3832 newp = alloc_check((unsigned)(STRLEN(ptr) + totlen + 1)); | |
3833 if (newp == NULL) | |
3834 goto error; | |
3835 STRCPY(newp, y_array[y_size - 1]); | |
3836 STRCAT(newp, ptr); | |
3837 /* insert second line */ | |
3838 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
3839 vim_free(newp); | |
3840 | |
3841 oldp = ml_get(lnum); | |
3842 newp = alloc_check((unsigned)(col + yanklen + 1)); | |
3843 if (newp == NULL) | |
3844 goto error; | |
3845 /* copy first part of line */ | |
3846 mch_memmove(newp, oldp, (size_t)col); | |
3847 /* append to first line */ | |
3848 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
3849 ml_replace(lnum, newp, FALSE); | |
3850 | |
3851 curwin->w_cursor.lnum = lnum; | |
3852 i = 1; | |
3853 } | |
3854 | |
3855 for (; i < y_size; ++i) | |
3856 { | |
3857 if ((y_type != MCHAR || i < y_size - 1) | |
3858 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
3859 == FAIL) | |
3860 goto error; | |
3861 lnum++; | |
3862 ++nr_lines; | |
3863 if (flags & PUT_FIXINDENT) | |
3864 { | |
3865 old_pos = curwin->w_cursor; | |
3866 curwin->w_cursor.lnum = lnum; | |
3867 ptr = ml_get(lnum); | |
3868 if (cnt == count && i == y_size - 1) | |
3869 lendiff = (int)STRLEN(ptr); | |
3870 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
3871 if (*ptr == '#' && preprocs_left()) | |
3872 indent = 0; /* Leave # lines at start */ | |
3873 else | |
3874 #endif | |
3875 if (*ptr == NUL) | |
3876 indent = 0; /* Ignore empty lines */ | |
3877 else if (first_indent) | |
3878 { | |
3879 indent_diff = orig_indent - get_indent(); | |
3880 indent = orig_indent; | |
3881 first_indent = FALSE; | |
3882 } | |
3883 else if ((indent = get_indent() + indent_diff) < 0) | |
3884 indent = 0; | |
3885 (void)set_indent(indent, 0); | |
3886 curwin->w_cursor = old_pos; | |
3887 /* remember how many chars were removed */ | |
3888 if (cnt == count && i == y_size - 1) | |
3889 lendiff -= (int)STRLEN(ml_get(lnum)); | |
3890 } | |
3891 } | |
3892 } | |
3893 | |
3894 error: | |
3895 /* Adjust marks. */ | |
3896 if (y_type == MLINE) | |
3897 { | |
3898 curbuf->b_op_start.col = 0; | |
3899 if (dir == FORWARD) | |
3900 curbuf->b_op_start.lnum++; | |
3901 } | |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3902 /* Skip mark_adjust when adding lines after the last one, there |
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3903 * can't be marks there. */ |
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3904 if (curbuf->b_op_start.lnum + (y_type == MCHAR) - 1 + nr_lines |
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3905 < curbuf->b_ml.ml_line_count) |
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3906 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
7 | 3907 (linenr_T)MAXLNUM, nr_lines, 0L); |
3908 | |
3909 /* note changed text for displaying and folding */ | |
3910 if (y_type == MCHAR) | |
3911 changed_lines(curwin->w_cursor.lnum, col, | |
3912 curwin->w_cursor.lnum + 1, nr_lines); | |
3913 else | |
3914 changed_lines(curbuf->b_op_start.lnum, 0, | |
3915 curbuf->b_op_start.lnum, nr_lines); | |
3916 | |
3917 /* put '] mark at last inserted character */ | |
3918 curbuf->b_op_end.lnum = lnum; | |
3919 /* correct length for change in indent */ | |
3920 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
3921 if (col > 1) | |
3922 curbuf->b_op_end.col = col - 1; | |
3923 else | |
3924 curbuf->b_op_end.col = 0; | |
3925 | |
168 | 3926 if (flags & PUT_CURSLINE) |
3927 { | |
237 | 3928 /* ":put": put cursor on last inserted line */ |
168 | 3929 curwin->w_cursor.lnum = lnum; |
3930 beginline(BL_WHITE | BL_FIX); | |
3931 } | |
3932 else if (flags & PUT_CURSEND) | |
7 | 3933 { |
3934 /* put cursor after inserted text */ | |
3935 if (y_type == MLINE) | |
3936 { | |
3937 if (lnum >= curbuf->b_ml.ml_line_count) | |
3938 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
3939 else | |
3940 curwin->w_cursor.lnum = lnum + 1; | |
3941 curwin->w_cursor.col = 0; | |
3942 } | |
3943 else | |
3944 { | |
3945 curwin->w_cursor.lnum = lnum; | |
3946 curwin->w_cursor.col = col; | |
3947 } | |
3948 } | |
3949 else if (y_type == MLINE) | |
3950 { | |
168 | 3951 /* put cursor on first non-blank in first inserted line */ |
7 | 3952 curwin->w_cursor.col = 0; |
3953 if (dir == FORWARD) | |
3954 ++curwin->w_cursor.lnum; | |
3955 beginline(BL_WHITE | BL_FIX); | |
3956 } | |
3957 else /* put cursor on first inserted character */ | |
3958 curwin->w_cursor = new_cursor; | |
3959 } | |
3960 } | |
3961 | |
3962 msgmore(nr_lines); | |
3963 curwin->w_set_curswant = TRUE; | |
3964 | |
3965 end: | |
3966 if (allocated) | |
3967 vim_free(insert_string); | |
840 | 3968 if (regname == '=') |
3969 vim_free(y_array); | |
3970 | |
5380 | 3971 VIsual_active = FALSE; |
3972 | |
140 | 3973 /* If the cursor is past the end of the line put it at the end. */ |
844 | 3974 adjust_cursor_eol(); |
3975 } | |
3976 | |
3977 /* | |
3978 * When the cursor is on the NUL past the end of the line and it should not be | |
3979 * there move it left. | |
3980 */ | |
3981 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3982 adjust_cursor_eol(void) |
844 | 3983 { |
3984 if (curwin->w_cursor.col > 0 | |
3985 && gchar_cursor() == NUL | |
773 | 3986 #ifdef FEAT_VIRTUALEDIT |
3987 && (ve_flags & VE_ONEMORE) == 0 | |
3988 #endif | |
7 | 3989 && !(restart_edit || (State & INSERT))) |
3990 { | |
557 | 3991 /* Put the cursor on the last character in the line. */ |
555 | 3992 dec_cursor(); |
844 | 3993 |
7 | 3994 #ifdef FEAT_VIRTUALEDIT |
3995 if (ve_flags == VE_ALL) | |
557 | 3996 { |
3997 colnr_T scol, ecol; | |
3998 | |
3999 /* Coladd is set to the width of the last character. */ | |
4000 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
4001 curwin->w_cursor.coladd = ecol - scol + 1; | |
4002 } | |
7 | 4003 #endif |
4004 } | |
4005 } | |
4006 | |
4007 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
4008 /* | |
4009 * Return TRUE if lines starting with '#' should be left aligned. | |
4010 */ | |
4011 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4012 preprocs_left(void) |
7 | 4013 { |
4014 return | |
4015 # ifdef FEAT_SMARTINDENT | |
4016 # ifdef FEAT_CINDENT | |
4017 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
4018 # else | |
4019 curbuf->b_p_si | |
4020 # endif | |
4021 # endif | |
4022 # ifdef FEAT_CINDENT | |
5438 | 4023 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
4024 && curbuf->b_ind_hash_comment == 0) | |
7 | 4025 # endif |
4026 ; | |
4027 } | |
4028 #endif | |
4029 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4030 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4031 * 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
|
4032 */ |
7 | 4033 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4034 get_register_name(int num) |
7 | 4035 { |
4036 if (num == -1) | |
4037 return '"'; | |
4038 else if (num < 10) | |
4039 return num + '0'; | |
4040 else if (num == DELETION_REGISTER) | |
4041 return '-'; | |
4042 #ifdef FEAT_CLIPBOARD | |
4043 else if (num == STAR_REGISTER) | |
4044 return '*'; | |
4045 else if (num == PLUS_REGISTER) | |
4046 return '+'; | |
4047 #endif | |
4048 else | |
4049 { | |
4050 #ifdef EBCDIC | |
4051 int i; | |
4052 | |
4053 /* EBCDIC is really braindead ... */ | |
4054 i = 'a' + (num - 10); | |
4055 if (i > 'i') | |
4056 i += 7; | |
4057 if (i > 'r') | |
4058 i += 8; | |
4059 return i; | |
4060 #else | |
4061 return num + 'a' - 10; | |
4062 #endif | |
4063 } | |
4064 } | |
4065 | |
4066 /* | |
4067 * ":dis" and ":registers": Display the contents of the yank registers. | |
4068 */ | |
4069 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4070 ex_display(exarg_T *eap) |
7 | 4071 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4072 int i, n; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4073 long j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4074 char_u *p; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4075 yankreg_T *yb; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4076 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4077 int attr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4078 char_u *arg = eap->arg; |
22 | 4079 #ifdef FEAT_MBYTE |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4080 int clen; |
22 | 4081 #else |
4082 # define clen 1 | |
4083 #endif | |
7 | 4084 |
4085 if (arg != NULL && *arg == NUL) | |
4086 arg = NULL; | |
4087 attr = hl_attr(HLF_8); | |
4088 | |
4089 /* Highlight title */ | |
4090 MSG_PUTS_TITLE(_("\n--- Registers ---")); | |
4091 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) | |
4092 { | |
4093 name = get_register_name(i); | |
2644 | 4094 if (arg != NULL && vim_strchr(arg, name) == NULL |
4095 #ifdef ONE_CLIPBOARD | |
4096 /* Star register and plus register contain the same thing. */ | |
4097 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
4098 #endif | |
4099 ) | |
7 | 4100 continue; /* did not ask for this register */ |
4101 | |
4102 #ifdef FEAT_CLIPBOARD | |
4103 /* Adjust register name for "unnamed" in 'clipboard'. | |
4104 * When it's a clipboard register, fill it with the current contents | |
4105 * of the clipboard. */ | |
4106 adjust_clip_reg(&name); | |
4107 (void)may_get_selection(name); | |
4108 #endif | |
4109 | |
4110 if (i == -1) | |
4111 { | |
4112 if (y_previous != NULL) | |
4113 yb = y_previous; | |
4114 else | |
4115 yb = &(y_regs[0]); | |
4116 } | |
4117 else | |
4118 yb = &(y_regs[i]); | |
2000 | 4119 |
4120 #ifdef FEAT_EVAL | |
4121 if (name == MB_TOLOWER(redir_reg) | |
4122 || (redir_reg == '"' && yb == y_previous)) | |
4123 continue; /* do not list register being written to, the | |
4124 * pointer can be freed */ | |
4125 #endif | |
4126 | |
7 | 4127 if (yb->y_array != NULL) |
4128 { | |
4129 msg_putchar('\n'); | |
4130 msg_putchar('"'); | |
4131 msg_putchar(name); | |
4132 MSG_PUTS(" "); | |
4133 | |
4134 n = (int)Columns - 6; | |
4135 for (j = 0; j < yb->y_size && n > 1; ++j) | |
4136 { | |
4137 if (j) | |
4138 { | |
4139 MSG_PUTS_ATTR("^J", attr); | |
4140 n -= 2; | |
4141 } | |
4142 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
4143 { | |
4144 #ifdef FEAT_MBYTE | |
474 | 4145 clen = (*mb_ptr2len)(p); |
22 | 4146 #endif |
4147 msg_outtrans_len(p, clen); | |
4148 #ifdef FEAT_MBYTE | |
4149 p += clen - 1; | |
7 | 4150 #endif |
4151 } | |
4152 } | |
4153 if (n > 1 && yb->y_type == MLINE) | |
4154 MSG_PUTS_ATTR("^J", attr); | |
4155 out_flush(); /* show one line at a time */ | |
4156 } | |
4157 ui_breakcheck(); | |
4158 } | |
4159 | |
4160 /* | |
4161 * display last inserted text | |
4162 */ | |
4163 if ((p = get_last_insert()) != NULL | |
4164 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
4165 { | |
4166 MSG_PUTS("\n\". "); | |
4167 dis_msg(p, TRUE); | |
4168 } | |
4169 | |
4170 /* | |
4171 * display last command line | |
4172 */ | |
4173 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
4174 && !got_int) | |
4175 { | |
4176 MSG_PUTS("\n\": "); | |
4177 dis_msg(last_cmdline, FALSE); | |
4178 } | |
4179 | |
4180 /* | |
4181 * display current file name | |
4182 */ | |
4183 if (curbuf->b_fname != NULL | |
4184 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4185 { | |
4186 MSG_PUTS("\n\"% "); | |
4187 dis_msg(curbuf->b_fname, FALSE); | |
4188 } | |
4189 | |
4190 /* | |
4191 * display alternate file name | |
4192 */ | |
4193 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4194 { | |
4195 char_u *fname; | |
4196 linenr_T dummy; | |
4197 | |
4198 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
4199 { | |
4200 MSG_PUTS("\n\"# "); | |
4201 dis_msg(fname, FALSE); | |
4202 } | |
4203 } | |
4204 | |
4205 /* | |
4206 * display last search pattern | |
4207 */ | |
4208 if (last_search_pat() != NULL | |
4209 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
4210 { | |
4211 MSG_PUTS("\n\"/ "); | |
4212 dis_msg(last_search_pat(), FALSE); | |
4213 } | |
4214 | |
4215 #ifdef FEAT_EVAL | |
4216 /* | |
4217 * display last used expression | |
4218 */ | |
4219 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
4220 && !got_int) | |
4221 { | |
4222 MSG_PUTS("\n\"= "); | |
4223 dis_msg(expr_line, FALSE); | |
4224 } | |
4225 #endif | |
4226 } | |
4227 | |
4228 /* | |
4229 * display a string for do_dis() | |
4230 * truncate at end of screen line | |
4231 */ | |
4232 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4233 dis_msg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4234 char_u *p, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4235 int skip_esc) /* if TRUE, ignore trailing ESC */ |
7 | 4236 { |
4237 int n; | |
4238 #ifdef FEAT_MBYTE | |
4239 int l; | |
4240 #endif | |
4241 | |
4242 n = (int)Columns - 6; | |
4243 while (*p != NUL | |
4244 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
4245 && (n -= ptr2cells(p)) >= 0) | |
4246 { | |
4247 #ifdef FEAT_MBYTE | |
474 | 4248 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
7 | 4249 { |
4250 msg_outtrans_len(p, l); | |
4251 p += l; | |
4252 } | |
4253 else | |
4254 #endif | |
4255 msg_outtrans_len(p++, 1); | |
4256 } | |
4257 ui_breakcheck(); | |
4258 } | |
4259 | |
3562 | 4260 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4261 /* | |
4262 * If "process" is TRUE and the line begins with a comment leader (possibly | |
4263 * after some white space), return a pointer to the text after it. Put a boolean | |
4264 * value indicating whether the line ends with an unclosed comment in | |
4265 * "is_comment". | |
4266 * line - line to be processed, | |
4267 * process - if FALSE, will only check whether the line ends with an unclosed | |
3584 | 4268 * comment, |
3562 | 4269 * include_space - whether to also skip space following the comment leader, |
4270 * is_comment - will indicate whether the current line ends with an unclosed | |
3584 | 4271 * comment. |
3562 | 4272 */ |
4273 static char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4274 skip_comment( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4275 char_u *line, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4276 int process, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4277 int include_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4278 int *is_comment) |
3562 | 4279 { |
4280 char_u *comment_flags = NULL; | |
4281 int lead_len; | |
4282 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
4283 | |
4284 *is_comment = FALSE; | |
4285 if (leader_offset != -1) | |
4286 { | |
4287 /* Let's check whether the line ends with an unclosed comment. | |
4288 * If the last comment leader has COM_END in flags, there's no comment. | |
4289 */ | |
4290 while (*comment_flags) | |
4291 { | |
4292 if (*comment_flags == COM_END | |
4293 || *comment_flags == ':') | |
4294 break; | |
4295 ++comment_flags; | |
4296 } | |
4297 if (*comment_flags != COM_END) | |
4298 *is_comment = TRUE; | |
4299 } | |
4300 | |
4301 if (process == FALSE) | |
4302 return line; | |
4303 | |
4304 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
4305 | |
4306 if (lead_len == 0) | |
4307 return line; | |
4308 | |
4309 /* Find: | |
4310 * - COM_END, | |
4311 * - colon, | |
4312 * whichever comes first. | |
4313 */ | |
4314 while (*comment_flags) | |
4315 { | |
3580 | 4316 if (*comment_flags == COM_END |
3562 | 4317 || *comment_flags == ':') |
4318 { | |
4319 break; | |
4320 } | |
4321 ++comment_flags; | |
4322 } | |
4323 | |
4324 /* If we found a colon, it means that we are not processing a line | |
3580 | 4325 * starting with a closing part of a three-part comment. That's good, |
4326 * because we don't want to remove those as this would be annoying. | |
3562 | 4327 */ |
4328 if (*comment_flags == ':' || *comment_flags == NUL) | |
4329 line += lead_len; | |
4330 | |
4331 return line; | |
4332 } | |
4333 #endif | |
4334 | |
7 | 4335 /* |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4336 * 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
|
4337 * When "save_undo" is TRUE save lines for undo first. |
5848 | 4338 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
4339 * leaders should not be removed. | |
4340 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
4341 * to set those marks. | |
7 | 4342 * |
1217 | 4343 * return FAIL for failure, OK otherwise |
7 | 4344 */ |
4345 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4346 do_join( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4347 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4348 int insert_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4349 int save_undo, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4350 int use_formatoptions UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4351 int setmark) |
7 | 4352 { |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4353 char_u *curr = NULL; |
2597 | 4354 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
|
4355 char_u *cend; |
7 | 4356 char_u *newp; |
2597 | 4357 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
|
4358 int endcurr1 = NUL; |
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4359 int endcurr2 = NUL; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4360 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
|
4361 int sumsize = 0; /* size of the long new line */ |
7 | 4362 linenr_T t; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4363 colnr_T col = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4364 int ret = OK; |
3562 | 4365 #if defined(FEAT_COMMENTS) || defined(PROTO) |
3574 | 4366 int *comments = NULL; |
3562 | 4367 int remove_comments = (use_formatoptions == TRUE) |
4368 && has_format_option(FO_REMOVE_COMS); | |
4369 int prev_was_comment; | |
4370 #endif | |
4371 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4372 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4373 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
|
4374 (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
|
4375 return FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4376 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4377 /* 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
|
4378 * 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
|
4379 * 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
|
4380 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
|
4381 if (spaces == NULL) |
7 | 4382 return FAIL; |
3562 | 4383 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4384 if (remove_comments) | |
4385 { | |
4386 comments = (int *)lalloc_clear((long_u)count * sizeof(int), TRUE); | |
4387 if (comments == NULL) | |
4388 { | |
4389 vim_free(spaces); | |
4390 return FAIL; | |
4391 } | |
4392 } | |
4393 #endif | |
7 | 4394 |
4395 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4396 * 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
|
4397 * and setup the array of space strings lengths |
7 | 4398 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4399 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
|
4400 { |
2597 | 4401 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
5848 | 4402 if (t == 0 && setmark) |
5664 | 4403 { |
4404 /* Set the '[ mark. */ | |
4405 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
4406 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
4407 } | |
3562 | 4408 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4409 if (remove_comments) | |
4410 { | |
4411 /* We don't want to remove the comment leader if the | |
4412 * previous line is not a comment. */ | |
4413 if (t > 0 && prev_was_comment) | |
4414 { | |
4415 | |
4416 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
4417 &prev_was_comment); | |
3576 | 4418 comments[t] = (int)(new_curr - curr); |
3562 | 4419 curr = new_curr; |
4420 } | |
4421 else | |
4422 curr = skip_comment(curr, FALSE, insert_space, | |
4423 &prev_was_comment); | |
4424 } | |
4425 #endif | |
4426 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4427 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
|
4428 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4429 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4430 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
|
4431 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4432 && (!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
|
4433 || (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
|
4434 && (!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
|
4435 || 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
|
4436 #endif |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4437 ) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4438 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4439 /* 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
|
4440 if (endcurr1 == ' ') |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4441 endcurr1 = endcurr2; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4442 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4443 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4444 /* 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
|
4445 if ( p_js |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4446 && (endcurr1 == '.' |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4447 || (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
|
4448 && (endcurr1 == '?' || endcurr1 == '!')))) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4449 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4450 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4451 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4452 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4453 sumsize += currsize + spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4454 endcurr1 = endcurr2 = NUL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4455 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
|
4456 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4457 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4458 if (has_mbyte) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4459 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4460 cend = curr + currsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4461 mb_ptr_back(curr, cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4462 endcurr1 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4463 if (cend > curr) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4464 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4465 mb_ptr_back(curr, cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4466 endcurr2 = (*mb_ptr2char)(cend); |
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 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4470 #endif |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4471 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4472 endcurr1 = *(curr + currsize - 1); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4473 if (currsize > 1) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4474 endcurr2 = *(curr + currsize - 2); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4475 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4476 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4477 line_breakcheck(); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4478 if (got_int) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4479 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4480 ret = FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4481 goto theend; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4482 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4483 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4484 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4485 /* 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
|
4486 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
|
4487 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4488 /* 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
|
4489 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
|
4490 cend = newp + sumsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4491 *cend = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4492 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4493 /* |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4494 * 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
|
4495 * |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4496 * 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
|
4497 * 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
|
4498 * 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
|
4499 */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4500 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
|
4501 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4502 cend -= currsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4503 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
|
4504 if (spaces[t] > 0) |
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 cend -= spaces[t]; |
6929 | 4507 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
|
4508 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4509 mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t, |
2597 | 4510 (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
|
4511 if (t == 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4512 break; |
2597 | 4513 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1)); |
3562 | 4514 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4515 if (remove_comments) | |
4516 curr += comments[t - 1]; | |
4517 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4518 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
|
4519 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4520 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4521 } |
7 | 4522 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
4523 | |
5848 | 4524 if (setmark) |
4525 { | |
4526 /* Set the '] mark. */ | |
4527 curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; | |
4528 curwin->w_buffer->b_op_end.col = (colnr_T)STRLEN(newp); | |
4529 } | |
5664 | 4530 |
7 | 4531 /* Only report the change in the first line here, del_lines() will report |
4532 * the deleted line. */ | |
4533 changed_lines(curwin->w_cursor.lnum, currsize, | |
4534 curwin->w_cursor.lnum + 1, 0L); | |
4535 | |
4536 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4537 * Delete following lines. To do this we move the cursor there |
7 | 4538 * briefly, and then move it back. After del_lines() the cursor may |
4539 * have moved up (last line deleted), so the current lnum is kept in t. | |
4540 */ | |
4541 t = curwin->w_cursor.lnum; | |
4542 ++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
|
4543 del_lines(count - 1, FALSE); |
7 | 4544 curwin->w_cursor.lnum = t; |
4545 | |
4546 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4547 * Set the cursor column: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4548 * 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
|
4549 * vim: use the column of the last join |
7 | 4550 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4551 curwin->w_cursor.col = |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4552 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
7 | 4553 check_cursor_col(); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4554 |
7 | 4555 #ifdef FEAT_VIRTUALEDIT |
4556 curwin->w_cursor.coladd = 0; | |
4557 #endif | |
4558 curwin->w_set_curswant = TRUE; | |
4559 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4560 theend: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4561 vim_free(spaces); |
3562 | 4562 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4563 if (remove_comments) | |
4564 vim_free(comments); | |
4565 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4566 return ret; |
7 | 4567 } |
4568 | |
4569 #ifdef FEAT_COMMENTS | |
4570 /* | |
4571 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
4572 * the first line. White-space is ignored. Note that the whole of | |
4573 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
4574 */ | |
4575 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4576 same_leader( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4577 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4578 int leader1_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4579 char_u *leader1_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4580 int leader2_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4581 char_u *leader2_flags) |
7 | 4582 { |
4583 int idx1 = 0, idx2 = 0; | |
4584 char_u *p; | |
4585 char_u *line1; | |
4586 char_u *line2; | |
4587 | |
4588 if (leader1_len == 0) | |
4589 return (leader2_len == 0); | |
4590 | |
4591 /* | |
4592 * If first leader has 'f' flag, the lines can be joined only if the | |
4593 * second line does not have a leader. | |
4594 * If first leader has 'e' flag, the lines can never be joined. | |
4595 * If fist leader has 's' flag, the lines can only be joined if there is | |
4596 * some text after it and the second line has the 'm' flag. | |
4597 */ | |
4598 if (leader1_flags != NULL) | |
4599 { | |
4600 for (p = leader1_flags; *p && *p != ':'; ++p) | |
4601 { | |
4602 if (*p == COM_FIRST) | |
4603 return (leader2_len == 0); | |
4604 if (*p == COM_END) | |
4605 return FALSE; | |
4606 if (*p == COM_START) | |
4607 { | |
4608 if (*(ml_get(lnum) + leader1_len) == NUL) | |
4609 return FALSE; | |
4610 if (leader2_flags == NULL || leader2_len == 0) | |
4611 return FALSE; | |
4612 for (p = leader2_flags; *p && *p != ':'; ++p) | |
4613 if (*p == COM_MIDDLE) | |
4614 return TRUE; | |
4615 return FALSE; | |
4616 } | |
4617 } | |
4618 } | |
4619 | |
4620 /* | |
4621 * Get current line and next line, compare the leaders. | |
4622 * The first line has to be saved, only one line can be locked at a time. | |
4623 */ | |
4624 line1 = vim_strsave(ml_get(lnum)); | |
4625 if (line1 != NULL) | |
4626 { | |
4627 for (idx1 = 0; vim_iswhite(line1[idx1]); ++idx1) | |
4628 ; | |
4629 line2 = ml_get(lnum + 1); | |
4630 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
4631 { | |
4632 if (!vim_iswhite(line2[idx2])) | |
4633 { | |
4634 if (line1[idx1++] != line2[idx2]) | |
4635 break; | |
4636 } | |
4637 else | |
4638 while (vim_iswhite(line1[idx1])) | |
4639 ++idx1; | |
4640 } | |
4641 vim_free(line1); | |
4642 } | |
4643 return (idx2 == leader2_len && idx1 == leader1_len); | |
4644 } | |
4645 #endif | |
4646 | |
4647 /* | |
3252 | 4648 * Implementation of the format operator 'gq'. |
7 | 4649 */ |
4650 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4651 op_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4652 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4653 int keep_cursor) /* keep cursor on same text char */ |
7 | 4654 { |
4655 long old_line_count = curbuf->b_ml.ml_line_count; | |
4656 | |
4657 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
4658 * can put it back there. */ | |
4659 curwin->w_cursor = oap->cursor_start; | |
4660 | |
4661 if (u_save((linenr_T)(oap->start.lnum - 1), | |
4662 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
4663 return; | |
4664 curwin->w_cursor = oap->start; | |
4665 | |
4666 if (oap->is_VIsual) | |
4667 /* When there is no change: need to remove the Visual selection */ | |
4668 redraw_curbuf_later(INVERTED); | |
4669 | |
4670 /* Set '[ mark at the start of the formatted area */ | |
4671 curbuf->b_op_start = oap->start; | |
4672 | |
4673 /* For "gw" remember the cursor position and put it back below (adjusted | |
4674 * for joined and split lines). */ | |
4675 if (keep_cursor) | |
4676 saved_cursor = oap->cursor_start; | |
4677 | |
1563 | 4678 format_lines(oap->line_count, keep_cursor); |
7 | 4679 |
4680 /* | |
4681 * Leave the cursor at the first non-blank of the last formatted line. | |
4682 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
4683 * line, so "." will do the next lines. | |
4684 */ | |
4685 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
4686 ++curwin->w_cursor.lnum; | |
4687 beginline(BL_WHITE | BL_FIX); | |
4688 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
4689 msgmore(old_line_count); | |
4690 | |
4691 /* put '] mark on the end of the formatted area */ | |
4692 curbuf->b_op_end = curwin->w_cursor; | |
4693 | |
4694 if (keep_cursor) | |
4695 { | |
4696 curwin->w_cursor = saved_cursor; | |
4697 saved_cursor.lnum = 0; | |
4698 } | |
4699 | |
4700 if (oap->is_VIsual) | |
4701 { | |
4702 win_T *wp; | |
4703 | |
4704 FOR_ALL_WINDOWS(wp) | |
4705 { | |
4706 if (wp->w_old_cursor_lnum != 0) | |
4707 { | |
4708 /* When lines have been inserted or deleted, adjust the end of | |
4709 * the Visual area to be redrawn. */ | |
4710 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
4711 wp->w_old_cursor_lnum += old_line_count; | |
4712 else | |
4713 wp->w_old_visual_lnum += old_line_count; | |
4714 } | |
4715 } | |
4716 } | |
4717 } | |
4718 | |
667 | 4719 #if defined(FEAT_EVAL) || defined(PROTO) |
4720 /* | |
4721 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
4722 */ | |
4723 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4724 op_formatexpr(oparg_T *oap) |
667 | 4725 { |
4726 if (oap->is_VIsual) | |
4727 /* When there is no change: need to remove the Visual selection */ | |
4728 redraw_curbuf_later(INVERTED); | |
4729 | |
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4730 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
|
4731 /* 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
|
4732 * internal formatting. */ |
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4733 op_format(oap, FALSE); |
667 | 4734 } |
4735 | |
4736 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4737 fex_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4738 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4739 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4740 int c) /* character to be inserted */ |
667 | 4741 { |
681 | 4742 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
4743 OPT_LOCAL); | |
667 | 4744 int r; |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4745 char_u *fex; |
667 | 4746 |
4747 /* | |
4748 * Set v:lnum to the first line number and v:count to the number of lines. | |
844 | 4749 * Set v:char to the character to be inserted (can be NUL). |
667 | 4750 */ |
4751 set_vim_var_nr(VV_LNUM, lnum); | |
4752 set_vim_var_nr(VV_COUNT, count); | |
1969 | 4753 set_vim_var_char(c); |
844 | 4754 |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4755 /* 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
|
4756 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
|
4757 if (fex == NULL) |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4758 return 0; |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4759 |
667 | 4760 /* |
4761 * Evaluate the function. | |
4762 */ | |
4763 if (use_sandbox) | |
4764 ++sandbox; | |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4765 r = (int)eval_to_number(fex); |
667 | 4766 if (use_sandbox) |
4767 --sandbox; | |
844 | 4768 |
4769 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
|
4770 vim_free(fex); |
844 | 4771 |
667 | 4772 return r; |
4773 } | |
4774 #endif | |
4775 | |
7 | 4776 /* |
4777 * Format "line_count" lines, starting at the cursor position. | |
4778 * When "line_count" is negative, format until the end of the paragraph. | |
4779 * Lines after the cursor line are saved for undo, caller must have saved the | |
4780 * first line. | |
4781 */ | |
4782 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4783 format_lines( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4784 linenr_T line_count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4785 int avoid_fex) /* don't use 'formatexpr' */ |
7 | 4786 { |
4787 int max_len; | |
4788 int is_not_par; /* current line not part of parag. */ | |
4789 int next_is_not_par; /* next line not part of paragraph */ | |
4790 int is_end_par; /* at end of paragraph */ | |
4791 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
4792 int next_is_start_par = FALSE; | |
4793 #ifdef FEAT_COMMENTS | |
4794 int leader_len = 0; /* leader len of current line */ | |
4795 int next_leader_len; /* leader len of next line */ | |
4796 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
4797 char_u *next_leader_flags; /* flags for leader of next line */ | |
4798 int do_comments; /* format comments */ | |
3584 | 4799 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
7 | 4800 #endif |
4801 int advance = TRUE; | |
3584 | 4802 int second_indent = -1; /* indent for second line (comment |
4803 * aware) */ | |
7 | 4804 int do_second_indent; |
4805 int do_number_indent; | |
4806 int do_trail_white; | |
4807 int first_par_line = TRUE; | |
4808 int smd_save; | |
4809 long count; | |
4810 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
4811 int force_format = FALSE; | |
4812 int old_State = State; | |
4813 | |
4814 /* length of a line to force formatting: 3 * 'tw' */ | |
4815 max_len = comp_textwidth(TRUE) * 3; | |
4816 | |
4817 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
4818 #ifdef FEAT_COMMENTS | |
4819 do_comments = has_format_option(FO_Q_COMS); | |
4820 #endif | |
4821 do_second_indent = has_format_option(FO_Q_SECOND); | |
4822 do_number_indent = has_format_option(FO_Q_NUMBER); | |
4823 do_trail_white = has_format_option(FO_WHITE_PAR); | |
4824 | |
4825 /* | |
4826 * Get info about the previous and current line. | |
4827 */ | |
4828 if (curwin->w_cursor.lnum > 1) | |
4829 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
4830 #ifdef FEAT_COMMENTS | |
4831 , &leader_len, &leader_flags, do_comments | |
4832 #endif | |
4833 ); | |
4834 else | |
4835 is_not_par = TRUE; | |
4836 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
4837 #ifdef FEAT_COMMENTS | |
4838 , &next_leader_len, &next_leader_flags, do_comments | |
4839 #endif | |
4840 ); | |
4841 is_end_par = (is_not_par || next_is_not_par); | |
4842 if (!is_end_par && do_trail_white) | |
4843 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
4844 | |
4845 curwin->w_cursor.lnum--; | |
4846 for (count = line_count; count != 0 && !got_int; --count) | |
4847 { | |
4848 /* | |
4849 * Advance to next paragraph. | |
4850 */ | |
4851 if (advance) | |
4852 { | |
4853 curwin->w_cursor.lnum++; | |
4854 prev_is_end_par = is_end_par; | |
4855 is_not_par = next_is_not_par; | |
4856 #ifdef FEAT_COMMENTS | |
4857 leader_len = next_leader_len; | |
4858 leader_flags = next_leader_flags; | |
4859 #endif | |
4860 } | |
4861 | |
4862 /* | |
4863 * The last line to be formatted. | |
4864 */ | |
4865 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
4866 { | |
4867 next_is_not_par = TRUE; | |
4868 #ifdef FEAT_COMMENTS | |
4869 next_leader_len = 0; | |
4870 next_leader_flags = NULL; | |
4871 #endif | |
4872 } | |
4873 else | |
4874 { | |
4875 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
4876 #ifdef FEAT_COMMENTS | |
4877 , &next_leader_len, &next_leader_flags, do_comments | |
4878 #endif | |
4879 ); | |
4880 if (do_number_indent) | |
4881 next_is_start_par = | |
4882 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
4883 } | |
4884 advance = TRUE; | |
4885 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
4886 if (!is_end_par && do_trail_white) | |
4887 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
4888 | |
4889 /* | |
4890 * Skip lines that are not in a paragraph. | |
4891 */ | |
4892 if (is_not_par) | |
4893 { | |
4894 if (line_count < 0) | |
4895 break; | |
4896 } | |
4897 else | |
4898 { | |
4899 /* | |
4900 * For the first line of a paragraph, check indent of second line. | |
4901 * Don't do this for comments and empty lines. | |
4902 */ | |
4903 if (first_par_line | |
4904 && (do_second_indent || do_number_indent) | |
4905 && prev_is_end_par | |
3584 | 4906 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
4907 { | |
4908 if (do_second_indent && !lineempty(curwin->w_cursor.lnum + 1)) | |
4909 { | |
4910 #ifdef FEAT_COMMENTS | |
4911 if (leader_len == 0 && next_leader_len == 0) | |
4912 { | |
4913 /* no comment found */ | |
4914 #endif | |
4915 second_indent = | |
4916 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
7 | 4917 #ifdef FEAT_COMMENTS |
3584 | 4918 } |
4919 else | |
4920 { | |
4921 second_indent = next_leader_len; | |
4922 do_comments_list = 1; | |
4923 } | |
4924 #endif | |
4925 } | |
7 | 4926 else if (do_number_indent) |
3584 | 4927 { |
4928 #ifdef FEAT_COMMENTS | |
4929 if (leader_len == 0 && next_leader_len == 0) | |
4930 { | |
4931 /* no comment found */ | |
4932 #endif | |
4933 second_indent = | |
4934 get_number_indent(curwin->w_cursor.lnum); | |
4935 #ifdef FEAT_COMMENTS | |
4936 } | |
4937 else | |
4938 { | |
4939 /* get_number_indent() is now "comment aware"... */ | |
4940 second_indent = | |
4941 get_number_indent(curwin->w_cursor.lnum); | |
4942 do_comments_list = 1; | |
4943 } | |
4944 #endif | |
4945 } | |
7 | 4946 } |
4947 | |
4948 /* | |
4949 * When the comment leader changes, it's the end of the paragraph. | |
4950 */ | |
4951 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
4952 #ifdef FEAT_COMMENTS | |
4953 || !same_leader(curwin->w_cursor.lnum, | |
4954 leader_len, leader_flags, | |
4955 next_leader_len, next_leader_flags) | |
4956 #endif | |
4957 ) | |
4958 is_end_par = TRUE; | |
4959 | |
4960 /* | |
4961 * If we have got to the end of a paragraph, or the line is | |
4962 * getting long, format it. | |
4963 */ | |
4964 if (is_end_par || force_format) | |
4965 { | |
4966 if (need_set_indent) | |
4967 /* replace indent in first line with minimal number of | |
4968 * tabs and spaces, according to current options */ | |
4969 (void)set_indent(get_indent(), SIN_CHANGED); | |
4970 | |
4971 /* put cursor on last non-space */ | |
4972 State = NORMAL; /* don't go past end-of-line */ | |
4973 coladvance((colnr_T)MAXCOL); | |
4974 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
4975 dec_cursor(); | |
4976 | |
4977 /* do the formatting, without 'showmode' */ | |
4978 State = INSERT; /* for open_line() */ | |
4979 smd_save = p_smd; | |
4980 p_smd = FALSE; | |
4981 insertchar(NUL, INSCHAR_FORMAT | |
4982 #ifdef FEAT_COMMENTS | |
4983 + (do_comments ? INSCHAR_DO_COM : 0) | |
3584 | 4984 + (do_comments && do_comments_list |
4985 ? INSCHAR_COM_LIST : 0) | |
7 | 4986 #endif |
1563 | 4987 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
7 | 4988 State = old_State; |
4989 p_smd = smd_save; | |
4990 second_indent = -1; | |
4991 /* at end of par.: need to set indent of next par. */ | |
4992 need_set_indent = is_end_par; | |
4993 if (is_end_par) | |
4994 { | |
4995 /* When called with a negative line count, break at the | |
4996 * end of the paragraph. */ | |
4997 if (line_count < 0) | |
4998 break; | |
4999 first_par_line = TRUE; | |
5000 } | |
5001 force_format = FALSE; | |
5002 } | |
5003 | |
5004 /* | |
5005 * When still in same paragraph, join the lines together. But | |
5403 | 5006 * first delete the leader from the second line. |
7 | 5007 */ |
5008 if (!is_end_par) | |
5009 { | |
5010 advance = FALSE; | |
5011 curwin->w_cursor.lnum++; | |
5012 curwin->w_cursor.col = 0; | |
5013 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
|
5014 break; |
7 | 5015 #ifdef FEAT_COMMENTS |
5016 if (next_leader_len > 0) | |
5403 | 5017 { |
5018 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
7 | 5019 mark_col_adjust(curwin->w_cursor.lnum, (colnr_T)0, 0L, |
5020 (long)-next_leader_len); | |
5403 | 5021 } else |
5022 #endif | |
5023 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
5024 { | |
5025 char_u *p = ml_get_curline(); | |
5415 | 5026 int indent = (int)(skipwhite(p) - p); |
5403 | 5027 |
5028 if (indent > 0) | |
5029 { | |
5030 (void)del_bytes(indent, FALSE, FALSE); | |
5031 mark_col_adjust(curwin->w_cursor.lnum, | |
5032 (colnr_T)0, 0L, (long)-indent); | |
5415 | 5033 } |
5403 | 5034 } |
7 | 5035 curwin->w_cursor.lnum--; |
5848 | 5036 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
7 | 5037 { |
5038 beep_flush(); | |
5039 break; | |
5040 } | |
5041 first_par_line = FALSE; | |
5042 /* If the line is getting long, format it next time */ | |
5043 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
5044 force_format = TRUE; | |
5045 else | |
5046 force_format = FALSE; | |
5047 } | |
5048 } | |
5049 line_breakcheck(); | |
5050 } | |
5051 } | |
5052 | |
5053 /* | |
5054 * Return TRUE if line "lnum" ends in a white character. | |
5055 */ | |
5056 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5057 ends_in_white(linenr_T lnum) |
7 | 5058 { |
5059 char_u *s = ml_get(lnum); | |
5060 size_t l; | |
5061 | |
5062 if (*s == NUL) | |
5063 return FALSE; | |
5064 /* Don't use STRLEN() inside vim_iswhite(), SAS/C complains: "macro | |
5065 * invocation may call function multiple times". */ | |
5066 l = STRLEN(s) - 1; | |
5067 return vim_iswhite(s[l]); | |
5068 } | |
5069 | |
5070 /* | |
5071 * Blank lines, and lines containing only the comment leader, are left | |
5072 * untouched by the formatting. The function returns TRUE in this | |
5073 * case. It also returns TRUE when a line starts with the end of a comment | |
5074 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
5075 * previous line. A new paragraph starts after a blank line, or when the | |
5076 * comment leader changes -- webb. | |
5077 */ | |
5078 #ifdef FEAT_COMMENTS | |
5079 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5080 fmt_check_par( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5081 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5082 int *leader_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5083 char_u **leader_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5084 int do_comments) |
7 | 5085 { |
5086 char_u *flags = NULL; /* init for GCC */ | |
5087 char_u *ptr; | |
5088 | |
5089 ptr = ml_get(lnum); | |
5090 if (do_comments) | |
3562 | 5091 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
7 | 5092 else |
5093 *leader_len = 0; | |
5094 | |
5095 if (*leader_len > 0) | |
5096 { | |
5097 /* | |
5098 * Search for 'e' flag in comment leader flags. | |
5099 */ | |
5100 flags = *leader_flags; | |
5101 while (*flags && *flags != ':' && *flags != COM_END) | |
5102 ++flags; | |
5103 } | |
5104 | |
5105 return (*skipwhite(ptr + *leader_len) == NUL | |
5106 || (*leader_len > 0 && *flags == COM_END) | |
5107 || startPS(lnum, NUL, FALSE)); | |
5108 } | |
5109 #else | |
5110 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5111 fmt_check_par(linenr_T lnum) |
7 | 5112 { |
5113 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
5114 } | |
5115 #endif | |
5116 | |
5117 /* | |
5118 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
5119 * previous line is in the same paragraph. Used for auto-formatting. | |
5120 */ | |
5121 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5122 paragraph_start(linenr_T lnum) |
7 | 5123 { |
5124 char_u *p; | |
5125 #ifdef FEAT_COMMENTS | |
5126 int leader_len = 0; /* leader len of current line */ | |
5127 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
5128 int next_leader_len; /* leader len of next line */ | |
5129 char_u *next_leader_flags; /* flags for leader of next line */ | |
5130 int do_comments; /* format comments */ | |
5131 #endif | |
5132 | |
5133 if (lnum <= 1) | |
5134 return TRUE; /* start of the file */ | |
5135 | |
5136 p = ml_get(lnum - 1); | |
5137 if (*p == NUL) | |
5138 return TRUE; /* after empty line */ | |
5139 | |
5140 #ifdef FEAT_COMMENTS | |
5141 do_comments = has_format_option(FO_Q_COMS); | |
5142 #endif | |
5143 if (fmt_check_par(lnum - 1 | |
5144 #ifdef FEAT_COMMENTS | |
5145 , &leader_len, &leader_flags, do_comments | |
5146 #endif | |
5147 )) | |
5148 return TRUE; /* after non-paragraph line */ | |
5149 | |
5150 if (fmt_check_par(lnum | |
5151 #ifdef FEAT_COMMENTS | |
5152 , &next_leader_len, &next_leader_flags, do_comments | |
5153 #endif | |
5154 )) | |
5155 return TRUE; /* "lnum" is not a paragraph line */ | |
5156 | |
5157 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
5158 return TRUE; /* missing trailing space in previous line. */ | |
5159 | |
5160 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
5161 return TRUE; /* numbered item starts in "lnum". */ | |
5162 | |
5163 #ifdef FEAT_COMMENTS | |
5164 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
5165 next_leader_len, next_leader_flags)) | |
5166 return TRUE; /* change of comment leader. */ | |
5167 #endif | |
5168 | |
5169 return FALSE; | |
5170 } | |
5171 | |
5172 /* | |
5173 * prepare a few things for block mode yank/delete/tilde | |
5174 * | |
5175 * for delete: | |
5176 * - textlen includes the first/last char to be (partly) deleted | |
5177 * - start/endspaces is the number of columns that are taken by the | |
5178 * first/last deleted char minus the number of columns that have to be | |
1839 | 5179 * deleted. |
5180 * for yank and tilde: | |
7 | 5181 * - textlen includes the first/last char to be wholly yanked |
5182 * - start/endspaces is the number of columns of the first/last yanked char | |
5183 * that are to be yanked. | |
5184 */ | |
5185 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5186 block_prep( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5187 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5188 struct block_def *bdp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5189 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5190 int is_del) |
7 | 5191 { |
5192 int incr = 0; | |
5193 char_u *pend; | |
5194 char_u *pstart; | |
5195 char_u *line; | |
5196 char_u *prev_pstart; | |
5197 char_u *prev_pend; | |
5198 | |
5199 bdp->startspaces = 0; | |
5200 bdp->endspaces = 0; | |
5201 bdp->textlen = 0; | |
5202 bdp->start_vcol = 0; | |
5203 bdp->end_vcol = 0; | |
5204 #ifdef FEAT_VISUALEXTRA | |
5205 bdp->is_short = FALSE; | |
5206 bdp->is_oneChar = FALSE; | |
5207 bdp->pre_whitesp = 0; | |
5208 bdp->pre_whitesp_c = 0; | |
5209 bdp->end_char_vcols = 0; | |
5210 #endif | |
5211 bdp->start_char_vcols = 0; | |
5212 | |
5213 line = ml_get(lnum); | |
5214 pstart = line; | |
5215 prev_pstart = line; | |
5216 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
5217 { | |
5218 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 5219 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
7 | 5220 bdp->start_vcol += incr; |
5221 #ifdef FEAT_VISUALEXTRA | |
5222 if (vim_iswhite(*pstart)) | |
5223 { | |
5224 bdp->pre_whitesp += incr; | |
5225 bdp->pre_whitesp_c++; | |
5226 } | |
5227 else | |
5228 { | |
5229 bdp->pre_whitesp = 0; | |
5230 bdp->pre_whitesp_c = 0; | |
5231 } | |
5232 #endif | |
5233 prev_pstart = pstart; | |
39 | 5234 mb_ptr_adv(pstart); |
7 | 5235 } |
5236 bdp->start_char_vcols = incr; | |
5237 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
5238 { | |
5239 bdp->end_vcol = bdp->start_vcol; | |
5240 #ifdef FEAT_VISUALEXTRA | |
5241 bdp->is_short = TRUE; | |
5242 #endif | |
5243 if (!is_del || oap->op_type == OP_APPEND) | |
5244 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
5245 } | |
5246 else | |
5247 { | |
5248 /* notice: this converts partly selected Multibyte characters to | |
5249 * spaces, too. */ | |
5250 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
5251 if (is_del && bdp->startspaces) | |
5252 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
5253 pend = pstart; | |
5254 bdp->end_vcol = bdp->start_vcol; | |
5255 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
5256 { | |
5257 #ifdef FEAT_VISUALEXTRA | |
5258 bdp->is_oneChar = TRUE; | |
5259 #endif | |
5260 if (oap->op_type == OP_INSERT) | |
5261 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5262 else if (oap->op_type == OP_APPEND) | |
5263 { | |
5264 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
5265 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5266 } | |
5267 else | |
5268 { | |
5269 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
5270 if (is_del && oap->op_type != OP_LSHIFT) | |
5271 { | |
5272 /* just putting the sum of those two into | |
5273 * bdp->startspaces doesn't work for Visual replace, | |
5274 * so we have to split the tab in two */ | |
5275 bdp->startspaces = bdp->start_char_vcols | |
5276 - (bdp->start_vcol - oap->start_vcol); | |
5277 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5278 } | |
5279 } | |
5280 } | |
5281 else | |
5282 { | |
5283 prev_pend = pend; | |
5284 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
5285 { | |
5286 /* Count a tab for what it's worth (if list mode not on) */ | |
5287 prev_pend = pend; | |
6535 | 5288 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
7 | 5289 bdp->end_vcol += incr; |
5290 } | |
5291 if (bdp->end_vcol <= oap->end_vcol | |
5292 && (!is_del | |
5293 || oap->op_type == OP_APPEND | |
5294 || oap->op_type == OP_REPLACE)) /* line too short */ | |
5295 { | |
5296 #ifdef FEAT_VISUALEXTRA | |
5297 bdp->is_short = TRUE; | |
5298 #endif | |
5299 /* Alternative: include spaces to fill up the block. | |
5300 * Disadvantage: can lead to trailing spaces when the line is | |
5301 * short where the text is put */ | |
5302 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
5303 if (oap->op_type == OP_APPEND || virtual_op) | |
5304 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
593 | 5305 + oap->inclusive; |
7 | 5306 else |
5307 bdp->endspaces = 0; /* replace doesn't add characters */ | |
5308 } | |
5309 else if (bdp->end_vcol > oap->end_vcol) | |
5310 { | |
5311 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5312 if (!is_del && bdp->endspaces) | |
5313 { | |
5314 bdp->endspaces = incr - bdp->endspaces; | |
5315 if (pend != pstart) | |
5316 pend = prev_pend; | |
5317 } | |
5318 } | |
5319 } | |
5320 #ifdef FEAT_VISUALEXTRA | |
5321 bdp->end_char_vcols = incr; | |
5322 #endif | |
5323 if (is_del && bdp->startspaces) | |
5324 pstart = prev_pstart; | |
5325 bdp->textlen = (int)(pend - pstart); | |
5326 } | |
5327 bdp->textcol = (colnr_T) (pstart - line); | |
5328 bdp->textstart = pstart; | |
5329 } | |
5330 | |
5331 /* | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5332 * Handle the add/subtract operator. |
7 | 5333 */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5334 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5335 op_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5336 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5337 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
|
5338 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
|
5339 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5340 pos_T pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5341 struct block_def bd; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5342 int change_cnt = 0; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5343 linenr_T amount = Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5344 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5345 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5346 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5347 pos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5348 if (u_save_cursor() == FAIL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5349 return; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5350 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
|
5351 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5352 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
|
5353 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5354 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5355 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5356 int one_change; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5357 int length; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5358 pos_T startpos; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5359 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5360 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
|
5361 (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
|
5362 return; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5363 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5364 pos = oap->start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5365 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
|
5366 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5367 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
|
5368 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5369 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
|
5370 pos.col = bd.textcol; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5371 length = bd.textlen; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5372 } |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5373 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
|
5374 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5375 curwin->w_cursor.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5376 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5377 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
|
5378 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5379 else /* oap->motion_type == MCHAR */ |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5380 { |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5381 if (!oap->inclusive) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5382 dec(&(oap->end)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5383 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
|
5384 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5385 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
|
5386 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5387 pos.col += oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5388 length -= oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5389 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5390 if (pos.lnum == oap->end.lnum) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5391 { |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5392 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
|
5393 if (oap->end.col >= length) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5394 oap->end.col = length - 1; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5395 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
|
5396 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5397 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5398 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
|
5399 if (one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5400 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5401 /* 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
|
5402 if (change_cnt == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5403 startpos = curbuf->b_op_start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5404 ++change_cnt; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5405 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5406 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5407 #ifdef FEAT_NETBEANS_INTG |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5408 if (netbeans_active() && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5409 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5410 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
|
5411 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5412 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
|
5413 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
|
5414 &ptr[pos.col], length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5415 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5416 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5417 if (g_cmd && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5418 amount += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5419 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5420 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5421 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
|
5422 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5423 if (!change_cnt && oap->is_VIsual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5424 /* 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
|
5425 redraw_curbuf_later(INVERTED); |
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 /* 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
|
5428 * position from do_addsub(). */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5429 if (change_cnt > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5430 curbuf->b_op_start = startpos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5431 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5432 if (change_cnt > p_report) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5433 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5434 if (change_cnt == 1) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5435 MSG(_("1 line changed")); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5436 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5437 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
|
5438 } |
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 } |
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 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5443 * 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
|
5444 * 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
|
5445 * |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5446 * 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
|
5447 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5448 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5449 do_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5450 int op_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5451 pos_T *pos, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5452 int length, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5453 linenr_T Prenum1) |
7 | 5454 { |
5455 int col; | |
5456 char_u *buf1; | |
5457 char_u buf2[NUMBUFLEN]; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5458 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
7 | 5459 static int hexupper = FALSE; /* 0xABC */ |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5460 uvarnumber_T n; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5461 uvarnumber_T oldn; |
7 | 5462 char_u *ptr; |
5463 int c; | |
5464 int todel; | |
5465 int dohex; | |
5466 int dooct; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5467 int dobin; |
7 | 5468 int doalp; |
5469 int firstdigit; | |
5470 int subtract; | |
6868 | 5471 int negative = FALSE; |
6891 | 5472 int was_positive = TRUE; |
6868 | 5473 int visual = VIsual_active; |
6921 | 5474 int did_change = FALSE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5475 pos_T save_cursor = curwin->w_cursor; |
6927 | 5476 int maxlen = 0; |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5477 pos_T startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5478 pos_T endpos; |
7 | 5479 |
5480 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
5481 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
|
5482 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
7 | 5483 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
5484 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5485 curwin->w_cursor = *pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5486 ptr = ml_get(pos->lnum); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5487 col = pos->col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5488 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5489 if (*ptr == NUL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5490 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5491 |
7 | 5492 /* |
5493 * First check if we are on a hexadecimal number, after the "0x". | |
5494 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5495 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5496 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5497 if (dobin) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5498 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
|
5499 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5500 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5501 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5502 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5503 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
|
5504 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5505 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5506 |
6868 | 5507 if (dohex) |
5508 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
|
5509 { |
6868 | 5510 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5511 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5512 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5513 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
|
5514 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5515 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5516 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5517 if ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5518 && dohex |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5519 && ! ((col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5520 && (ptr[col] == 'X' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5521 || ptr[col] == 'x') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5522 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5523 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5524 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5525 !(*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
|
5526 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5527 && vim_isxdigit(ptr[col + 1])))) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5528 { |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5529 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5530 /* 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
|
5531 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5532 col = pos->col; |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5533 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5534 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
|
5535 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5536 col--; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5537 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5538 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5539 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
|
5540 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5541 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5542 } |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5543 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5544 if (( dohex |
6868 | 5545 && col > 0 |
5546 && (ptr[col] == 'X' | |
5547 || ptr[col] == 'x') | |
5548 && ptr[col - 1] == '0' | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5549 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5550 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5551 !(*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
|
5552 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5553 && vim_isxdigit(ptr[col + 1])) || |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5554 ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5555 && col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5556 && (ptr[col] == 'B' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5557 || ptr[col] == 'b') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5558 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5559 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5560 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5561 !(*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
|
5562 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5563 && vim_isbdigit(ptr[col + 1]))) |
6868 | 5564 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5565 /* Found hexadecimal or binary number, move to its start. */ |
7 | 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 |
6868 | 5571 } |
5572 else | |
7 | 5573 { |
6868 | 5574 /* |
5575 * Search forward and then backward to find the start of number. | |
5576 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5577 col = pos->col; |
6868 | 5578 |
5579 while (ptr[col] != NUL | |
5580 && !vim_isdigit(ptr[col]) | |
5581 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5582 col += MB_PTR2LEN(ptr + col); |
6868 | 5583 |
5584 while (col > 0 | |
5585 && vim_isdigit(ptr[col - 1]) | |
5586 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5587 { |
6868 | 5588 --col; |
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 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5591 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
|
5592 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5593 } |
6868 | 5594 } |
5595 } | |
5596 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5597 if (visual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5598 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5599 while (ptr[col] != NUL && length > 0 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5600 && !vim_isdigit(ptr[col]) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5601 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5602 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5603 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
|
5604 |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5605 col += mb_len; |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5606 length -= mb_len; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5607 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5608 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5609 if (length == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5610 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5611 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5612 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
|
5613 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5614 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5615 !(*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
|
5616 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5617 ) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5618 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5619 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5620 was_positive = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5621 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5622 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5623 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5624 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5625 * 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
|
5626 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5627 firstdigit = ptr[col]; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5628 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
|
5629 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5630 beep_flush(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5631 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5632 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5633 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5634 if (doalp && ASCII_ISALPHA(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5635 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5636 /* decrement or increment alphabetic character */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5637 if (op_type == OP_NR_SUB) |
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 (CharOrd(firstdigit) < Prenum1) |
6927 | 5640 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5641 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5642 firstdigit = 'A'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5643 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5644 firstdigit = 'a'; |
6927 | 5645 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5646 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5647 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5648 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5649 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5650 firstdigit -= Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5651 #endif |
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 else |
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 (26 - CharOrd(firstdigit) - 1 < Prenum1) |
6927 | 5656 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5657 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5658 firstdigit = 'Z'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5659 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5660 firstdigit = 'z'; |
6927 | 5661 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5662 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5663 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5664 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5665 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5666 firstdigit += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5667 #endif |
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 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5670 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5671 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5672 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5673 (void)del_char(FALSE); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5674 ins_char(firstdigit); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5675 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5676 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5677 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5678 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5679 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5680 if (col > 0 && ptr[col - 1] == '-' |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5681 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5682 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5683 !(*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
|
5684 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5685 && !visual) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5686 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5687 /* negative number */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5688 --col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5689 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5690 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5691 /* get the number value (unsigned) */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5692 if (visual && VIsual_mode != 'V') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5693 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
|
5694 ? (int)STRLEN(ptr) - col |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5695 : length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5696 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5697 vim_str2nr(ptr + col, &pre, &length, |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5698 0 + (dobin ? STR2NR_BIN : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5699 + (dooct ? STR2NR_OCT : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5700 + (dohex ? STR2NR_HEX : 0), |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5701 NULL, &n, maxlen); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5702 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5703 /* 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
|
5704 if (pre && negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5705 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5706 ++col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5707 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5708 negative = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5709 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5710 /* add or subtract */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5711 subtract = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5712 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5713 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5714 if (negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5715 subtract ^= TRUE; |
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 oldn = n; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5718 if (subtract) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5719 n -= (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5720 else |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5721 n += (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5722 /* handle wraparound for decimal numbers */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5723 if (!pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5724 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5725 if (subtract) |
6927 | 5726 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5727 if (n > oldn) |
6868 | 5728 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5729 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
|
5730 negative ^= TRUE; |
6868 | 5731 } |
7 | 5732 } |
5733 else | |
6868 | 5734 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5735 /* add */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5736 if (n < oldn) |
6868 | 5737 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5738 n = (n ^ (uvarnumber_T)-1); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5739 negative ^= TRUE; |
6868 | 5740 } |
6927 | 5741 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5742 if (n == 0) |
6868 | 5743 negative = FALSE; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5744 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5745 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5746 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
|
5747 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5748 /* need to remove the '-' */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5749 col--; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5750 length++; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5751 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5752 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5753 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5754 * Delete the old number. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5755 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5756 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5757 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5758 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5759 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5760 todel = length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5761 c = gchar_cursor(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5762 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5763 * 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
|
5764 * 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
|
5765 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5766 if (c == '-') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5767 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5768 while (todel-- > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5769 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5770 if (c < 0x100 && isalpha(c)) |
6868 | 5771 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5772 if (isupper(c)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5773 hexupper = TRUE; |
6868 | 5774 else |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5775 hexupper = FALSE; |
6891 | 5776 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5777 /* 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
|
5778 (void)del_char(FALSE); |
6868 | 5779 c = gchar_cursor(); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5780 } |
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 * Prepare the leading characters in buf1[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5784 * 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
|
5785 * Allocate a bit too much. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5786 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5787 buf1 = alloc((unsigned)length + NUMBUFLEN); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5788 if (buf1 == NULL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5789 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5790 ptr = buf1; |
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
5791 if (negative && (!visual || was_positive)) |
7574
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 *ptr++ = '-'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5794 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5795 if (pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5796 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5797 *ptr++ = '0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5798 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5799 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5800 if (pre == 'b' || pre == 'B' || |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5801 pre == 'x' || pre == 'X') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5802 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5803 *ptr++ = pre; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5804 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5805 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5806 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5807 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5808 * Put the number characters in buf2[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5809 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5810 if (pre == 'b' || pre == 'B') |
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 int i; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5813 int bit = 0; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5814 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
|
5815 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5816 /* leading zeros */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5817 for (bit = bits; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5818 if ((n >> (bit - 1)) & 0x1) break; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5819 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5820 for (i = 0; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5821 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
|
5822 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5823 buf2[i] = '\0'; |
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 else if (pre == 0) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5826 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
|
5827 else if (pre == '0') |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5828 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
|
5829 else if (pre && hexupper) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5830 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
|
5831 else |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5832 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
|
5833 length -= (int)STRLEN(buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5834 |
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 * 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
|
5837 * 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
|
5838 * Don't do this when |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5839 * 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
|
5840 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5841 if (firstdigit == '0' && !(dooct && pre == 0)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5842 while (length-- > 0) |
6868 | 5843 *ptr++ = '0'; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5844 *ptr = NUL; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5845 STRCAT(buf1, buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5846 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
|
5847 vim_free(buf1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5848 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5849 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
|
5850 --curwin->w_cursor.col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5851 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5852 |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5853 if (did_change) |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5854 { |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5855 /* set the '[ and '] marks */ |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5856 curbuf->b_op_start = startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5857 curbuf->b_op_end = endpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5858 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
|
5859 --curbuf->b_op_end.col; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5860 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5861 |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5862 theend: |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5863 if (visual) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5864 curwin->w_cursor = save_cursor; |
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5865 else if (did_change) |
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5866 curwin->w_set_curswant = TRUE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5867 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5868 return did_change; |
7 | 5869 } |
5870 | |
5871 #ifdef FEAT_VIMINFO | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5872 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5873 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
|
5874 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5875 #define REG_PREVIOUS 1 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5876 #define REG_EXEC 2 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5877 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5878 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5879 * 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
|
5880 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5881 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5882 prepare_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5883 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5884 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
|
5885 * (int)sizeof(yankreg_T)); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5886 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5887 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5888 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5889 finish_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5890 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5891 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5892 int j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5893 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5894 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5895 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5896 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
|
5897 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
|
5898 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5899 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
|
5900 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
|
5901 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
|
5902 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5903 vim_free(y_read_regs); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5904 y_read_regs = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5905 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5906 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5907 |
7 | 5908 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5909 read_viminfo_register(vir_T *virp, int force) |
7 | 5910 { |
5911 int eof; | |
5912 int do_it = TRUE; | |
5913 int size; | |
5914 int limit; | |
5915 int i; | |
5916 int set_prev = FALSE; | |
5917 char_u *str; | |
5918 char_u **array = NULL; | |
6508 | 5919 int new_type = MCHAR; /* init to shut up compiler */ |
5920 colnr_T new_width = 0; /* init to shut up compiler */ | |
7 | 5921 |
5922 /* We only get here (hopefully) if line[0] == '"' */ | |
5923 str = virp->vir_line + 1; | |
1893 | 5924 |
5925 /* If the line starts with "" this is the y_previous register. */ | |
7 | 5926 if (*str == '"') |
5927 { | |
5928 set_prev = TRUE; | |
5929 str++; | |
5930 } | |
1893 | 5931 |
7 | 5932 if (!ASCII_ISALNUM(*str) && *str != '-') |
5933 { | |
5934 if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line)) | |
5935 return TRUE; /* too many errors, pretend end-of-file */ | |
5936 do_it = FALSE; | |
5937 } | |
5938 get_yank_register(*str++, FALSE); | |
5939 if (!force && y_current->y_array != NULL) | |
5940 do_it = FALSE; | |
1893 | 5941 |
5942 if (*str == '@') | |
5943 { | |
5944 /* "x@: register x used for @@ */ | |
5945 if (force || execreg_lastc == NUL) | |
5946 execreg_lastc = str[-1]; | |
5947 } | |
5948 | |
7 | 5949 size = 0; |
5950 limit = 100; /* Optimized for registers containing <= 100 lines */ | |
5951 if (do_it) | |
5952 { | |
6462 | 5953 /* |
5954 * Build the new register in array[]. | |
5955 * y_array is kept as-is until done. | |
5956 * The "do_it" flag is reset when something is wrong, in which case | |
5957 * array[] needs to be freed. | |
5958 */ | |
7 | 5959 if (set_prev) |
5960 y_previous = y_current; | |
6462 | 5961 array = (char_u **)alloc((unsigned)(limit * sizeof(char_u *))); |
1893 | 5962 str = skipwhite(skiptowhite(str)); |
7 | 5963 if (STRNCMP(str, "CHAR", 4) == 0) |
6462 | 5964 new_type = MCHAR; |
7 | 5965 else if (STRNCMP(str, "BLOCK", 5) == 0) |
6462 | 5966 new_type = MBLOCK; |
7 | 5967 else |
6462 | 5968 new_type = MLINE; |
7 | 5969 /* get the block width; if it's missing we get a zero, which is OK */ |
5970 str = skipwhite(skiptowhite(str)); | |
6462 | 5971 new_width = getdigits(&str); |
7 | 5972 } |
5973 | |
5974 while (!(eof = viminfo_readline(virp)) | |
5975 && (virp->vir_line[0] == TAB || virp->vir_line[0] == '<')) | |
5976 { | |
5977 if (do_it) | |
5978 { | |
6462 | 5979 if (size == limit) |
7 | 5980 { |
6462 | 5981 char_u **new_array = (char_u **) |
7 | 5982 alloc((unsigned)(limit * 2 * sizeof(char_u *))); |
6462 | 5983 |
5984 if (new_array == NULL) | |
5985 { | |
5986 do_it = FALSE; | |
5987 break; | |
5988 } | |
7 | 5989 for (i = 0; i < limit; i++) |
6462 | 5990 new_array[i] = array[i]; |
7 | 5991 vim_free(array); |
6462 | 5992 array = new_array; |
7 | 5993 limit *= 2; |
5994 } | |
5995 str = viminfo_readstring(virp, 1, TRUE); | |
5996 if (str != NULL) | |
5997 array[size++] = str; | |
5998 else | |
6462 | 5999 /* error, don't store the result */ |
7 | 6000 do_it = FALSE; |
6001 } | |
6002 } | |
6508 | 6003 |
7 | 6004 if (do_it) |
6005 { | |
6462 | 6006 /* free y_array[] */ |
6007 for (i = 0; i < y_current->y_size; i++) | |
6008 vim_free(y_current->y_array[i]); | |
6009 vim_free(y_current->y_array); | |
6010 | |
6011 y_current->y_type = new_type; | |
6012 y_current->y_width = new_width; | |
6013 y_current->y_size = size; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6014 y_current->y_time_set = 0; |
7 | 6015 if (size == 0) |
6016 { | |
6017 y_current->y_array = NULL; | |
6018 } | |
6462 | 6019 else |
7 | 6020 { |
6462 | 6021 /* Move the lines from array[] to y_array[]. */ |
7 | 6022 y_current->y_array = |
6023 (char_u **)alloc((unsigned)(size * sizeof(char_u *))); | |
6024 for (i = 0; i < size; i++) | |
6462 | 6025 { |
6026 if (y_current->y_array == NULL) | |
6027 vim_free(array[i]); | |
6028 else | |
6029 y_current->y_array[i] = array[i]; | |
6030 } | |
7 | 6031 } |
6462 | 6032 } |
6033 else | |
6034 { | |
6035 /* Free array[] if it was filled. */ | |
6036 for (i = 0; i < size; i++) | |
6037 vim_free(array[i]); | |
6038 } | |
6039 vim_free(array); | |
6040 | |
7 | 6041 return eof; |
6042 } | |
6043 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6044 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6045 * 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
|
6046 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6047 void |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6048 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
|
6049 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6050 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
|
6051 int flags; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6052 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6053 int type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6054 int linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6055 int width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6056 time_t timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6057 yankreg_T *y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6058 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6059 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6060 /* Check the format: |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6061 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6062 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6063 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6064 if (values->ga_len < 6 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6065 || vp[0].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6066 || vp[1].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6067 || vp[2].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6068 || vp[3].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6069 || vp[4].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6070 || vp[5].bv_type != BVAL_NR) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6071 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6072 flags = vp[0].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6073 name = vp[1].bv_nr; |
9307
eb52a2670c96
commit https://github.com/vim/vim/commit/67e3720a9ddd8a9d2e8344358c28fa1f4196db0d
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
6074 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
|
6075 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6076 type = vp[2].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6077 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
|
6078 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6079 linecount = vp[3].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6080 if (values->ga_len < 6 + linecount) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6081 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6082 width = vp[4].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6083 if (width < 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6084 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6085 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6086 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6087 /* 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
|
6088 * 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
|
6089 y_ptr = &y_read_regs[name]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6090 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6091 y_ptr = &y_regs[name]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6092 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6093 /* 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
|
6094 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
|
6095 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
|
6096 && (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
|
6097 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6098 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6099 if (y_ptr->y_array != NULL) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6100 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
|
6101 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
|
6102 vim_free(y_ptr->y_array); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6103 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6104 if (y_read_regs == NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6105 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6106 if (flags & REG_PREVIOUS) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6107 y_previous = y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6108 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
|
6109 execreg_lastc = get_register_name(name); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6110 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6111 y_ptr->y_type = type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6112 y_ptr->y_width = width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6113 y_ptr->y_size = linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6114 y_ptr->y_time_set = timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6115 if (linecount == 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6116 y_ptr->y_array = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6117 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6118 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6119 y_ptr->y_array = |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6120 (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
|
6121 for (i = 0; i < linecount; i++) |
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 if (vp[i + 6].bv_allocated) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6124 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6125 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
|
6126 vp[i + 6].bv_string = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6127 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6128 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6129 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
|
6130 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6131 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6132 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6133 |
7 | 6134 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6135 write_viminfo_registers(FILE *fp) |
7 | 6136 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6137 int i, j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6138 char_u *type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6139 char_u c; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6140 int num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6141 int max_num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6142 int max_kbyte; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6143 long len; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6144 yankreg_T *y_ptr; |
7 | 6145 |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
6146 fputs(_("\n# Registers:\n"), fp); |
7 | 6147 |
6148 /* Get '<' value, use old '"' value if '<' is not found. */ | |
6149 max_num_lines = get_viminfo_parameter('<'); | |
6150 if (max_num_lines < 0) | |
6151 max_num_lines = get_viminfo_parameter('"'); | |
6152 if (max_num_lines == 0) | |
6153 return; | |
6154 max_kbyte = get_viminfo_parameter('s'); | |
6155 if (max_kbyte == 0) | |
6156 return; | |
1893 | 6157 |
7 | 6158 for (i = 0; i < NUM_REGISTERS; i++) |
6159 { | |
6160 #ifdef FEAT_CLIPBOARD | |
6161 /* Skip '*'/'+' register, we don't want them back next time */ | |
6162 if (i == STAR_REGISTER || i == PLUS_REGISTER) | |
6163 continue; | |
6164 #endif | |
6165 #ifdef FEAT_DND | |
6166 /* Neither do we want the '~' register */ | |
6167 if (i == TILDE_REGISTER) | |
6168 continue; | |
6169 #endif | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6170 /* 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
|
6171 * viminfo if it's newer. */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6172 if (y_read_regs != NULL |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6173 && 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
|
6174 && (y_regs[i].y_array == NULL || |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6175 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
|
6176 y_ptr = &y_read_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6177 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
|
6178 continue; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6179 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6180 y_ptr = &y_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6181 |
55 | 6182 /* Skip empty registers. */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6183 num_lines = y_ptr->y_size; |
55 | 6184 if (num_lines == 0 |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6185 || (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
|
6186 && *y_ptr->y_array[0] == NUL)) |
55 | 6187 continue; |
6188 | |
7 | 6189 if (max_kbyte > 0) |
6190 { | |
6191 /* Skip register if there is more text than the maximum size. */ | |
6192 len = 0; | |
6193 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
|
6194 len += (long)STRLEN(y_ptr->y_array[j]) + 1L; |
7 | 6195 if (len > (long)max_kbyte * 1024L) |
6196 continue; | |
6197 } | |
6198 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6199 switch (y_ptr->y_type) |
7 | 6200 { |
6201 case MLINE: | |
6202 type = (char_u *)"LINE"; | |
6203 break; | |
6204 case MCHAR: | |
6205 type = (char_u *)"CHAR"; | |
6206 break; | |
6207 case MBLOCK: | |
6208 type = (char_u *)"BLOCK"; | |
6209 break; | |
6210 default: | |
6211 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
|
6212 y_ptr->y_type); |
7 | 6213 emsg(IObuff); |
6214 type = (char_u *)"LINE"; | |
6215 break; | |
6216 } | |
6217 if (y_previous == &y_regs[i]) | |
6218 fprintf(fp, "\""); | |
6219 c = get_register_name(i); | |
1893 | 6220 fprintf(fp, "\"%c", c); |
6221 if (c == execreg_lastc) | |
6222 fprintf(fp, "@"); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6223 fprintf(fp, "\t%s\t%d\n", type, (int)y_ptr->y_width); |
7 | 6224 |
6225 /* If max_num_lines < 0, then we save ALL the lines in the register */ | |
6226 if (max_num_lines > 0 && num_lines > max_num_lines) | |
6227 num_lines = max_num_lines; | |
6228 for (j = 0; j < num_lines; j++) | |
6229 { | |
6230 putc('\t', fp); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6231 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
|
6232 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6233 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6234 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6235 int flags = 0; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6236 int remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6237 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6238 /* 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
|
6239 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6240 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6241 * 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
|
6242 * REG_EXEC - used for @@ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6243 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6244 if (y_previous == &y_regs[i]) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6245 flags |= REG_PREVIOUS; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6246 if (c == execreg_lastc) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6247 flags |= REG_EXEC; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6248 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
|
6249 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
|
6250 (long)y_ptr->y_time_set); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6251 /* 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
|
6252 remaining = LSIZE - 71; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6253 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
|
6254 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6255 putc(',', fp); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6256 --remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6257 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
|
6258 remaining); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6259 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6260 putc('\n', fp); |
7 | 6261 } |
6262 } | |
6263 } | |
6264 #endif /* FEAT_VIMINFO */ | |
6265 | |
6266 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
6267 /* | |
6268 * SELECTION / PRIMARY ('*') | |
6269 * | |
6270 * Text selection stuff that uses the GUI selection register '*'. When using a | |
6271 * GUI this may be text from another window, otherwise it is the last text we | |
6272 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
6273 * button performs the paste, otherwise you will need to do <"*p>. " | |
6274 * If not under X, it is synonymous with the clipboard register '+'. | |
6275 * | |
6276 * X CLIPBOARD ('+') | |
6277 * | |
6278 * Text selection stuff that uses the GUI clipboard register '+'. | |
6279 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
6280 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
6281 * otherwise you will need to do <"+p>. " | |
6282 * If not under X, it is synonymous with the selection register '*'. | |
6283 */ | |
6284 | |
6285 /* | |
6286 * Routine to export any final X selection we had to the environment | |
6287 * so that the text is still available after vim has exited. X selections | |
6288 * only exist while the owning application exists, so we write to the | |
6289 * permanent (while X runs) store CUT_BUFFER0. | |
6290 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
6291 * 'permanent' of the two), otherwise the PRIMARY one. | |
6292 * For now, use a hard-coded sanity limit of 1Mb of data. | |
6293 */ | |
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
6294 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
7 | 6295 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6296 x11_export_final_selection(void) |
7 | 6297 { |
6298 Display *dpy; | |
6299 char_u *str = NULL; | |
6300 long_u len = 0; | |
6301 int motion_type = -1; | |
6302 | |
6303 # ifdef FEAT_GUI | |
6304 if (gui.in_use) | |
6305 dpy = X_DISPLAY; | |
6306 else | |
6307 # endif | |
6308 # ifdef FEAT_XCLIPBOARD | |
6309 dpy = xterm_dpy; | |
6310 # else | |
6311 return; | |
6312 # endif | |
6313 | |
6314 /* Get selection to export */ | |
6315 if (clip_plus.owned) | |
6316 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
6317 else if (clip_star.owned) | |
6318 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
6319 | |
6320 /* Check it's OK */ | |
6321 if (dpy != NULL && str != NULL && motion_type >= 0 | |
6322 && len < 1024*1024 && len > 0) | |
6323 { | |
1924 | 6324 #ifdef FEAT_MBYTE |
4201 | 6325 int ok = TRUE; |
6326 | |
1924 | 6327 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
6328 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
6329 * encoding conversion usually doesn't work, so keep the text as-is. | |
6330 */ | |
6331 if (has_mbyte) | |
6332 { | |
6333 vimconv_T vc; | |
6334 | |
6335 vc.vc_type = CONV_NONE; | |
6336 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
6337 { | |
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6338 int intlen = len; |
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6339 char_u *conv_str; |
2007 | 6340 |
4201 | 6341 vc.vc_fail = TRUE; |
2007 | 6342 conv_str = string_convert(&vc, str, &intlen); |
6343 len = intlen; | |
1924 | 6344 if (conv_str != NULL) |
6345 { | |
6346 vim_free(str); | |
6347 str = conv_str; | |
6348 } | |
4201 | 6349 else |
6350 { | |
6351 ok = FALSE; | |
6352 } | |
1924 | 6353 convert_setup(&vc, NULL, NULL); |
6354 } | |
4201 | 6355 else |
6356 { | |
6357 ok = FALSE; | |
6358 } | |
1924 | 6359 } |
4201 | 6360 |
6361 /* Do not store the string if conversion failed. Better to use any | |
6362 * other selection than garbled text. */ | |
6363 if (ok) | |
6364 #endif | |
6365 { | |
6366 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
6367 XFlush(dpy); | |
6368 } | |
7 | 6369 } |
6370 | |
6371 vim_free(str); | |
6372 } | |
6373 #endif | |
6374 | |
6375 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6376 clip_free_selection(VimClipboard *cbd) |
7 | 6377 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6378 yankreg_T *y_ptr = y_current; |
7 | 6379 |
6380 if (cbd == &clip_plus) | |
6381 y_current = &y_regs[PLUS_REGISTER]; | |
6382 else | |
6383 y_current = &y_regs[STAR_REGISTER]; | |
6384 free_yank_all(); | |
6385 y_current->y_size = 0; | |
6386 y_current = y_ptr; | |
6387 } | |
6388 | |
6389 /* | |
6390 * Get the selected text and put it in the gui selection register '*' or '+'. | |
6391 */ | |
6392 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6393 clip_get_selection(VimClipboard *cbd) |
7 | 6394 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6395 yankreg_T *old_y_previous, *old_y_current; |
7 | 6396 pos_T old_cursor; |
6397 pos_T old_visual; | |
6398 int old_visual_mode; | |
6399 colnr_T old_curswant; | |
6400 int old_set_curswant; | |
6401 pos_T old_op_start, old_op_end; | |
6402 oparg_T oa; | |
6403 cmdarg_T ca; | |
6404 | |
6405 if (cbd->owned) | |
6406 { | |
6407 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
6408 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
6409 return; | |
6410 | |
6411 /* Get the text between clip_star.start & clip_star.end */ | |
6412 old_y_previous = y_previous; | |
6413 old_y_current = y_current; | |
6414 old_cursor = curwin->w_cursor; | |
6415 old_curswant = curwin->w_curswant; | |
6416 old_set_curswant = curwin->w_set_curswant; | |
6417 old_op_start = curbuf->b_op_start; | |
6418 old_op_end = curbuf->b_op_end; | |
6419 old_visual = VIsual; | |
6420 old_visual_mode = VIsual_mode; | |
6421 clear_oparg(&oa); | |
6422 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
6423 oa.op_type = OP_YANK; | |
6424 vim_memset(&ca, 0, sizeof(ca)); | |
6425 ca.oap = &oa; | |
6426 ca.cmdchar = 'y'; | |
6427 ca.count1 = 1; | |
6428 ca.retval = CA_NO_ADJ_OP_END; | |
6429 do_pending_operator(&ca, 0, TRUE); | |
6430 y_previous = old_y_previous; | |
6431 y_current = old_y_current; | |
6432 curwin->w_cursor = old_cursor; | |
688 | 6433 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
7 | 6434 curwin->w_curswant = old_curswant; |
6435 curwin->w_set_curswant = old_set_curswant; | |
6436 curbuf->b_op_start = old_op_start; | |
6437 curbuf->b_op_end = old_op_end; | |
6438 VIsual = old_visual; | |
6439 VIsual_mode = old_visual_mode; | |
6440 } | |
6441 else | |
6442 { | |
6443 clip_free_selection(cbd); | |
6444 | |
6445 /* Try to get selected text from another window */ | |
6446 clip_gen_request_selection(cbd); | |
6447 } | |
6448 } | |
6449 | |
2896 | 6450 /* |
6451 * Convert from the GUI selection string into the '*'/'+' register. | |
6452 */ | |
7 | 6453 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6454 clip_yank_selection( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6455 int type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6456 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6457 long len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6458 VimClipboard *cbd) |
7 | 6459 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6460 yankreg_T *y_ptr; |
7 | 6461 |
6462 if (cbd == &clip_plus) | |
6463 y_ptr = &y_regs[PLUS_REGISTER]; | |
6464 else | |
6465 y_ptr = &y_regs[STAR_REGISTER]; | |
6466 | |
6467 clip_free_selection(cbd); | |
6468 | |
5798 | 6469 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
7 | 6470 } |
6471 | |
6472 /* | |
6473 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
6474 * with length *len. | |
6475 * Returns the motion type, or -1 for failure. | |
6476 */ | |
6477 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6478 clip_convert_selection(char_u **str, long_u *len, VimClipboard *cbd) |
7 | 6479 { |
6480 char_u *p; | |
6481 int lnum; | |
6482 int i, j; | |
6483 int_u eolsize; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6484 yankreg_T *y_ptr; |
7 | 6485 |
6486 if (cbd == &clip_plus) | |
6487 y_ptr = &y_regs[PLUS_REGISTER]; | |
6488 else | |
6489 y_ptr = &y_regs[STAR_REGISTER]; | |
6490 | |
6491 #ifdef USE_CRNL | |
6492 eolsize = 2; | |
6493 #else | |
6494 eolsize = 1; | |
6495 #endif | |
6496 | |
6497 *str = NULL; | |
6498 *len = 0; | |
6499 if (y_ptr->y_array == NULL) | |
6500 return -1; | |
6501 | |
6502 for (i = 0; i < y_ptr->y_size; i++) | |
6503 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
6504 | |
6505 /* | |
6506 * Don't want newline character at end of last line if we're in MCHAR mode. | |
6507 */ | |
6508 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
6509 *len -= eolsize; | |
6510 | |
6511 p = *str = lalloc(*len + 1, TRUE); /* add one to avoid zero */ | |
6512 if (p == NULL) | |
6513 return -1; | |
6514 lnum = 0; | |
6515 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
6516 { | |
6517 if (y_ptr->y_array[lnum][j] == '\n') | |
6518 p[i] = NUL; | |
6519 else if (y_ptr->y_array[lnum][j] == NUL) | |
6520 { | |
6521 #ifdef USE_CRNL | |
6522 p[i++] = '\r'; | |
6523 #endif | |
6524 #ifdef USE_CR | |
6525 p[i] = '\r'; | |
6526 #else | |
6527 p[i] = '\n'; | |
6528 #endif | |
6529 lnum++; | |
6530 j = -1; | |
6531 } | |
6532 else | |
6533 p[i] = y_ptr->y_array[lnum][j]; | |
6534 } | |
6535 return y_ptr->y_type; | |
6536 } | |
6537 | |
6538 | |
6539 /* | |
6540 * If we have written to a clipboard register, send the text to the clipboard. | |
6541 */ | |
6542 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6543 may_set_selection(void) |
7 | 6544 { |
6545 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
6546 { | |
6547 clip_own_selection(&clip_star); | |
6548 clip_gen_set_selection(&clip_star); | |
6549 } | |
6550 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
6551 { | |
6552 clip_own_selection(&clip_plus); | |
6553 clip_gen_set_selection(&clip_plus); | |
6554 } | |
6555 } | |
6556 | |
6557 #endif /* FEAT_CLIPBOARD || PROTO */ | |
6558 | |
6559 | |
6560 #if defined(FEAT_DND) || defined(PROTO) | |
6561 /* | |
6562 * Replace the contents of the '~' register with str. | |
6563 */ | |
6564 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6565 dnd_yank_drag_data(char_u *str, long len) |
7 | 6566 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6567 yankreg_T *curr; |
7 | 6568 |
6569 curr = y_current; | |
6570 y_current = &y_regs[TILDE_REGISTER]; | |
6571 free_yank_all(); | |
5798 | 6572 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
7 | 6573 y_current = curr; |
6574 } | |
6575 #endif | |
6576 | |
6577 | |
6578 #if defined(FEAT_EVAL) || defined(PROTO) | |
6579 /* | |
6580 * Return the type of a register. | |
6581 * Used for getregtype() | |
6582 * Returns MAUTO for error. | |
6583 */ | |
6584 char_u | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6585 get_reg_type(int regname, long *reglen) |
7 | 6586 { |
6587 switch (regname) | |
6588 { | |
6589 case '%': /* file name */ | |
6590 case '#': /* alternate file name */ | |
6591 case '=': /* expression */ | |
6592 case ':': /* last command line */ | |
6593 case '/': /* last search-pattern */ | |
6594 case '.': /* last inserted text */ | |
6595 #ifdef FEAT_SEARCHPATH | |
6596 case Ctrl_F: /* Filename under cursor */ | |
6597 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
6598 #endif | |
6599 case Ctrl_W: /* word under cursor */ | |
6600 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
6601 case '_': /* black hole: always empty */ | |
6602 return MCHAR; | |
6603 } | |
6604 | |
6605 #ifdef FEAT_CLIPBOARD | |
6606 regname = may_get_selection(regname); | |
6607 #endif | |
6608 | |
5596 | 6609 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
|
6610 return MAUTO; |
5596 | 6611 |
7 | 6612 get_yank_register(regname, FALSE); |
6613 | |
6614 if (y_current->y_array != NULL) | |
6615 { | |
6616 if (reglen != NULL && y_current->y_type == MBLOCK) | |
6617 *reglen = y_current->y_width; | |
6618 return y_current->y_type; | |
6619 } | |
6620 return MAUTO; | |
6621 } | |
6622 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
6623 static char_u *getreg_wrap_one_line(char_u *s, int flags); |
5796 | 6624 |
6625 /* | |
6626 * When "flags" has GREG_LIST return a list with text "s". | |
6627 * Otherwise just return "s". | |
6628 */ | |
6629 static char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6630 getreg_wrap_one_line(char_u *s, int flags) |
5796 | 6631 { |
6632 if (flags & GREG_LIST) | |
6633 { | |
6634 list_T *list = list_alloc(); | |
6635 | |
6636 if (list != NULL) | |
6637 { | |
6638 if (list_append_string(list, NULL, -1) == FAIL) | |
6639 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6640 list_free(list); |
5796 | 6641 return NULL; |
6642 } | |
6643 list->lv_first->li_tv.vval.v_string = s; | |
6644 } | |
6645 return (char_u *)list; | |
6646 } | |
6647 return s; | |
6648 } | |
6649 | |
7 | 6650 /* |
6651 * Return the contents of a register as a single allocated string. | |
6652 * Used for "@r" in expressions and for getreg(). | |
6653 * Returns NULL for error. | |
5796 | 6654 * Flags: |
6655 * GREG_NO_EXPR Do not allow expression register | |
6656 * GREG_EXPR_SRC For the expression register: return expression itself, | |
6657 * not the result of its evaluation. | |
6658 * GREG_LIST Return a list of lines in place of a single string. | |
7 | 6659 */ |
6660 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6661 get_reg_contents(int regname, int flags) |
7 | 6662 { |
6663 long i; | |
6664 char_u *retval; | |
6665 int allocated; | |
6666 long len; | |
6667 | |
6668 /* Don't allow using an expression register inside an expression */ | |
6669 if (regname == '=') | |
6670 { | |
5796 | 6671 if (flags & GREG_NO_EXPR) |
6672 return NULL; | |
6673 if (flags & GREG_EXPR_SRC) | |
6674 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
6675 return getreg_wrap_one_line(get_expr_line(), flags); | |
7 | 6676 } |
6677 | |
6678 if (regname == '@') /* "@@" is used for unnamed register */ | |
6679 regname = '"'; | |
6680 | |
6681 /* check for valid regname */ | |
6682 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
6683 return NULL; | |
6684 | |
6685 #ifdef FEAT_CLIPBOARD | |
6686 regname = may_get_selection(regname); | |
6687 #endif | |
6688 | |
6689 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
6690 { | |
6691 if (retval == NULL) | |
6692 return NULL; | |
5796 | 6693 if (allocated) |
6694 return getreg_wrap_one_line(retval, flags); | |
6695 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
7 | 6696 } |
6697 | |
6698 get_yank_register(regname, FALSE); | |
6699 if (y_current->y_array == NULL) | |
6700 return NULL; | |
6701 | |
5796 | 6702 if (flags & GREG_LIST) |
6703 { | |
6704 list_T *list = list_alloc(); | |
6705 int error = FALSE; | |
6706 | |
6707 if (list == NULL) | |
6708 return NULL; | |
6709 for (i = 0; i < y_current->y_size; ++i) | |
6710 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
6711 error = TRUE; | |
6712 if (error) | |
6713 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6714 list_free(list); |
5796 | 6715 return NULL; |
6716 } | |
6717 return (char_u *)list; | |
6718 } | |
6719 | |
7 | 6720 /* |
6721 * Compute length of resulting string. | |
6722 */ | |
6723 len = 0; | |
6724 for (i = 0; i < y_current->y_size; ++i) | |
6725 { | |
6726 len += (long)STRLEN(y_current->y_array[i]); | |
6727 /* | |
6728 * Insert a newline between lines and after last line if | |
6729 * y_type is MLINE. | |
6730 */ | |
6731 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6732 ++len; | |
6733 } | |
6734 | |
6735 retval = lalloc(len + 1, TRUE); | |
6736 | |
6737 /* | |
6738 * Copy the lines of the yank register into the string. | |
6739 */ | |
6740 if (retval != NULL) | |
6741 { | |
6742 len = 0; | |
6743 for (i = 0; i < y_current->y_size; ++i) | |
6744 { | |
6745 STRCPY(retval + len, y_current->y_array[i]); | |
6746 len += (long)STRLEN(retval + len); | |
6747 | |
6748 /* | |
6749 * Insert a NL between lines and after the last line if y_type is | |
6750 * MLINE. | |
6751 */ | |
6752 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6753 retval[len++] = '\n'; | |
6754 } | |
6755 retval[len] = NUL; | |
6756 } | |
6757 | |
6758 return retval; | |
6759 } | |
6760 | |
5798 | 6761 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6762 init_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6763 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6764 yankreg_T **old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6765 yankreg_T **old_y_current, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6766 int must_append, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6767 int *yank_type UNUSED) |
5798 | 6768 { |
6769 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
6770 { | |
6771 emsg_invreg(name); | |
6772 return FAIL; | |
6773 } | |
6774 | |
6775 /* Don't want to change the current (unnamed) register */ | |
6776 *old_y_previous = y_previous; | |
6777 *old_y_current = y_current; | |
6778 | |
6779 get_yank_register(name, TRUE); | |
6780 if (!y_append && !must_append) | |
6781 free_yank_all(); | |
6782 return OK; | |
6783 } | |
6784 | |
6785 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6786 finish_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6787 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6788 yankreg_T *old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6789 yankreg_T *old_y_current) |
5798 | 6790 { |
6791 # ifdef FEAT_CLIPBOARD | |
6792 /* Send text of clipboard register to the clipboard. */ | |
6793 may_set_selection(); | |
6794 # endif | |
6795 | |
6796 /* ':let @" = "val"' should change the meaning of the "" register */ | |
6797 if (name != '"') | |
6798 y_previous = old_y_previous; | |
6799 y_current = old_y_current; | |
6800 } | |
6801 | |
7 | 6802 /* |
6803 * Store string "str" in register "name". | |
6804 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
6805 * If "must_append" is TRUE, always append to the register. Otherwise append | |
6806 * if "name" is an uppercase letter. | |
6807 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
6808 * Careful: 'str' is modified, you may have to use a copy! | |
6809 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
6810 */ | |
6811 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6812 write_reg_contents( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6813 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6814 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6815 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6816 int must_append) |
7 | 6817 { |
6818 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
6819 } | |
6820 | |
6821 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6822 write_reg_contents_lst( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6823 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6824 char_u **strings, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6825 int maxlen UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6826 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6827 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6828 long block_len) |
5798 | 6829 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6830 yankreg_T *old_y_previous, *old_y_current; |
5798 | 6831 |
6832 if (name == '/' | |
6833 #ifdef FEAT_EVAL | |
6834 || name == '=' | |
6835 #endif | |
6836 ) | |
6837 { | |
6838 char_u *s; | |
6839 | |
6840 if (strings[0] == NULL) | |
6841 s = (char_u *)""; | |
6842 else if (strings[1] != NULL) | |
6843 { | |
6844 EMSG(_("E883: search pattern and expression register may not " | |
6845 "contain two or more lines")); | |
6846 return; | |
6847 } | |
6848 else | |
6849 s = strings[0]; | |
6850 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
6851 return; | |
6852 } | |
6853 | |
6854 if (name == '_') /* black hole: nothing to do */ | |
6855 return; | |
6856 | |
6857 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
6858 &yank_type) == FAIL) | |
6859 return; | |
6860 | |
6861 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
6862 | |
6863 finish_write_reg(name, old_y_previous, old_y_current); | |
6864 } | |
6865 | |
6866 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6867 write_reg_contents_ex( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6868 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6869 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6870 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6871 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6872 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6873 long block_len) |
7 | 6874 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6875 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
|
6876 long len; |
7 | 6877 |
336 | 6878 if (maxlen >= 0) |
6879 len = maxlen; | |
6880 else | |
6881 len = (long)STRLEN(str); | |
6882 | |
7 | 6883 /* Special case: '/' search pattern */ |
6884 if (name == '/') | |
6885 { | |
6886 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
6887 return; | |
6888 } | |
6889 | |
6557 | 6890 if (name == '#') |
6891 { | |
6892 buf_T *buf; | |
6893 | |
6894 if (VIM_ISDIGIT(*str)) | |
6895 { | |
6896 int num = atoi((char *)str); | |
6897 | |
6898 buf = buflist_findnr(num); | |
6899 if (buf == NULL) | |
6900 EMSGN(_(e_nobufnr), (long)num); | |
6901 } | |
6902 else | |
6903 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
6904 TRUE, FALSE, FALSE)); | |
6905 if (buf == NULL) | |
6906 return; | |
6907 curwin->w_alt_fnum = buf->b_fnum; | |
6908 return; | |
6909 } | |
6910 | |
336 | 6911 #ifdef FEAT_EVAL |
6912 if (name == '=') | |
6913 { | |
6914 char_u *p, *s; | |
6915 | |
6916 p = vim_strnsave(str, (int)len); | |
6917 if (p == NULL) | |
6918 return; | |
6919 if (must_append) | |
6920 { | |
6921 s = concat_str(get_expr_line_src(), p); | |
6922 vim_free(p); | |
6923 p = s; | |
6924 } | |
6925 set_expr_line(p); | |
6926 return; | |
6927 } | |
6928 #endif | |
6929 | |
7 | 6930 if (name == '_') /* black hole: nothing to do */ |
6931 return; | |
6932 | |
5798 | 6933 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
6934 &yank_type) == FAIL) | |
6935 return; | |
6936 | |
6937 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
6938 | |
6939 finish_write_reg(name, old_y_previous, old_y_current); | |
7 | 6940 } |
6941 #endif /* FEAT_EVAL */ | |
6942 | |
6943 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
6944 /* | |
6945 * Put a string into a register. When the register is not empty, the string | |
6946 * is appended. | |
6947 */ | |
6948 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6949 str_to_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6950 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
|
6951 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
|
6952 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
|
6953 long len, /* length of string */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6954 long blocklen, /* width of Visual block */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6955 int str_list) /* TRUE if str is char_u ** */ |
7 | 6956 { |
2896 | 6957 int type; /* MCHAR, MLINE or MBLOCK */ |
7 | 6958 int lnum; |
6959 long start; | |
6960 long i; | |
6961 int extra; | |
6962 int newlines; /* number of lines added */ | |
6963 int extraline = 0; /* extra line at the end */ | |
6964 int append = FALSE; /* append to last line in register */ | |
6965 char_u *s; | |
5798 | 6966 char_u **ss; |
7 | 6967 char_u **pp; |
6968 long maxlen; | |
6969 | |
2000 | 6970 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
7 | 6971 y_ptr->y_size = 0; |
6972 | |
2896 | 6973 if (yank_type == MAUTO) |
5798 | 6974 type = ((str_list || (len > 0 && (str[len - 1] == NL |
6975 || str[len - 1] == CAR))) | |
2896 | 6976 ? MLINE : MCHAR); |
6977 else | |
6978 type = yank_type; | |
6979 | |
7 | 6980 /* |
6981 * Count the number of lines within the string | |
6982 */ | |
6983 newlines = 0; | |
5798 | 6984 if (str_list) |
6985 { | |
6986 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
7 | 6987 ++newlines; |
5798 | 6988 } |
6989 else | |
6990 { | |
6991 for (i = 0; i < len; i++) | |
6992 if (str[i] == '\n') | |
6993 ++newlines; | |
6994 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
6995 { | |
6996 extraline = 1; | |
6997 ++newlines; /* count extra newline at the end */ | |
6998 } | |
6999 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
7000 { | |
7001 append = TRUE; | |
7002 --newlines; /* uncount newline when appending first line */ | |
7003 } | |
7 | 7004 } |
7005 | |
6807 | 7006 /* Without any lines make the register empty. */ |
7007 if (y_ptr->y_size + newlines == 0) | |
7008 { | |
7009 vim_free(y_ptr->y_array); | |
7010 y_ptr->y_array = NULL; | |
7011 return; | |
7012 } | |
7013 | |
7 | 7014 /* |
7015 * Allocate an array to hold the pointers to the new register lines. | |
7016 * If the register was not empty, move the existing lines to the new array. | |
7017 */ | |
7018 pp = (char_u **)lalloc_clear((y_ptr->y_size + newlines) | |
7019 * sizeof(char_u *), TRUE); | |
7020 if (pp == NULL) /* out of memory */ | |
7021 return; | |
7022 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
7023 pp[lnum] = y_ptr->y_array[lnum]; | |
7024 vim_free(y_ptr->y_array); | |
7025 y_ptr->y_array = pp; | |
7026 maxlen = 0; | |
7027 | |
7028 /* | |
7029 * Find the end of each line and save it into the array. | |
7030 */ | |
5798 | 7031 if (str_list) |
7032 { | |
7033 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
7 | 7034 { |
5856 | 7035 i = (long)STRLEN(*ss); |
5798 | 7036 pp[lnum] = vim_strnsave(*ss, i); |
7037 if (i > maxlen) | |
7038 maxlen = i; | |
7 | 7039 } |
5798 | 7040 } |
7041 else | |
7042 { | |
7043 for (start = 0; start < len + extraline; start += i + 1) | |
7 | 7044 { |
5798 | 7045 for (i = start; i < len; ++i) /* find the end of the line */ |
7046 if (str[i] == '\n') | |
7047 break; | |
7048 i -= start; /* i is now length of line */ | |
7049 if (i > maxlen) | |
7050 maxlen = i; | |
7051 if (append) | |
7052 { | |
7053 --lnum; | |
7054 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
7055 } | |
7056 else | |
7057 extra = 0; | |
7058 s = alloc((unsigned)(i + extra + 1)); | |
7059 if (s == NULL) | |
7060 break; | |
7061 if (extra) | |
7062 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
7063 if (append) | |
7064 vim_free(y_ptr->y_array[lnum]); | |
7065 if (i) | |
7066 mch_memmove(s + extra, str + start, (size_t)i); | |
7067 extra += i; | |
7068 s[extra] = NUL; | |
7069 y_ptr->y_array[lnum++] = s; | |
7070 while (--extra >= 0) | |
7071 { | |
7072 if (*s == NUL) | |
7073 *s = '\n'; /* replace NUL with newline */ | |
7074 ++s; | |
7075 } | |
7076 append = FALSE; /* only first line is appended */ | |
7 | 7077 } |
7078 } | |
7079 y_ptr->y_type = type; | |
7080 y_ptr->y_size = lnum; | |
7081 if (type == MBLOCK) | |
7082 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
7083 else | |
7084 y_ptr->y_width = 0; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7085 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7086 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
|
7087 #endif |
7 | 7088 } |
7089 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
7090 | |
7091 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7092 clear_oparg(oparg_T *oap) |
7 | 7093 { |
7094 vim_memset(oap, 0, sizeof(oparg_T)); | |
7095 } | |
7096 | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7097 static varnumber_T line_count_info(char_u *line, varnumber_T *wc, varnumber_T *cc, varnumber_T limit, int eol_size); |
7 | 7098 |
7099 /* | |
161 | 7100 * Count the number of bytes, characters and "words" in a line. |
7 | 7101 * |
7102 * "Words" are counted by looking for boundaries between non-space and | |
7103 * space characters. (it seems to produce results that match 'wc'.) | |
7104 * | |
161 | 7105 * Return value is byte count; word count for the line is added to "*wc". |
7106 * Char count is added to "*cc". | |
7 | 7107 * |
7108 * The function will only examine the first "limit" characters in the | |
7109 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
7110 * case, eol_size will be added to the character count to account for | |
7111 * the size of the EOL character. | |
7112 */ | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7113 static varnumber_T |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7114 line_count_info( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7115 char_u *line, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7116 varnumber_T *wc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7117 varnumber_T *cc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7118 varnumber_T limit, |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7119 int eol_size) |
7 | 7120 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7121 varnumber_T i; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7122 varnumber_T words = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7123 varnumber_T chars = 0; |
7 | 7124 int is_word = 0; |
7125 | |
3626 | 7126 for (i = 0; i < limit && line[i] != NUL; ) |
7 | 7127 { |
7128 if (is_word) | |
7129 { | |
7130 if (vim_isspace(line[i])) | |
7131 { | |
7132 words++; | |
7133 is_word = 0; | |
7134 } | |
7135 } | |
7136 else if (!vim_isspace(line[i])) | |
7137 is_word = 1; | |
161 | 7138 ++chars; |
7139 #ifdef FEAT_MBYTE | |
474 | 7140 i += (*mb_ptr2len)(line + i); |
161 | 7141 #else |
7142 ++i; | |
7143 #endif | |
7 | 7144 } |
7145 | |
7146 if (is_word) | |
7147 words++; | |
7148 *wc += words; | |
7149 | |
7150 /* Add eol_size if the end of line was reached before hitting limit. */ | |
2996 | 7151 if (i < limit && line[i] == NUL) |
161 | 7152 { |
7 | 7153 i += eol_size; |
161 | 7154 chars += eol_size; |
7155 } | |
7156 *cc += chars; | |
7 | 7157 return i; |
7158 } | |
7159 | |
7160 /* | |
7161 * Give some info about the position of the cursor (for "g CTRL-G"). | |
7162 * In Visual mode, give some info about the selected region. (In this case, | |
7163 * 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
|
7164 * When "dict" is not NULL store the info there instead of showing it. |
7 | 7165 */ |
7166 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7167 cursor_pos_info(dict_T *dict) |
7 | 7168 { |
7169 char_u *p; | |
274 | 7170 char_u buf1[50]; |
7171 char_u buf2[40]; | |
7 | 7172 linenr_T lnum; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7173 varnumber_T byte_count = 0; |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7174 #ifdef FEAT_MBYTE |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7175 varnumber_T bom_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7176 #endif |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7177 varnumber_T byte_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7178 varnumber_T char_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7179 varnumber_T char_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7180 varnumber_T word_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7181 varnumber_T word_count_cursor = 0; |
7 | 7182 int eol_size; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7183 varnumber_T last_check = 100000L; |
7 | 7184 long line_count_selected = 0; |
7185 pos_T min_pos, max_pos; | |
7186 oparg_T oparg; | |
7187 struct block_def bd; | |
7188 | |
7189 /* | |
7190 * Compute the length of the file in characters. | |
7191 */ | |
7192 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
7193 { | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7194 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7195 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7196 MSG(_(no_lines_msg)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7197 return; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7198 } |
7 | 7199 } |
7200 else | |
7201 { | |
7202 if (get_fileformat(curbuf) == EOL_DOS) | |
7203 eol_size = 2; | |
7204 else | |
7205 eol_size = 1; | |
7206 | |
7207 if (VIsual_active) | |
7208 { | |
7209 if (lt(VIsual, curwin->w_cursor)) | |
7210 { | |
7211 min_pos = VIsual; | |
7212 max_pos = curwin->w_cursor; | |
7213 } | |
7214 else | |
7215 { | |
7216 min_pos = curwin->w_cursor; | |
7217 max_pos = VIsual; | |
7218 } | |
7219 if (*p_sel == 'e' && max_pos.col > 0) | |
7220 --max_pos.col; | |
7221 | |
7222 if (VIsual_mode == Ctrl_V) | |
7223 { | |
1866 | 7224 #ifdef FEAT_LINEBREAK |
7225 char_u * saved_sbr = p_sbr; | |
7226 | |
7227 /* Make 'sbr' empty for a moment to get the correct size. */ | |
7228 p_sbr = empty_option; | |
7229 #endif | |
7 | 7230 oparg.is_VIsual = 1; |
7231 oparg.block_mode = TRUE; | |
7232 oparg.op_type = OP_NOP; | |
7233 getvcols(curwin, &min_pos, &max_pos, | |
688 | 7234 &oparg.start_vcol, &oparg.end_vcol); |
1866 | 7235 #ifdef FEAT_LINEBREAK |
7236 p_sbr = saved_sbr; | |
7237 #endif | |
688 | 7238 if (curwin->w_curswant == MAXCOL) |
7239 oparg.end_vcol = MAXCOL; | |
7 | 7240 /* Swap the start, end vcol if needed */ |
7241 if (oparg.end_vcol < oparg.start_vcol) | |
7242 { | |
7243 oparg.end_vcol += oparg.start_vcol; | |
7244 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
7245 oparg.end_vcol -= oparg.start_vcol; | |
7246 } | |
7247 } | |
7248 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
7249 } | |
7250 | |
7251 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
7252 { | |
7253 /* Check for a CTRL-C every 100000 characters. */ | |
161 | 7254 if (byte_count > last_check) |
7 | 7255 { |
7256 ui_breakcheck(); | |
7257 if (got_int) | |
7258 return; | |
161 | 7259 last_check = byte_count + 100000L; |
7 | 7260 } |
7261 | |
7262 /* Do extra processing for VIsual mode. */ | |
7263 if (VIsual_active | |
7264 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
7265 { | |
45 | 7266 char_u *s = NULL; |
7267 long len = 0L; | |
7268 | |
7 | 7269 switch (VIsual_mode) |
7270 { | |
7271 case Ctrl_V: | |
5735 | 7272 #ifdef FEAT_VIRTUALEDIT |
7 | 7273 virtual_op = virtual_active(); |
5735 | 7274 #endif |
7 | 7275 block_prep(&oparg, &bd, lnum, 0); |
5735 | 7276 #ifdef FEAT_VIRTUALEDIT |
7 | 7277 virtual_op = MAYBE; |
5735 | 7278 #endif |
45 | 7279 s = bd.textstart; |
7280 len = (long)bd.textlen; | |
7 | 7281 break; |
7282 case 'V': | |
45 | 7283 s = ml_get(lnum); |
7284 len = MAXCOL; | |
7 | 7285 break; |
7286 case 'v': | |
7287 { | |
7288 colnr_T start_col = (lnum == min_pos.lnum) | |
7289 ? min_pos.col : 0; | |
7290 colnr_T end_col = (lnum == max_pos.lnum) | |
7291 ? max_pos.col - start_col + 1 : MAXCOL; | |
7292 | |
45 | 7293 s = ml_get(lnum) + start_col; |
7294 len = end_col; | |
7 | 7295 } |
7296 break; | |
7297 } | |
45 | 7298 if (s != NULL) |
7299 { | |
161 | 7300 byte_count_cursor += line_count_info(s, &word_count_cursor, |
7301 &char_count_cursor, len, eol_size); | |
45 | 7302 if (lnum == curbuf->b_ml.ml_line_count |
7303 && !curbuf->b_p_eol | |
6933 | 7304 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
50 | 7305 && (long)STRLEN(s) < len) |
161 | 7306 byte_count_cursor -= eol_size; |
45 | 7307 } |
7 | 7308 } |
7309 else | |
7310 { | |
7311 /* In non-visual mode, check for the line the cursor is on */ | |
7312 if (lnum == curwin->w_cursor.lnum) | |
7313 { | |
7314 word_count_cursor += word_count; | |
161 | 7315 char_count_cursor += char_count; |
7316 byte_count_cursor = byte_count + | |
7317 line_count_info(ml_get(lnum), | |
7318 &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
|
7319 (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
|
7320 eol_size); |
7 | 7321 } |
7322 } | |
7323 /* Add to the running totals */ | |
161 | 7324 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
|
7325 &char_count, (varnumber_T)MAXCOL, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7326 eol_size); |
7 | 7327 } |
7328 | |
7329 /* Correction for when last line doesn't have an EOL. */ | |
6933 | 7330 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
161 | 7331 byte_count -= eol_size; |
7 | 7332 |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7333 if (dict == NULL) |
7 | 7334 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7335 if (VIsual_active) |
7 | 7336 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7337 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
|
7338 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7339 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
|
7340 &max_pos.col); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7341 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
|
7342 (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
|
7343 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7344 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7345 buf1[0] = NUL; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7346 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7347 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
|
7348 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7349 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7350 _("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
|
7351 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7352 (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
|
7353 word_count_cursor, word_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7354 byte_count_cursor, byte_count); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7355 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7356 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7357 _("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
|
7358 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7359 (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
|
7360 word_count_cursor, word_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7361 char_count_cursor, char_count, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7362 byte_count_cursor, byte_count); |
7 | 7363 } |
7364 else | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7365 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7366 p = ml_get_curline(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7367 validate_virtcol(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7368 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
|
7369 (int)curwin->w_virtcol + 1); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7370 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
|
7371 linetabsize(p)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7372 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7373 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
|
7374 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7375 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7376 _("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
|
7377 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7378 (long)curwin->w_cursor.lnum, |
7 | 7379 (long)curbuf->b_ml.ml_line_count, |
7380 word_count_cursor, word_count, | |
161 | 7381 byte_count_cursor, byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7382 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7383 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7384 _("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
|
7385 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7386 (long)curwin->w_cursor.lnum, |
161 | 7387 (long)curbuf->b_ml.ml_line_count, |
7388 word_count_cursor, word_count, | |
7389 char_count_cursor, char_count, | |
7390 byte_count_cursor, byte_count); | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7391 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7392 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7393 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7394 #ifdef FEAT_MBYTE |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7395 bom_count = bomb_size(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7396 if (bom_count > 0) |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7397 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
|
7398 _("(+%ld for BOM)"), bom_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7399 #endif |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7400 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7401 { |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7402 /* 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
|
7403 p = p_shm; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7404 p_shm = (char_u *)""; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7405 msg(IObuff); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7406 p_shm = p; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7407 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7408 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7409 #if defined(FEAT_EVAL) |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7410 if (dict != NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7411 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7412 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
|
7413 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
|
7414 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
|
7415 # ifdef FEAT_MBYTE |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7416 + bom_count |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7417 # endif |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7418 , NULL); |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7419 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
|
7420 byte_count_cursor, NULL); |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7421 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
|
7422 char_count_cursor, NULL); |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7423 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
|
7424 word_count_cursor, NULL); |
7 | 7425 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7426 #endif |
7 | 7427 } |