Mercurial > vim
annotate src/ops.c @ 13923:e4d5726e1678 v8.0.1832
patch 8.0.1832: cannot use :unlet for an environment variable
commit https://github.com/vim/vim/commit/137374fd6538cf9dee0cb22907728d8fdecb5832
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun May 13 15:59:50 2018 +0200
patch 8.0.1832: cannot use :unlet for an environment variable
Problem: Cannot use :unlet for an environment variable.
Solution: Make it work. Use unsetenv() if available. (Ken Takata,
closes #2855)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 13 May 2018 16:00:07 +0200 |
parents | 1f95ec5de238 |
children | e124262d435e |
rev | line source |
---|---|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9834
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
7 | 2 * |
3 * VIM - Vi IMproved by Bram Moolenaar | |
4 * | |
5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
6 * Do ":help credits" in Vim to see a list of people who contributed. | |
7 * See README.txt for an overview of the Vim source code. | |
8 */ | |
9 | |
10 /* | |
11 * ops.c: implementation of various operators: op_shift, op_delete, op_tilde, | |
12 * op_change, op_yank, do_put, do_join | |
13 */ | |
14 | |
15 #include "vim.h" | |
16 | |
17 /* | |
18 * Number of registers. | |
19 * 0 = unnamed register, for normal yanks and puts | |
20 * 1..9 = registers '1' to '9', for deletes | |
21 * 10..35 = registers 'a' to 'z' | |
22 * 36 = delete register '-' | |
23 * 37 = Selection register '*'. Only if FEAT_CLIPBOARD defined | |
24 * 38 = Clipboard register '+'. Only if FEAT_CLIPBOARD and FEAT_X11 defined | |
25 */ | |
26 /* | |
27 * Symbolic names for some registers. | |
28 */ | |
29 #define DELETION_REGISTER 36 | |
30 #ifdef FEAT_CLIPBOARD | |
31 # define STAR_REGISTER 37 | |
32 # ifdef FEAT_X11 | |
33 # define PLUS_REGISTER 38 | |
34 # else | |
35 # define PLUS_REGISTER STAR_REGISTER /* there is only one */ | |
36 # endif | |
37 #endif | |
38 #ifdef FEAT_DND | |
39 # define TILDE_REGISTER (PLUS_REGISTER + 1) | |
40 #endif | |
41 | |
42 #ifdef FEAT_CLIPBOARD | |
43 # ifdef FEAT_DND | |
44 # define NUM_REGISTERS (TILDE_REGISTER + 1) | |
45 # else | |
46 # define NUM_REGISTERS (PLUS_REGISTER + 1) | |
47 # endif | |
48 #else | |
49 # define NUM_REGISTERS 37 | |
50 #endif | |
51 | |
52 /* | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
53 * Each yank register has an array of pointers to lines. |
7 | 54 */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
55 typedef struct |
7 | 56 { |
57 char_u **y_array; /* pointer to array of line pointers */ | |
58 linenr_T y_size; /* number of lines in y_array */ | |
59 char_u y_type; /* MLINE, MCHAR or MBLOCK */ | |
60 colnr_T y_width; /* only set if y_type == MBLOCK */ | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
61 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
62 time_t y_time_set; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
63 #endif |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
64 } yankreg_T; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
65 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
66 static yankreg_T y_regs[NUM_REGISTERS]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
67 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
68 static yankreg_T *y_current; /* ptr to current yankreg */ |
7 | 69 static int y_append; /* TRUE when appending */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
70 static yankreg_T *y_previous = NULL; /* ptr to last written yankreg */ |
7 | 71 |
72 /* | |
73 * structure used by block_prep, op_delete and op_yank for blockwise operators | |
74 * also op_change, op_shift, op_insert, op_replace - AKelly | |
75 */ | |
76 struct block_def | |
77 { | |
1839 | 78 int startspaces; /* 'extra' cols before first char */ |
79 int endspaces; /* 'extra' cols after last char */ | |
7 | 80 int textlen; /* chars in block */ |
1839 | 81 char_u *textstart; /* pointer to 1st char (partially) in block */ |
82 colnr_T textcol; /* index of chars (partially) in block */ | |
7 | 83 colnr_T start_vcol; /* start col of 1st char wholly inside block */ |
84 colnr_T end_vcol; /* start col of 1st char wholly after block */ | |
85 #ifdef FEAT_VISUALEXTRA | |
86 int is_short; /* TRUE if line is too short to fit in block */ | |
87 int is_MAX; /* TRUE if curswant==MAXCOL when starting */ | |
88 int is_oneChar; /* TRUE if block within one character */ | |
89 int pre_whitesp; /* screen cols of ws before block */ | |
90 int pre_whitesp_c; /* chars of ws before block */ | |
91 colnr_T end_char_vcols; /* number of vcols of post-block char */ | |
92 #endif | |
93 colnr_T start_char_vcols; /* number of vcols of pre-block char */ | |
94 }; | |
95 | |
96 #ifdef FEAT_VISUALEXTRA | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
97 static void shift_block(oparg_T *oap, int amount); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
98 static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def*bdp); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
99 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
100 static int stuff_yank(int, char_u *); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
101 static void put_reedit_in_typebuf(int silent); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
102 static int put_in_typebuf(char_u *s, int esc, int colon, |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
103 int silent); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
104 static void stuffescaped(char_u *arg, int literally); |
7 | 105 #ifdef FEAT_MBYTE |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
106 static void mb_adjust_opend(oparg_T *oap); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
107 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
108 static void free_yank(long); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
109 static void free_yank_all(void); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
110 static int yank_copy_line(struct block_def *bd, long y_idx); |
7 | 111 #ifdef FEAT_CLIPBOARD |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
112 static void copy_yank_reg(yankreg_T *reg); |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
113 static void may_set_selection(void); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
114 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
115 static void dis_msg(char_u *p, int skip_esc); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
116 static void block_prep(oparg_T *oap, struct block_def *, linenr_T, int); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
117 static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1); |
7 | 118 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
119 static void str_to_reg(yankreg_T *y_ptr, int yank_type, char_u *str, long len, long blocklen, int str_list); |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
120 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
121 static int ends_in_white(linenr_T lnum); |
7 | 122 #ifdef FEAT_COMMENTS |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
123 static int same_leader(linenr_T lnum, int, char_u *, int, char_u *); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
124 static int fmt_check_par(linenr_T, int *, char_u **, int do_comments); |
7 | 125 #else |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
126 static int fmt_check_par(linenr_T); |
7 | 127 #endif |
128 | |
129 /* | |
130 * The names of operators. | |
131 * IMPORTANT: Index must correspond with defines in vim.h!!! | |
132 * The third field indicates whether the operator always works on lines. | |
133 */ | |
134 static char opchars[][3] = | |
135 { | |
136 {NUL, NUL, FALSE}, /* OP_NOP */ | |
137 {'d', NUL, FALSE}, /* OP_DELETE */ | |
138 {'y', NUL, FALSE}, /* OP_YANK */ | |
139 {'c', NUL, FALSE}, /* OP_CHANGE */ | |
140 {'<', NUL, TRUE}, /* OP_LSHIFT */ | |
141 {'>', NUL, TRUE}, /* OP_RSHIFT */ | |
142 {'!', NUL, TRUE}, /* OP_FILTER */ | |
143 {'g', '~', FALSE}, /* OP_TILDE */ | |
144 {'=', NUL, TRUE}, /* OP_INDENT */ | |
145 {'g', 'q', TRUE}, /* OP_FORMAT */ | |
146 {':', NUL, TRUE}, /* OP_COLON */ | |
147 {'g', 'U', FALSE}, /* OP_UPPER */ | |
148 {'g', 'u', FALSE}, /* OP_LOWER */ | |
149 {'J', NUL, TRUE}, /* DO_JOIN */ | |
150 {'g', 'J', TRUE}, /* DO_JOIN_NS */ | |
151 {'g', '?', FALSE}, /* OP_ROT13 */ | |
152 {'r', NUL, FALSE}, /* OP_REPLACE */ | |
153 {'I', NUL, FALSE}, /* OP_INSERT */ | |
154 {'A', NUL, FALSE}, /* OP_APPEND */ | |
155 {'z', 'f', TRUE}, /* OP_FOLD */ | |
156 {'z', 'o', TRUE}, /* OP_FOLDOPEN */ | |
157 {'z', 'O', TRUE}, /* OP_FOLDOPENREC */ | |
158 {'z', 'c', TRUE}, /* OP_FOLDCLOSE */ | |
159 {'z', 'C', TRUE}, /* OP_FOLDCLOSEREC */ | |
160 {'z', 'd', TRUE}, /* OP_FOLDDEL */ | |
161 {'z', 'D', TRUE}, /* OP_FOLDDELREC */ | |
162 {'g', 'w', TRUE}, /* OP_FORMAT2 */ | |
603 | 163 {'g', '@', FALSE}, /* OP_FUNCTION */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
164 {Ctrl_A, NUL, FALSE}, /* OP_NR_ADD */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
165 {Ctrl_X, NUL, FALSE}, /* OP_NR_SUB */ |
7 | 166 }; |
167 | |
168 /* | |
169 * Translate a command name into an operator type. | |
170 * Must only be called with a valid operator name! | |
171 */ | |
172 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
173 get_op_type(int char1, int char2) |
7 | 174 { |
175 int i; | |
176 | |
177 if (char1 == 'r') /* ignore second character */ | |
178 return OP_REPLACE; | |
179 if (char1 == '~') /* when tilde is an operator */ | |
180 return OP_TILDE; | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
181 if (char1 == 'g' && char2 == Ctrl_A) /* add */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
182 return OP_NR_ADD; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
183 if (char1 == 'g' && char2 == Ctrl_X) /* subtract */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
184 return OP_NR_SUB; |
7 | 185 for (i = 0; ; ++i) |
13072
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
186 { |
7 | 187 if (opchars[i][0] == char1 && opchars[i][1] == char2) |
188 break; | |
13072
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
189 if (i == (int)(sizeof(opchars) / sizeof(char [3]) - 1)) |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
190 { |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
191 internal_error("get_op_type()"); |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
192 break; |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
193 } |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
194 } |
7 | 195 return i; |
196 } | |
197 | |
198 /* | |
199 * Return TRUE if operator "op" always works on whole lines. | |
200 */ | |
201 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
202 op_on_lines(int op) |
7 | 203 { |
204 return opchars[op][2]; | |
205 } | |
206 | |
207 /* | |
208 * Get first operator command character. | |
209 * Returns 'g' or 'z' if there is another command character. | |
210 */ | |
211 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
212 get_op_char(int optype) |
7 | 213 { |
214 return opchars[optype][0]; | |
215 } | |
216 | |
217 /* | |
218 * Get second operator command character. | |
219 */ | |
220 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
221 get_extra_op_char(int optype) |
7 | 222 { |
223 return opchars[optype][1]; | |
224 } | |
225 | |
226 /* | |
227 * op_shift - handle a shift operation | |
228 */ | |
229 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
230 op_shift(oparg_T *oap, int curs_top, int amount) |
7 | 231 { |
232 long i; | |
233 int first_char; | |
234 char_u *s; | |
235 int block_col = 0; | |
236 | |
237 if (u_save((linenr_T)(oap->start.lnum - 1), | |
238 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
239 return; | |
240 | |
241 if (oap->block_mode) | |
242 block_col = curwin->w_cursor.col; | |
243 | |
244 for (i = oap->line_count; --i >= 0; ) | |
245 { | |
246 first_char = *ml_get_curline(); | |
247 if (first_char == NUL) /* empty line */ | |
248 curwin->w_cursor.col = 0; | |
249 #ifdef FEAT_VISUALEXTRA | |
250 else if (oap->block_mode) | |
251 shift_block(oap, amount); | |
252 #endif | |
253 else | |
254 /* Move the line right if it doesn't start with '#', 'smartindent' | |
255 * isn't set or 'cindent' isn't set or '#' isn't in 'cino'. */ | |
256 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
257 if (first_char != '#' || !preprocs_left()) | |
258 #endif | |
259 { | |
1516 | 260 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE); |
7 | 261 } |
262 ++curwin->w_cursor.lnum; | |
263 } | |
264 | |
265 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
266 if (oap->block_mode) | |
267 { | |
268 curwin->w_cursor.lnum = oap->start.lnum; | |
269 curwin->w_cursor.col = block_col; | |
270 } | |
5735 | 271 else if (curs_top) /* put cursor on first line, for ">>" */ |
7 | 272 { |
273 curwin->w_cursor.lnum = oap->start.lnum; | |
274 beginline(BL_SOL | BL_FIX); /* shift_line() may have set cursor.col */ | |
275 } | |
276 else | |
277 --curwin->w_cursor.lnum; /* put cursor on last line, for ":>" */ | |
278 | |
10486
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
279 #ifdef FEAT_FOLDING |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
280 /* 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
|
281 foldOpenCursor(); |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
282 #endif |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
283 |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
284 |
7 | 285 if (oap->line_count > p_report) |
286 { | |
287 if (oap->op_type == OP_RSHIFT) | |
288 s = (char_u *)">"; | |
289 else | |
290 s = (char_u *)"<"; | |
291 if (oap->line_count == 1) | |
292 { | |
293 if (amount == 1) | |
294 sprintf((char *)IObuff, _("1 line %sed 1 time"), s); | |
295 else | |
296 sprintf((char *)IObuff, _("1 line %sed %d times"), s, amount); | |
297 } | |
298 else | |
299 { | |
300 if (amount == 1) | |
301 sprintf((char *)IObuff, _("%ld lines %sed 1 time"), | |
302 oap->line_count, s); | |
303 else | |
304 sprintf((char *)IObuff, _("%ld lines %sed %d times"), | |
305 oap->line_count, s, amount); | |
306 } | |
307 msg(IObuff); | |
308 } | |
309 | |
310 /* | |
311 * Set "'[" and "']" marks. | |
312 */ | |
313 curbuf->b_op_start = oap->start; | |
314 curbuf->b_op_end.lnum = oap->end.lnum; | |
315 curbuf->b_op_end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
316 if (curbuf->b_op_end.col > 0) | |
317 --curbuf->b_op_end.col; | |
318 } | |
319 | |
320 /* | |
321 * shift the current line one shiftwidth left (if left != 0) or right | |
322 * leaves cursor on first blank in the line | |
323 */ | |
324 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
325 shift_line( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
326 int left, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
327 int round, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
328 int amount, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
329 int call_changed_bytes) /* call changed_bytes() */ |
7 | 330 { |
331 int count; | |
332 int i, j; | |
5438 | 333 int p_sw = (int)get_sw_value(curbuf); |
7 | 334 |
335 count = get_indent(); /* get current indent */ | |
336 | |
337 if (round) /* round off indent */ | |
338 { | |
339 i = count / p_sw; /* number of p_sw rounded down */ | |
340 j = count % p_sw; /* extra spaces */ | |
341 if (j && left) /* first remove extra spaces */ | |
342 --amount; | |
343 if (left) | |
344 { | |
345 i -= amount; | |
346 if (i < 0) | |
347 i = 0; | |
348 } | |
349 else | |
350 i += amount; | |
351 count = i * p_sw; | |
352 } | |
353 else /* original vi indent */ | |
354 { | |
355 if (left) | |
356 { | |
357 count -= p_sw * amount; | |
358 if (count < 0) | |
359 count = 0; | |
360 } | |
361 else | |
362 count += p_sw * amount; | |
363 } | |
364 | |
365 /* Set new indent */ | |
366 #ifdef FEAT_VREPLACE | |
367 if (State & VREPLACE_FLAG) | |
1516 | 368 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes); |
7 | 369 else |
370 #endif | |
1516 | 371 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0); |
7 | 372 } |
373 | |
374 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
375 /* | |
376 * Shift one line of the current block one shiftwidth right or left. | |
377 * Leaves cursor on first character in block. | |
378 */ | |
379 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
380 shift_block(oparg_T *oap, int amount) |
7 | 381 { |
382 int left = (oap->op_type == OP_LSHIFT); | |
383 int oldstate = State; | |
1839 | 384 int total; |
385 char_u *newp, *oldp; | |
7 | 386 int oldcol = curwin->w_cursor.col; |
5438 | 387 int p_sw = (int)get_sw_value(curbuf); |
7 | 388 int p_ts = (int)curbuf->b_p_ts; |
389 struct block_def bd; | |
390 int incr; | |
1839 | 391 colnr_T ws_vcol; |
7 | 392 int i = 0, j = 0; |
393 int len; | |
394 #ifdef FEAT_RIGHTLEFT | |
395 int old_p_ri = p_ri; | |
396 | |
4352 | 397 p_ri = 0; /* don't want revins in indent */ |
7 | 398 #endif |
399 | |
400 State = INSERT; /* don't want REPLACE for State */ | |
401 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); | |
402 if (bd.is_short) | |
403 return; | |
404 | |
405 /* total is number of screen columns to be inserted/removed */ | |
11997
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
406 total = (int)((unsigned)amount * (unsigned)p_sw); |
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
407 if ((total / p_sw) != amount) |
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
408 return; /* multiplication overflow */ |
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
409 |
7 | 410 oldp = ml_get_curline(); |
411 | |
412 if (!left) | |
413 { | |
414 /* | |
415 * 1. Get start vcol | |
416 * 2. Total ws vcols | |
417 * 3. Divvy into TABs & spp | |
418 * 4. Construct new string | |
419 */ | |
420 total += bd.pre_whitesp; /* all virtual WS upto & incl a split TAB */ | |
421 ws_vcol = bd.start_vcol - bd.pre_whitesp; | |
422 if (bd.startspaces) | |
423 { | |
424 #ifdef FEAT_MBYTE | |
425 if (has_mbyte) | |
8399
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 if ((*mb_ptr2len)(bd.textstart) == 1) |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
428 ++bd.textstart; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
429 else |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
430 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
431 ws_vcol = 0; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
432 bd.startspaces = 0; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
433 } |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
434 } |
1995 | 435 else |
436 #endif | |
437 ++bd.textstart; | |
7 | 438 } |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
439 for ( ; VIM_ISWHITE(*bd.textstart); ) |
7 | 440 { |
5995 | 441 /* TODO: is passing bd.textstart for start of the line OK? */ |
442 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, | |
443 (colnr_T)(bd.start_vcol)); | |
7 | 444 total += incr; |
445 bd.start_vcol += incr; | |
446 } | |
447 /* OK, now total=all the VWS reqd, and textstart points at the 1st | |
448 * non-ws char in the block. */ | |
449 if (!curbuf->b_p_et) | |
450 i = ((ws_vcol % p_ts) + total) / p_ts; /* number of tabs */ | |
451 if (i) | |
452 j = ((ws_vcol % p_ts) + total) % p_ts; /* number of spp */ | |
453 else | |
454 j = total; | |
455 /* if we're splitting a TAB, allow for it */ | |
456 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0); | |
457 len = (int)STRLEN(bd.textstart) + 1; | |
458 newp = alloc_check((unsigned)(bd.textcol + i + j + len)); | |
459 if (newp == NULL) | |
460 return; | |
461 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len)); | |
462 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
6929 | 463 vim_memset(newp + bd.textcol, TAB, (size_t)i); |
464 vim_memset(newp + bd.textcol + i, ' ', (size_t)j); | |
7 | 465 /* the end */ |
466 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len); | |
467 } | |
468 else /* left */ | |
469 { | |
1839 | 470 colnr_T destination_col; /* column to which text in block will |
471 be shifted */ | |
472 char_u *verbatim_copy_end; /* end of the part of the line which is | |
473 copied verbatim */ | |
474 colnr_T verbatim_copy_width;/* the (displayed) width of this part | |
475 of line */ | |
476 unsigned fill; /* nr of spaces that replace a TAB */ | |
477 unsigned new_line_len; /* the length of the line after the | |
478 block shift */ | |
479 size_t block_space_width; | |
480 size_t shift_amount; | |
481 char_u *non_white = bd.textstart; | |
482 colnr_T non_white_col; | |
483 | |
484 /* | |
485 * Firstly, let's find the first non-whitespace character that is | |
486 * displayed after the block's start column and the character's column | |
487 * number. Also, let's calculate the width of all the whitespace | |
488 * characters that are displayed in the block and precede the searched | |
489 * non-whitespace character. | |
490 */ | |
491 | |
492 /* If "bd.startspaces" is set, "bd.textstart" points to the character, | |
493 * the part of which is displayed at the block's beginning. Let's start | |
494 * searching from the next character. */ | |
495 if (bd.startspaces) | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
496 MB_PTR_ADV(non_white); |
1839 | 497 |
498 /* The character's column is in "bd.start_vcol". */ | |
499 non_white_col = bd.start_vcol; | |
500 | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
501 while (VIM_ISWHITE(*non_white)) |
7 | 502 { |
5995 | 503 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col); |
1839 | 504 non_white_col += incr; |
7 | 505 } |
1839 | 506 |
507 block_space_width = non_white_col - oap->start_vcol; | |
508 /* We will shift by "total" or "block_space_width", whichever is less. | |
509 */ | |
1860 | 510 shift_amount = (block_space_width < (size_t)total |
511 ? block_space_width : (size_t)total); | |
1839 | 512 |
513 /* The column to which we will shift the text. */ | |
1860 | 514 destination_col = (colnr_T)(non_white_col - shift_amount); |
1839 | 515 |
516 /* Now let's find out how much of the beginning of the line we can | |
517 * reuse without modification. */ | |
518 verbatim_copy_end = bd.textstart; | |
519 verbatim_copy_width = bd.start_vcol; | |
520 | |
521 /* If "bd.startspaces" is set, "bd.textstart" points to the character | |
522 * preceding the block. We have to subtract its width to obtain its | |
523 * column number. */ | |
524 if (bd.startspaces) | |
525 verbatim_copy_width -= bd.start_char_vcols; | |
526 while (verbatim_copy_width < destination_col) | |
7 | 527 { |
5995 | 528 char_u *line = verbatim_copy_end; |
529 | |
530 /* TODO: is passing verbatim_copy_end for start of the line OK? */ | |
531 incr = lbr_chartabsize(line, verbatim_copy_end, | |
532 verbatim_copy_width); | |
1839 | 533 if (verbatim_copy_width + incr > destination_col) |
534 break; | |
535 verbatim_copy_width += incr; | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
536 MB_PTR_ADV(verbatim_copy_end); |
7 | 537 } |
538 | |
1839 | 539 /* If "destination_col" is different from the width of the initial |
540 * part of the line that will be copied, it means we encountered a tab | |
541 * character, which we will have to partly replace with spaces. */ | |
542 fill = destination_col - verbatim_copy_width; | |
543 | |
544 /* The replacement line will consist of: | |
545 * - the beginning of the original line up to "verbatim_copy_end", | |
546 * - "fill" number of spaces, | |
547 * - the rest of the line, pointed to by non_white. */ | |
548 new_line_len = (unsigned)(verbatim_copy_end - oldp) | |
549 + fill | |
550 + (unsigned)STRLEN(non_white) + 1; | |
551 | |
552 newp = alloc_check(new_line_len); | |
7 | 553 if (newp == NULL) |
554 return; | |
1839 | 555 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); |
6929 | 556 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill); |
1839 | 557 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); |
7 | 558 } |
559 /* replace the line */ | |
560 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
561 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol); | |
562 State = oldstate; | |
563 curwin->w_cursor.col = oldcol; | |
564 #ifdef FEAT_RIGHTLEFT | |
565 p_ri = old_p_ri; | |
566 #endif | |
567 } | |
568 #endif | |
569 | |
570 #ifdef FEAT_VISUALEXTRA | |
571 /* | |
572 * Insert string "s" (b_insert ? before : after) block :AKelly | |
573 * Caller must prepare for undo. | |
574 */ | |
575 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
576 block_insert( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
577 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
578 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
579 int b_insert, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
580 struct block_def *bdp) |
7 | 581 { |
582 int p_ts; | |
583 int count = 0; /* extra spaces to replace a cut TAB */ | |
584 int spaces = 0; /* non-zero if cutting a TAB */ | |
585 colnr_T offset; /* pointer along new line */ | |
586 unsigned s_len; /* STRLEN(s) */ | |
587 char_u *newp, *oldp; /* new, old lines */ | |
588 linenr_T lnum; /* loop var */ | |
589 int oldstate = State; | |
590 | |
591 State = INSERT; /* don't want REPLACE for State */ | |
592 s_len = (unsigned)STRLEN(s); | |
593 | |
594 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) | |
595 { | |
596 block_prep(oap, bdp, lnum, TRUE); | |
597 if (bdp->is_short && b_insert) | |
598 continue; /* OP_INSERT, line ends before block start */ | |
599 | |
600 oldp = ml_get(lnum); | |
601 | |
602 if (b_insert) | |
603 { | |
604 p_ts = bdp->start_char_vcols; | |
605 spaces = bdp->startspaces; | |
606 if (spaces != 0) | |
607 count = p_ts - 1; /* we're cutting a TAB */ | |
608 offset = bdp->textcol; | |
609 } | |
610 else /* append */ | |
611 { | |
612 p_ts = bdp->end_char_vcols; | |
613 if (!bdp->is_short) /* spaces = padding after block */ | |
614 { | |
615 spaces = (bdp->endspaces ? p_ts - bdp->endspaces : 0); | |
616 if (spaces != 0) | |
617 count = p_ts - 1; /* we're cutting a TAB */ | |
618 offset = bdp->textcol + bdp->textlen - (spaces != 0); | |
619 } | |
620 else /* spaces = padding to block edge */ | |
621 { | |
622 /* if $ used, just append to EOL (ie spaces==0) */ | |
623 if (!bdp->is_MAX) | |
624 spaces = (oap->end_vcol - bdp->end_vcol) + 1; | |
625 count = spaces; | |
626 offset = bdp->textcol + bdp->textlen; | |
627 } | |
628 } | |
629 | |
6140 | 630 #ifdef FEAT_MBYTE |
631 if (has_mbyte && spaces > 0) | |
632 { | |
6460 | 633 int off; |
634 | |
6140 | 635 /* Avoid starting halfway a multi-byte character. */ |
636 if (b_insert) | |
637 { | |
6460 | 638 off = (*mb_head_off)(oldp, oldp + offset + spaces); |
6140 | 639 } |
640 else | |
641 { | |
6460 | 642 off = (*mb_off_next)(oldp, oldp + offset); |
6140 | 643 offset += off; |
644 } | |
6460 | 645 spaces -= off; |
646 count -= off; | |
6140 | 647 } |
648 #endif | |
649 | |
7 | 650 newp = alloc_check((unsigned)(STRLEN(oldp)) + s_len + count + 1); |
651 if (newp == NULL) | |
652 continue; | |
653 | |
654 /* copy up to shifted part */ | |
655 mch_memmove(newp, oldp, (size_t)(offset)); | |
656 oldp += offset; | |
657 | |
658 /* insert pre-padding */ | |
6929 | 659 vim_memset(newp + offset, ' ', (size_t)spaces); |
7 | 660 |
661 /* copy the new text */ | |
662 mch_memmove(newp + offset + spaces, s, (size_t)s_len); | |
663 offset += s_len; | |
664 | |
665 if (spaces && !bdp->is_short) | |
666 { | |
667 /* insert post-padding */ | |
6929 | 668 vim_memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces)); |
7 | 669 /* We're splitting a TAB, don't copy it. */ |
670 oldp++; | |
671 /* We allowed for that TAB, remember this now */ | |
672 count++; | |
673 } | |
674 | |
675 if (spaces > 0) | |
676 offset += count; | |
1622 | 677 STRMOVE(newp + offset, oldp); |
7 | 678 |
679 ml_replace(lnum, newp, FALSE); | |
680 | |
681 if (lnum == oap->end.lnum) | |
682 { | |
683 /* Set "']" mark to the end of the block instead of the end of | |
684 * the insert in the first line. */ | |
685 curbuf->b_op_end.lnum = oap->end.lnum; | |
686 curbuf->b_op_end.col = offset; | |
687 } | |
688 } /* for all lnum */ | |
689 | |
690 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
691 | |
692 State = oldstate; | |
693 } | |
694 #endif | |
695 | |
696 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(PROTO) | |
697 /* | |
698 * op_reindent - handle reindenting a block of lines. | |
699 */ | |
700 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
701 op_reindent(oparg_T *oap, int (*how)(void)) |
7 | 702 { |
703 long i; | |
704 char_u *l; | |
6971 | 705 int amount; |
7 | 706 linenr_T first_changed = 0; |
707 linenr_T last_changed = 0; | |
708 linenr_T start_lnum = curwin->w_cursor.lnum; | |
709 | |
216 | 710 /* Don't even try when 'modifiable' is off. */ |
711 if (!curbuf->b_p_ma) | |
712 { | |
713 EMSG(_(e_modifiable)); | |
714 return; | |
715 } | |
716 | |
7 | 717 for (i = oap->line_count; --i >= 0 && !got_int; ) |
718 { | |
719 /* it's a slow thing to do, so give feedback so there's no worry that | |
720 * the computer's just hung. */ | |
721 | |
722 if (i > 1 | |
723 && (i % 50 == 0 || i == oap->line_count - 1) | |
724 && oap->line_count > p_report) | |
725 smsg((char_u *)_("%ld lines to indent... "), i); | |
726 | |
727 /* | |
728 * Be vi-compatible: For lisp indenting the first line is not | |
729 * indented, unless there is only one line. | |
730 */ | |
731 #ifdef FEAT_LISP | |
732 if (i != oap->line_count - 1 || oap->line_count == 1 | |
733 || how != get_lisp_indent) | |
734 #endif | |
735 { | |
736 l = skipwhite(ml_get_curline()); | |
737 if (*l == NUL) /* empty or blank line */ | |
6971 | 738 amount = 0; |
7 | 739 else |
6971 | 740 amount = how(); /* get the indent for this line */ |
741 | |
742 if (amount >= 0 && set_indent(amount, SIN_UNDO)) | |
7 | 743 { |
744 /* did change the indent, call changed_lines() later */ | |
745 if (first_changed == 0) | |
746 first_changed = curwin->w_cursor.lnum; | |
747 last_changed = curwin->w_cursor.lnum; | |
748 } | |
749 } | |
750 ++curwin->w_cursor.lnum; | |
1550 | 751 curwin->w_cursor.col = 0; /* make sure it's valid */ |
7 | 752 } |
753 | |
754 /* put cursor on first non-blank of indented line */ | |
755 curwin->w_cursor.lnum = start_lnum; | |
756 beginline(BL_SOL | BL_FIX); | |
757 | |
758 /* Mark changed lines so that they will be redrawn. When Visual | |
759 * highlighting was present, need to continue until the last line. When | |
760 * there is no change still need to remove the Visual highlighting. */ | |
761 if (last_changed != 0) | |
762 changed_lines(first_changed, 0, | |
763 oap->is_VIsual ? start_lnum + oap->line_count : | |
764 last_changed + 1, 0L); | |
765 else if (oap->is_VIsual) | |
766 redraw_curbuf_later(INVERTED); | |
767 | |
768 if (oap->line_count > p_report) | |
769 { | |
770 i = oap->line_count - (i + 1); | |
771 if (i == 1) | |
772 MSG(_("1 line indented ")); | |
773 else | |
774 smsg((char_u *)_("%ld lines indented "), i); | |
775 } | |
776 /* set '[ and '] marks */ | |
777 curbuf->b_op_start = oap->start; | |
778 curbuf->b_op_end = oap->end; | |
779 } | |
780 #endif /* defined(FEAT_LISP) || defined(FEAT_CINDENT) */ | |
781 | |
782 #if defined(FEAT_EVAL) || defined(PROTO) | |
783 /* | |
784 * Keep the last expression line here, for repeating. | |
785 */ | |
786 static char_u *expr_line = NULL; | |
787 | |
788 /* | |
789 * Get an expression for the "\"=expr1" or "CTRL-R =expr1" | |
790 * Returns '=' when OK, NUL otherwise. | |
791 */ | |
792 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
793 get_expr_register(void) |
7 | 794 { |
795 char_u *new_line; | |
796 | |
797 new_line = getcmdline('=', 0L, 0); | |
798 if (new_line == NULL) | |
799 return NUL; | |
800 if (*new_line == NUL) /* use previous line */ | |
801 vim_free(new_line); | |
802 else | |
803 set_expr_line(new_line); | |
804 return '='; | |
805 } | |
806 | |
807 /* | |
808 * Set the expression for the '=' register. | |
809 * Argument must be an allocated string. | |
810 */ | |
811 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
812 set_expr_line(char_u *new_line) |
7 | 813 { |
814 vim_free(expr_line); | |
815 expr_line = new_line; | |
816 } | |
817 | |
818 /* | |
819 * Get the result of the '=' register expression. | |
820 * Returns a pointer to allocated memory, or NULL for failure. | |
821 */ | |
822 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
823 get_expr_line(void) |
7 | 824 { |
825 char_u *expr_copy; | |
826 char_u *rv; | |
994 | 827 static int nested = 0; |
7 | 828 |
829 if (expr_line == NULL) | |
830 return NULL; | |
831 | |
832 /* Make a copy of the expression, because evaluating it may cause it to be | |
833 * changed. */ | |
834 expr_copy = vim_strsave(expr_line); | |
835 if (expr_copy == NULL) | |
836 return NULL; | |
837 | |
994 | 838 /* When we are invoked recursively limit the evaluation to 10 levels. |
839 * Then return the string as-is. */ | |
840 if (nested >= 10) | |
841 return expr_copy; | |
842 | |
843 ++nested; | |
714 | 844 rv = eval_to_string(expr_copy, NULL, TRUE); |
994 | 845 --nested; |
7 | 846 vim_free(expr_copy); |
847 return rv; | |
848 } | |
283 | 849 |
850 /* | |
851 * Get the '=' register expression itself, without evaluating it. | |
852 */ | |
853 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
854 get_expr_line_src(void) |
283 | 855 { |
856 if (expr_line == NULL) | |
857 return NULL; | |
858 return vim_strsave(expr_line); | |
859 } | |
7 | 860 #endif /* FEAT_EVAL */ |
861 | |
862 /* | |
863 * Check if 'regname' is a valid name of a yank register. | |
864 * Note: There is no check for 0 (default register), caller should do this | |
865 */ | |
866 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
867 valid_yank_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
868 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
869 int writing) /* if TRUE check for writable registers */ |
7 | 870 { |
871 if ( (regname > 0 && ASCII_ISALNUM(regname)) | |
872 || (!writing && vim_strchr((char_u *) | |
873 #ifdef FEAT_EVAL | |
6557 | 874 "/.%:=" |
7 | 875 #else |
6557 | 876 "/.%:" |
7 | 877 #endif |
878 , regname) != NULL) | |
6557 | 879 || regname == '#' |
7 | 880 || regname == '"' |
881 || regname == '-' | |
882 || regname == '_' | |
883 #ifdef FEAT_CLIPBOARD | |
884 || regname == '*' | |
885 || regname == '+' | |
886 #endif | |
887 #ifdef FEAT_DND | |
888 || (!writing && regname == '~') | |
889 #endif | |
890 ) | |
891 return TRUE; | |
892 return FALSE; | |
893 } | |
894 | |
895 /* | |
896 * Set y_current and y_append, according to the value of "regname". | |
897 * Cannot handle the '_' register. | |
140 | 898 * Must only be called with a valid register name! |
7 | 899 * |
900 * If regname is 0 and writing, use register 0 | |
901 * If regname is 0 and reading, use previous register | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
902 * |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
903 * Return TRUE when the register should be inserted literally (selection or |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
904 * clipboard). |
7 | 905 */ |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
906 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
907 get_yank_register(int regname, int writing) |
7 | 908 { |
909 int i; | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
910 int ret = FALSE; |
7 | 911 |
912 y_append = FALSE; | |
913 if ((regname == 0 || regname == '"') && !writing && y_previous != NULL) | |
914 { | |
915 y_current = y_previous; | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
916 return ret; |
7 | 917 } |
918 i = regname; | |
919 if (VIM_ISDIGIT(i)) | |
920 i -= '0'; | |
921 else if (ASCII_ISLOWER(i)) | |
922 i = CharOrdLow(i) + 10; | |
923 else if (ASCII_ISUPPER(i)) | |
924 { | |
925 i = CharOrdUp(i) + 10; | |
926 y_append = TRUE; | |
927 } | |
928 else if (regname == '-') | |
929 i = DELETION_REGISTER; | |
930 #ifdef FEAT_CLIPBOARD | |
931 /* When selection is not available, use register 0 instead of '*' */ | |
932 else if (clip_star.available && regname == '*') | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
933 { |
7 | 934 i = STAR_REGISTER; |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
935 ret = TRUE; |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
936 } |
7 | 937 /* When clipboard is not available, use register 0 instead of '+' */ |
938 else if (clip_plus.available && regname == '+') | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
939 { |
7 | 940 i = PLUS_REGISTER; |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
941 ret = TRUE; |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
942 } |
7 | 943 #endif |
944 #ifdef FEAT_DND | |
945 else if (!writing && regname == '~') | |
946 i = TILDE_REGISTER; | |
947 #endif | |
948 else /* not 0-9, a-z, A-Z or '-': use register 0 */ | |
949 i = 0; | |
950 y_current = &(y_regs[i]); | |
951 if (writing) /* remember the register we write into for do_put() */ | |
952 y_previous = y_current; | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
953 return ret; |
7 | 954 } |
955 | |
15 | 956 #if defined(FEAT_CLIPBOARD) || defined(PROTO) |
7 | 957 /* |
958 * When "regname" is a clipboard register, obtain the selection. If it's not | |
959 * available return zero, otherwise return "regname". | |
960 */ | |
15 | 961 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
962 may_get_selection(int regname) |
7 | 963 { |
964 if (regname == '*') | |
965 { | |
966 if (!clip_star.available) | |
967 regname = 0; | |
968 else | |
969 clip_get_selection(&clip_star); | |
970 } | |
971 else if (regname == '+') | |
972 { | |
973 if (!clip_plus.available) | |
974 regname = 0; | |
975 else | |
976 clip_get_selection(&clip_plus); | |
977 } | |
978 return regname; | |
979 } | |
980 #endif | |
981 | |
982 /* | |
983 * Obtain the contents of a "normal" register. The register is made empty. | |
984 * The returned pointer has allocated memory, use put_register() later. | |
985 */ | |
986 void * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
987 get_register( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
988 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
989 int copy) /* make a copy, if FALSE make register empty. */ |
7 | 990 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
991 yankreg_T *reg; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
992 int i; |
7 | 993 |
994 #ifdef FEAT_CLIPBOARD | |
995 /* When Visual area changed, may have to update selection. Obtain the | |
996 * selection too. */ | |
1435 | 997 if (name == '*' && clip_star.available) |
7 | 998 { |
3674 | 999 if (clip_isautosel_star()) |
1000 clip_update_selection(&clip_star); | |
1001 may_get_selection(name); | |
1002 } | |
1003 if (name == '+' && clip_plus.available) | |
1004 { | |
1005 if (clip_isautosel_plus()) | |
1006 clip_update_selection(&clip_plus); | |
7 | 1007 may_get_selection(name); |
1008 } | |
1009 #endif | |
1010 | |
1011 get_yank_register(name, 0); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1012 reg = (yankreg_T *)alloc((unsigned)sizeof(yankreg_T)); |
7 | 1013 if (reg != NULL) |
1014 { | |
1015 *reg = *y_current; | |
1016 if (copy) | |
1017 { | |
1018 /* If we run out of memory some or all of the lines are empty. */ | |
1019 if (reg->y_size == 0) | |
1020 reg->y_array = NULL; | |
1021 else | |
1022 reg->y_array = (char_u **)alloc((unsigned)(sizeof(char_u *) | |
1023 * reg->y_size)); | |
1024 if (reg->y_array != NULL) | |
1025 { | |
1026 for (i = 0; i < reg->y_size; ++i) | |
1027 reg->y_array[i] = vim_strsave(y_current->y_array[i]); | |
1028 } | |
1029 } | |
1030 else | |
1031 y_current->y_array = NULL; | |
1032 } | |
1033 return (void *)reg; | |
1034 } | |
1035 | |
1036 /* | |
1451 | 1037 * Put "reg" into register "name". Free any previous contents and "reg". |
7 | 1038 */ |
1039 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1040 put_register(int name, void *reg) |
7 | 1041 { |
1042 get_yank_register(name, 0); | |
1043 free_yank_all(); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1044 *y_current = *(yankreg_T *)reg; |
1451 | 1045 vim_free(reg); |
7 | 1046 |
5735 | 1047 #ifdef FEAT_CLIPBOARD |
7 | 1048 /* Send text written to clipboard register to the clipboard. */ |
1049 may_set_selection(); | |
5735 | 1050 #endif |
7 | 1051 } |
4209 | 1052 |
1053 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1054 free_register(void *reg) |
4209 | 1055 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1056 yankreg_T tmp; |
4209 | 1057 |
1058 tmp = *y_current; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1059 *y_current = *(yankreg_T *)reg; |
4209 | 1060 free_yank_all(); |
1061 vim_free(reg); | |
1062 *y_current = tmp; | |
1063 } | |
7 | 1064 |
1065 #if defined(FEAT_MOUSE) || defined(PROTO) | |
1066 /* | |
1067 * return TRUE if the current yank register has type MLINE | |
1068 */ | |
1069 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1070 yank_register_mline(int regname) |
7 | 1071 { |
1072 if (regname != 0 && !valid_yank_reg(regname, FALSE)) | |
1073 return FALSE; | |
1074 if (regname == '_') /* black hole is always empty */ | |
1075 return FALSE; | |
1076 get_yank_register(regname, FALSE); | |
1077 return (y_current->y_type == MLINE); | |
1078 } | |
1079 #endif | |
1080 | |
1081 /* | |
1157 | 1082 * Start or stop recording into a yank register. |
7 | 1083 * |
1157 | 1084 * Return FAIL for failure, OK otherwise. |
7 | 1085 */ |
1086 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1087 do_record(int c) |
7 | 1088 { |
1157 | 1089 char_u *p; |
1090 static int regname; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1091 yankreg_T *old_y_previous, *old_y_current; |
1157 | 1092 int retval; |
7 | 1093 |
1094 if (Recording == FALSE) /* start recording */ | |
1095 { | |
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
1096 /* registers 0-9, a-z and " are allowed */ |
7 | 1097 if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) |
1098 retval = FAIL; | |
1099 else | |
1100 { | |
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7011
diff
changeset
|
1101 Recording = c; |
7 | 1102 showmode(); |
1103 regname = c; | |
1104 retval = OK; | |
1105 } | |
1106 } | |
1107 else /* stop recording */ | |
1108 { | |
1109 /* | |
1157 | 1110 * Get the recorded key hits. K_SPECIAL and CSI will be escaped, this |
1111 * needs to be removed again to put it in a register. exec_reg then | |
1112 * adds the escaping back later. | |
7 | 1113 */ |
1114 Recording = FALSE; | |
1115 MSG(""); | |
1116 p = get_recorded(); | |
1117 if (p == NULL) | |
1118 retval = FAIL; | |
1119 else | |
1120 { | |
1081 | 1121 /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ |
1122 vim_unescape_csi(p); | |
1123 | |
7 | 1124 /* |
1125 * We don't want to change the default register here, so save and | |
1126 * restore the current register name. | |
1127 */ | |
1128 old_y_previous = y_previous; | |
1129 old_y_current = y_current; | |
1130 | |
1131 retval = stuff_yank(regname, p); | |
1132 | |
1133 y_previous = old_y_previous; | |
1134 y_current = old_y_current; | |
1135 } | |
1136 } | |
1137 return retval; | |
1138 } | |
1139 | |
1140 /* | |
1141 * Stuff string "p" into yank register "regname" as a single line (append if | |
1142 * uppercase). "p" must have been alloced. | |
1143 * | |
1144 * return FAIL for failure, OK otherwise | |
1145 */ | |
1146 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1147 stuff_yank(int regname, char_u *p) |
7 | 1148 { |
1149 char_u *lp; | |
1150 char_u **pp; | |
1151 | |
1152 /* check for read-only register */ | |
1153 if (regname != 0 && !valid_yank_reg(regname, TRUE)) | |
1154 { | |
1155 vim_free(p); | |
1156 return FAIL; | |
1157 } | |
1158 if (regname == '_') /* black hole: don't do anything */ | |
1159 { | |
1160 vim_free(p); | |
1161 return OK; | |
1162 } | |
1163 get_yank_register(regname, TRUE); | |
1164 if (y_append && y_current->y_array != NULL) | |
1165 { | |
1166 pp = &(y_current->y_array[y_current->y_size - 1]); | |
1167 lp = lalloc((long_u)(STRLEN(*pp) + STRLEN(p) + 1), TRUE); | |
1168 if (lp == NULL) | |
1169 { | |
1170 vim_free(p); | |
1171 return FAIL; | |
1172 } | |
1173 STRCPY(lp, *pp); | |
1174 STRCAT(lp, p); | |
1175 vim_free(p); | |
1176 vim_free(*pp); | |
1177 *pp = lp; | |
1178 } | |
1179 else | |
1180 { | |
1181 free_yank_all(); | |
1182 if ((y_current->y_array = | |
1183 (char_u **)alloc((unsigned)sizeof(char_u *))) == NULL) | |
1184 { | |
1185 vim_free(p); | |
1186 return FAIL; | |
1187 } | |
1188 y_current->y_array[0] = p; | |
1189 y_current->y_size = 1; | |
1190 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
|
1191 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1192 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
|
1193 #endif |
7 | 1194 } |
1195 return OK; | |
1196 } | |
1197 | |
1893 | 1198 static int execreg_lastc = NUL; |
1199 | |
7 | 1200 /* |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1201 * Execute a yank register: copy it into the stuff buffer. |
7 | 1202 * |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1203 * Return FAIL for failure, OK otherwise. |
7 | 1204 */ |
1205 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1206 do_execreg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1207 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1208 int colon, /* insert ':' before each line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1209 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
|
1210 int silent) /* set "silent" flag in typeahead buffer */ |
7 | 1211 { |
1212 long i; | |
1213 char_u *p; | |
1214 int retval = OK; | |
1215 int remap; | |
1216 | |
1217 if (regname == '@') /* repeat previous one */ | |
168 | 1218 { |
1893 | 1219 if (execreg_lastc == NUL) |
168 | 1220 { |
1221 EMSG(_("E748: No previously used register")); | |
1222 return FAIL; | |
1223 } | |
1893 | 1224 regname = execreg_lastc; |
168 | 1225 } |
7 | 1226 /* check for valid regname */ |
1227 if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) | |
168 | 1228 { |
1229 emsg_invreg(regname); | |
7 | 1230 return FAIL; |
168 | 1231 } |
1893 | 1232 execreg_lastc = regname; |
7 | 1233 |
1234 #ifdef FEAT_CLIPBOARD | |
1235 regname = may_get_selection(regname); | |
1236 #endif | |
1237 | |
1238 if (regname == '_') /* black hole: don't stuff anything */ | |
1239 return OK; | |
1240 | |
1241 #ifdef FEAT_CMDHIST | |
1242 if (regname == ':') /* use last command line */ | |
1243 { | |
1244 if (last_cmdline == NULL) | |
1245 { | |
1246 EMSG(_(e_nolastcmd)); | |
1247 return FAIL; | |
1248 } | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
1249 VIM_CLEAR(new_last_cmdline); /* don't keep the cmdline containing @: */ |
16 | 1250 /* Escape all control characters with a CTRL-V */ |
1251 p = vim_strsave_escaped_ext(last_cmdline, | |
20 | 1252 (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 | 1253 if (p != NULL) |
480 | 1254 { |
1255 /* When in Visual mode "'<,'>" will be prepended to the command. | |
1256 * Remove it when it's already there. */ | |
1257 if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) | |
1077 | 1258 retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); |
480 | 1259 else |
1077 | 1260 retval = put_in_typebuf(p, TRUE, TRUE, silent); |
480 | 1261 } |
16 | 1262 vim_free(p); |
7 | 1263 } |
1264 #endif | |
1265 #ifdef FEAT_EVAL | |
1266 else if (regname == '=') | |
1267 { | |
1268 p = get_expr_line(); | |
1269 if (p == NULL) | |
1270 return FAIL; | |
1077 | 1271 retval = put_in_typebuf(p, TRUE, colon, silent); |
7 | 1272 vim_free(p); |
1273 } | |
1274 #endif | |
1275 else if (regname == '.') /* use last inserted text */ | |
1276 { | |
1277 p = get_last_insert_save(); | |
1278 if (p == NULL) | |
1279 { | |
1280 EMSG(_(e_noinstext)); | |
1281 return FAIL; | |
1282 } | |
1077 | 1283 retval = put_in_typebuf(p, FALSE, colon, silent); |
7 | 1284 vim_free(p); |
1285 } | |
1286 else | |
1287 { | |
1288 get_yank_register(regname, FALSE); | |
1289 if (y_current->y_array == NULL) | |
1290 return FAIL; | |
1291 | |
1292 /* Disallow remaping for ":@r". */ | |
1293 remap = colon ? REMAP_NONE : REMAP_YES; | |
1294 | |
1295 /* | |
1296 * Insert lines into typeahead buffer, from last one to first one. | |
1297 */ | |
1034 | 1298 put_reedit_in_typebuf(silent); |
7 | 1299 for (i = y_current->y_size; --i >= 0; ) |
1300 { | |
1077 | 1301 char_u *escaped; |
1302 | |
7 | 1303 /* insert NL between lines and after last line if type is MLINE */ |
1304 if (y_current->y_type == MLINE || i < y_current->y_size - 1 | |
1305 || addcr) | |
1306 { | |
1034 | 1307 if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) |
7 | 1308 return FAIL; |
1309 } | |
1077 | 1310 escaped = vim_strsave_escape_csi(y_current->y_array[i]); |
1311 if (escaped == NULL) | |
1312 return FAIL; | |
1313 retval = ins_typebuf(escaped, remap, 0, TRUE, silent); | |
1314 vim_free(escaped); | |
1315 if (retval == FAIL) | |
7 | 1316 return FAIL; |
1034 | 1317 if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) |
7 | 1318 == FAIL) |
1319 return FAIL; | |
1320 } | |
1321 Exec_reg = TRUE; /* disable the 'q' command */ | |
1322 } | |
1323 return retval; | |
1324 } | |
1325 | |
1326 /* | |
1327 * If "restart_edit" is not zero, put it in the typeahead buffer, so that it's | |
1328 * used only after other typeahead has been processed. | |
1329 */ | |
1330 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1331 put_reedit_in_typebuf(int silent) |
7 | 1332 { |
1333 char_u buf[3]; | |
1334 | |
1335 if (restart_edit != NUL) | |
1336 { | |
1337 if (restart_edit == 'V') | |
1338 { | |
1339 buf[0] = 'g'; | |
1340 buf[1] = 'R'; | |
1341 buf[2] = NUL; | |
1342 } | |
1343 else | |
1344 { | |
1345 buf[0] = restart_edit == 'I' ? 'i' : restart_edit; | |
1346 buf[1] = NUL; | |
1347 } | |
1034 | 1348 if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK) |
7 | 1349 restart_edit = NUL; |
1350 } | |
1351 } | |
1352 | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1353 /* |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1354 * 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
|
1355 * executed again. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1356 * 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
|
1357 * no remapping. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1358 */ |
7 | 1359 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1360 put_in_typebuf( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1361 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1362 int esc, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1363 int colon, /* add ':' before the line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1364 int silent) |
7 | 1365 { |
1366 int retval = OK; | |
1367 | |
1034 | 1368 put_reedit_in_typebuf(silent); |
7 | 1369 if (colon) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1370 retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent); |
7 | 1371 if (retval == OK) |
1077 | 1372 { |
1373 char_u *p; | |
1374 | |
1375 if (esc) | |
1376 p = vim_strsave_escape_csi(s); | |
1377 else | |
1378 p = s; | |
1379 if (p == NULL) | |
1380 retval = FAIL; | |
1381 else | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1382 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
|
1383 0, TRUE, silent); |
1077 | 1384 if (esc) |
1385 vim_free(p); | |
1386 } | |
7 | 1387 if (colon && retval == OK) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1388 retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent); |
7 | 1389 return retval; |
1390 } | |
1391 | |
1392 /* | |
1393 * Insert a yank register: copy it into the Read buffer. | |
1394 * Used by CTRL-R command and middle mouse button in insert mode. | |
1395 * | |
1396 * return FAIL for failure, OK otherwise | |
1397 */ | |
1398 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1399 insert_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1400 int regname, |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1401 int literally_arg) /* insert literally, not as if typed */ |
7 | 1402 { |
1403 long i; | |
1404 int retval = OK; | |
1405 char_u *arg; | |
1406 int allocated; | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1407 int literally = literally_arg; |
7 | 1408 |
1409 /* | |
1410 * It is possible to get into an endless loop by having CTRL-R a in | |
1411 * register a and then, in insert mode, doing CTRL-R a. | |
1412 * If you hit CTRL-C, the loop will be broken here. | |
1413 */ | |
1414 ui_breakcheck(); | |
1415 if (got_int) | |
1416 return FAIL; | |
1417 | |
1418 /* check for valid regname */ | |
1419 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
1420 return FAIL; | |
1421 | |
1422 #ifdef FEAT_CLIPBOARD | |
1423 regname = may_get_selection(regname); | |
1424 #endif | |
1425 | |
1426 if (regname == '.') /* insert last inserted text */ | |
1427 retval = stuff_inserted(NUL, 1L, TRUE); | |
1428 else if (get_spec_reg(regname, &arg, &allocated, TRUE)) | |
1429 { | |
1430 if (arg == NULL) | |
1431 return FAIL; | |
1432 stuffescaped(arg, literally); | |
1433 if (allocated) | |
1434 vim_free(arg); | |
1435 } | |
1436 else /* name or number register */ | |
1437 { | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1438 if (get_yank_register(regname, FALSE)) |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1439 literally = TRUE; |
7 | 1440 if (y_current->y_array == NULL) |
1441 retval = FAIL; | |
1442 else | |
1443 { | |
1444 for (i = 0; i < y_current->y_size; ++i) | |
1445 { | |
1446 stuffescaped(y_current->y_array[i], literally); | |
1447 /* | |
1448 * Insert a newline between lines and after last line if | |
1449 * y_type is MLINE. | |
1450 */ | |
1451 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
1452 stuffcharReadbuff('\n'); | |
1453 } | |
1454 } | |
1455 } | |
1456 | |
1457 return retval; | |
1458 } | |
1459 | |
1460 /* | |
1461 * Stuff a string into the typeahead buffer, such that edit() will insert it | |
1462 * literally ("literally" TRUE) or interpret is as typed characters. | |
1463 */ | |
1464 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1465 stuffescaped(char_u *arg, int literally) |
7 | 1466 { |
1467 int c; | |
1468 char_u *start; | |
1469 | |
1470 while (*arg != NUL) | |
1471 { | |
1472 /* Stuff a sequence of normal ASCII characters, that's fast. Also | |
1473 * stuff K_SPECIAL to get the effect of a special key when "literally" | |
1474 * is TRUE. */ | |
1475 start = arg; | |
1476 while ((*arg >= ' ' | |
1477 #ifndef EBCDIC | |
1478 && *arg < DEL /* EBCDIC: chars above space are normal */ | |
1479 #endif | |
1480 ) | |
1481 || (*arg == K_SPECIAL && !literally)) | |
1482 ++arg; | |
1483 if (arg > start) | |
1484 stuffReadbuffLen(start, (long)(arg - start)); | |
1485 | |
1486 /* stuff a single special character */ | |
1487 if (*arg != NUL) | |
1488 { | |
1489 #ifdef FEAT_MBYTE | |
1490 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
|
1491 c = mb_cptr2char_adv(&arg); |
7 | 1492 else |
1493 #endif | |
1494 c = *arg++; | |
1495 if (literally && ((c < ' ' && c != TAB) || c == DEL)) | |
1496 stuffcharReadbuff(Ctrl_V); | |
1497 stuffcharReadbuff(c); | |
1498 } | |
1499 } | |
1500 } | |
1501 | |
1502 /* | |
1157 | 1503 * If "regname" is a special register, return TRUE and store a pointer to its |
1504 * value in "argp". | |
7 | 1505 */ |
15 | 1506 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1507 get_spec_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1508 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1509 char_u **argp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1510 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
|
1511 int errmsg) /* give error message when failing */ |
7 | 1512 { |
1513 int cnt; | |
1514 | |
1515 *argp = NULL; | |
1516 *allocated = FALSE; | |
1517 switch (regname) | |
1518 { | |
1519 case '%': /* file name */ | |
1520 if (errmsg) | |
1521 check_fname(); /* will give emsg if not set */ | |
1522 *argp = curbuf->b_fname; | |
1523 return TRUE; | |
1524 | |
1525 case '#': /* alternate file name */ | |
1526 *argp = getaltfname(errmsg); /* may give emsg if not set */ | |
1527 return TRUE; | |
1528 | |
1529 #ifdef FEAT_EVAL | |
1530 case '=': /* result of expression */ | |
1531 *argp = get_expr_line(); | |
1532 *allocated = TRUE; | |
1533 return TRUE; | |
1534 #endif | |
1535 | |
1536 case ':': /* last command line */ | |
1537 if (last_cmdline == NULL && errmsg) | |
1538 EMSG(_(e_nolastcmd)); | |
1539 *argp = last_cmdline; | |
1540 return TRUE; | |
1541 | |
1542 case '/': /* last search-pattern */ | |
1543 if (last_search_pat() == NULL && errmsg) | |
1544 EMSG(_(e_noprevre)); | |
1545 *argp = last_search_pat(); | |
1546 return TRUE; | |
1547 | |
1548 case '.': /* last inserted text */ | |
1549 *argp = get_last_insert_save(); | |
1550 *allocated = TRUE; | |
1551 if (*argp == NULL && errmsg) | |
1552 EMSG(_(e_noinstext)); | |
1553 return TRUE; | |
1554 | |
1555 #ifdef FEAT_SEARCHPATH | |
1556 case Ctrl_F: /* Filename under cursor */ | |
1557 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
1558 if (!errmsg) | |
1559 return FALSE; | |
1560 *argp = file_name_at_cursor(FNAME_MESS | FNAME_HYP | |
681 | 1561 | (regname == Ctrl_P ? FNAME_EXP : 0), 1L, NULL); |
7 | 1562 *allocated = TRUE; |
1563 return TRUE; | |
1564 #endif | |
1565 | |
1566 case Ctrl_W: /* word under cursor */ | |
1567 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
1568 if (!errmsg) | |
1569 return FALSE; | |
1570 cnt = find_ident_under_cursor(argp, regname == Ctrl_W | |
1571 ? (FIND_IDENT|FIND_STRING) : FIND_STRING); | |
1572 *argp = cnt ? vim_strnsave(*argp, cnt) : NULL; | |
1573 *allocated = TRUE; | |
1574 return TRUE; | |
1575 | |
13831
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1576 case Ctrl_L: /* Line under cursor */ |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1577 if (!errmsg) |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1578 return FALSE; |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1579 |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1580 *argp = ml_get_buf(curwin->w_buffer, |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1581 curwin->w_cursor.lnum, FALSE); |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1582 return TRUE; |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1583 |
7 | 1584 case '_': /* black hole: always empty */ |
1585 *argp = (char_u *)""; | |
1586 return TRUE; | |
1587 } | |
1588 | |
1589 return FALSE; | |
1590 } | |
1591 | |
1592 /* | |
15 | 1593 * Paste a yank register into the command line. |
1594 * Only for non-special registers. | |
1595 * Used by CTRL-R command in command-line mode | |
7 | 1596 * insert_reg() can't be used here, because special characters from the |
1597 * register contents will be interpreted as commands. | |
1598 * | |
1599 * return FAIL for failure, OK otherwise | |
1600 */ | |
1601 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1602 cmdline_paste_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1603 int regname, |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1604 int literally_arg, /* Insert text literally instead of "as typed" */ |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1605 int remcr) /* don't add CR characters */ |
7 | 1606 { |
1607 long i; | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1608 int literally = literally_arg; |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1609 |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1610 if (get_yank_register(regname, FALSE)) |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1611 literally = TRUE; |
7 | 1612 if (y_current->y_array == NULL) |
1613 return FAIL; | |
1614 | |
1615 for (i = 0; i < y_current->y_size; ++i) | |
1616 { | |
1617 cmdline_paste_str(y_current->y_array[i], literally); | |
1618 | |
1015 | 1619 /* 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
|
1620 * 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
|
1621 if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr) |
7 | 1622 cmdline_paste_str((char_u *)"\r", literally); |
1623 | |
1624 /* Check for CTRL-C, in case someone tries to paste a few thousand | |
1625 * lines and gets bored. */ | |
1626 ui_breakcheck(); | |
1627 if (got_int) | |
1628 return FAIL; | |
1629 } | |
1630 return OK; | |
1631 } | |
1632 | |
1633 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
1634 /* | |
1635 * Adjust the register name pointed to with "rp" for the clipboard being | |
1636 * used always and the clipboard being available. | |
1637 */ | |
1638 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1639 adjust_clip_reg(int *rp) |
7 | 1640 { |
2654 | 1641 /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', |
1642 * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ | |
6116 | 1643 if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0)) |
1644 { | |
1645 if (clip_unnamed != 0) | |
1646 *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
2654 | 1647 ? '+' : '*'; |
6116 | 1648 else |
1649 *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
1650 ? '+' : '*'; | |
1651 } | |
7 | 1652 if (!clip_star.available && *rp == '*') |
1653 *rp = 0; | |
1654 if (!clip_plus.available && *rp == '+') | |
1655 *rp = 0; | |
1656 } | |
1657 #endif | |
1658 | |
1659 /* | |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1660 * Shift the delete registers: "9 is cleared, "8 becomes "9, etc. |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1661 */ |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1662 void |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1663 shift_delete_registers() |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1664 { |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1665 int n; |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1666 |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1667 y_current = &y_regs[9]; |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1668 free_yank_all(); /* free register nine */ |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1669 for (n = 9; n > 1; --n) |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1670 y_regs[n] = y_regs[n - 1]; |
11597
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1671 y_current = &y_regs[1]; |
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1672 if (!y_append) |
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1673 y_previous = y_current; |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1674 y_regs[1].y_array = NULL; /* set register one to empty */ |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1675 } |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1676 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1677 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1678 static void |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1679 yank_do_autocmd(oparg_T *oap, yankreg_T *reg) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1680 { |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1681 static int recursive = FALSE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1682 dict_T *v_event; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1683 list_T *list; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1684 int n; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1685 char_u buf[NUMBUFLEN + 2]; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1686 long reglen = 0; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1687 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1688 if (recursive) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1689 return; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1690 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1691 v_event = get_vim_var_dict(VV_EVENT); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1692 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1693 list = list_alloc(); |
13254
88cc06dc1a50
patch 8.0.1501: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1694 if (list == NULL) |
88cc06dc1a50
patch 8.0.1501: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1695 return; |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1696 for (n = 0; n < reg->y_size; n++) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1697 list_append_string(list, reg->y_array[n], -1); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1698 list->lv_lock = VAR_FIXED; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1699 dict_add_list(v_event, "regcontents", list); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1700 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1701 buf[0] = (char_u)oap->regname; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1702 buf[1] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1703 dict_add_nr_str(v_event, "regname", 0, buf); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1704 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1705 buf[0] = get_op_char(oap->op_type); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1706 buf[1] = get_extra_op_char(oap->op_type); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1707 buf[2] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1708 dict_add_nr_str(v_event, "operator", 0, buf); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1709 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1710 buf[0] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1711 buf[1] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1712 switch (get_reg_type(oap->regname, ®len)) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1713 { |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1714 case MLINE: buf[0] = 'V'; break; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1715 case MCHAR: buf[0] = 'v'; break; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1716 case MBLOCK: |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1717 vim_snprintf((char *)buf, sizeof(buf), "%c%ld", Ctrl_V, |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1718 reglen + 1); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1719 break; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1720 } |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1721 dict_add_nr_str(v_event, "regtype", 0, buf); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1722 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1723 /* Lock the dictionary and its keys */ |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1724 dict_set_items_ro(v_event); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1725 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1726 recursive = TRUE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1727 textlock++; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1728 apply_autocmds(EVENT_TEXTYANKPOST, NULL, NULL, FALSE, curbuf); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1729 textlock--; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1730 recursive = FALSE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1731 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1732 /* Empty the dictionary, v:event is still valid */ |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1733 dict_free_contents(v_event); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1734 hash_init(&v_event->dv_hashtab); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1735 } |
13047
669c4f75a69e
patch 8.0.1399: warnings and errors when building tiny version
Christian Brabandt <cb@256bit.org>
parents:
13037
diff
changeset
|
1736 #endif |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1737 |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1738 /* |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1739 * Handle a delete operation. |
7 | 1740 * |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1741 * Return FAIL if undo failed, OK otherwise. |
7 | 1742 */ |
1743 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1744 op_delete(oparg_T *oap) |
7 | 1745 { |
1746 int n; | |
1747 linenr_T lnum; | |
1748 char_u *ptr; | |
1749 char_u *newp, *oldp; | |
1750 struct block_def bd; | |
1751 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
1752 int did_yank = FALSE; | |
3782 | 1753 int orig_regname = oap->regname; |
7 | 1754 |
1755 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
1756 return OK; | |
1757 | |
1758 /* Nothing to delete, return here. Do prepare undo, for op_change(). */ | |
1759 if (oap->empty) | |
1760 return u_save_cursor(); | |
1761 | |
1762 if (!curbuf->b_p_ma) | |
1763 { | |
1764 EMSG(_(e_modifiable)); | |
1765 return FAIL; | |
1766 } | |
1767 | |
1768 #ifdef FEAT_CLIPBOARD | |
1769 adjust_clip_reg(&oap->regname); | |
1770 #endif | |
1771 | |
1772 #ifdef FEAT_MBYTE | |
1773 if (has_mbyte) | |
1774 mb_adjust_opend(oap); | |
1775 #endif | |
1776 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1777 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1778 * 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
|
1779 * 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
|
1780 * 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
|
1781 */ |
7 | 1782 if ( oap->motion_type == MCHAR |
1783 && !oap->is_VIsual | |
50 | 1784 && !oap->block_mode |
7 | 1785 && oap->line_count > 1 |
3254 | 1786 && oap->motion_force == NUL |
7 | 1787 && oap->op_type == OP_DELETE) |
1788 { | |
2957 | 1789 ptr = ml_get(oap->end.lnum) + oap->end.col; |
1790 if (*ptr != NUL) | |
1791 ptr += oap->inclusive; | |
7 | 1792 ptr = skipwhite(ptr); |
1793 if (*ptr == NUL && inindent(0)) | |
1794 oap->motion_type = MLINE; | |
1795 } | |
1796 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1797 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1798 * 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
|
1799 * 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
|
1800 */ |
7 | 1801 if ( oap->motion_type == MCHAR |
1802 && oap->line_count == 1 | |
1803 && oap->op_type == OP_DELETE | |
1804 && *ml_get(oap->start.lnum) == NUL) | |
1805 { | |
1806 /* | |
446 | 1807 * It's an error to operate on an empty region, when 'E' included in |
7 | 1808 * 'cpoptions' (Vi compatible). |
1809 */ | |
446 | 1810 #ifdef FEAT_VIRTUALEDIT |
1811 if (virtual_op) | |
1812 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
1813 * marks as if it happened. */ | |
1814 goto setmarks; | |
1815 #endif | |
7 | 1816 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
1817 beep_flush(); | |
1818 return OK; | |
1819 } | |
1820 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1821 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1822 * 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
|
1823 * 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
|
1824 * 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
|
1825 */ |
7 | 1826 if (oap->regname != '_') |
1827 { | |
1828 if (oap->regname != 0) | |
1829 { | |
1830 /* check for read-only register */ | |
1831 if (!valid_yank_reg(oap->regname, TRUE)) | |
1832 { | |
1833 beep_flush(); | |
1834 return OK; | |
1835 } | |
1836 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
1837 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
1838 did_yank = TRUE; | |
1839 } | |
1840 | |
1841 /* | |
1842 * Put deleted text into register 1 and shift number registers if the | |
1843 * delete contains a line break, or when a regname has been specified. | |
3782 | 1844 * Use the register name from before adjust_clip_reg() may have |
1845 * changed it. | |
7 | 1846 */ |
3782 | 1847 if (orig_regname != 0 || oap->motion_type == MLINE |
7 | 1848 || oap->line_count > 1 || oap->use_reg_one) |
1849 { | |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1850 shift_delete_registers(); |
7 | 1851 if (op_yank(oap, TRUE, FALSE) == OK) |
1852 did_yank = TRUE; | |
1853 } | |
1854 | |
3468 | 1855 /* Yank into small delete register when no named register specified |
1856 * and the delete is within one line. */ | |
1857 if (( | |
1858 #ifdef FEAT_CLIPBOARD | |
3584 | 1859 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
1860 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
3468 | 1861 #endif |
1862 oap->regname == 0) && oap->motion_type != MLINE | |
7 | 1863 && oap->line_count == 1) |
1864 { | |
1865 oap->regname = '-'; | |
1866 get_yank_register(oap->regname, TRUE); | |
1867 if (op_yank(oap, TRUE, FALSE) == OK) | |
1868 did_yank = TRUE; | |
1869 oap->regname = 0; | |
1870 } | |
1871 | |
1872 /* | |
1873 * If there's too much stuff to fit in the yank register, then get a | |
1874 * confirmation before doing the delete. This is crude, but simple. | |
1875 * And it avoids doing a delete of something we can't put back if we | |
1876 * want. | |
1877 */ | |
1878 if (!did_yank) | |
1879 { | |
1880 int msg_silent_save = msg_silent; | |
1881 | |
1882 msg_silent = 0; /* must display the prompt */ | |
1883 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
1884 msg_silent = msg_silent_save; | |
1885 if (n != 'y') | |
1886 { | |
1887 EMSG(_(e_abort)); | |
1888 return FAIL; | |
1889 } | |
1890 } | |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1891 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1892 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1893 if (did_yank && has_textyankpost()) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1894 yank_do_autocmd(oap, y_current); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1895 #endif |
7 | 1896 } |
1897 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1898 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1899 * 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
|
1900 */ |
7 | 1901 if (oap->block_mode) |
1902 { | |
1903 if (u_save((linenr_T)(oap->start.lnum - 1), | |
1904 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
1905 return FAIL; | |
1906 | |
1907 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
1908 { | |
1909 block_prep(oap, &bd, lnum, TRUE); | |
1910 if (bd.textlen == 0) /* nothing to delete */ | |
1911 continue; | |
1912 | |
1913 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
1914 if (lnum == curwin->w_cursor.lnum) | |
1915 { | |
1916 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
1917 # ifdef FEAT_VIRTUALEDIT | |
1918 curwin->w_cursor.coladd = 0; | |
1919 # endif | |
1920 } | |
1921 | |
1922 /* n == number of chars deleted | |
1923 * If we delete a TAB, it may be replaced by several characters. | |
1924 * Thus the number of characters may increase! | |
1925 */ | |
1926 n = bd.textlen - bd.startspaces - bd.endspaces; | |
1927 oldp = ml_get(lnum); | |
1928 newp = alloc_check((unsigned)STRLEN(oldp) + 1 - n); | |
1929 if (newp == NULL) | |
1930 continue; | |
1931 /* copy up to deleted part */ | |
1932 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
1933 /* insert spaces */ | |
6929 | 1934 vim_memset(newp + bd.textcol, ' ', |
7 | 1935 (size_t)(bd.startspaces + bd.endspaces)); |
1936 /* copy the part after the deleted part */ | |
1937 oldp += bd.textcol + bd.textlen; | |
1622 | 1938 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
7 | 1939 /* replace the line */ |
1940 ml_replace(lnum, newp, FALSE); | |
1941 } | |
1942 | |
1943 check_cursor_col(); | |
1944 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
1945 oap->end.lnum + 1, 0L); | |
1946 oap->line_count = 0; /* no lines deleted */ | |
1947 } | |
5735 | 1948 else if (oap->motion_type == MLINE) |
7 | 1949 { |
1950 if (oap->op_type == OP_CHANGE) | |
1951 { | |
1952 /* Delete the lines except the first one. Temporarily move the | |
1953 * cursor to the next line. Save the current line number, if the | |
1954 * last line is deleted it may be changed. | |
1955 */ | |
1956 if (oap->line_count > 1) | |
1957 { | |
1958 lnum = curwin->w_cursor.lnum; | |
1959 ++curwin->w_cursor.lnum; | |
1960 del_lines((long)(oap->line_count - 1), TRUE); | |
1961 curwin->w_cursor.lnum = lnum; | |
1962 } | |
1963 if (u_save_cursor() == FAIL) | |
1964 return FAIL; | |
1965 if (curbuf->b_p_ai) /* don't delete indent */ | |
1966 { | |
1967 beginline(BL_WHITE); /* cursor on first non-white */ | |
1968 did_ai = TRUE; /* delete the indent when ESC hit */ | |
1969 ai_col = curwin->w_cursor.col; | |
1970 } | |
1971 else | |
1972 beginline(0); /* cursor in column 0 */ | |
1973 truncate_line(FALSE); /* delete the rest of the line */ | |
1974 /* leave cursor past last char in line */ | |
1975 if (oap->line_count > 1) | |
1976 u_clearline(); /* "U" command not possible after "2cc" */ | |
1977 } | |
1978 else | |
1979 { | |
1980 del_lines(oap->line_count, TRUE); | |
1981 beginline(BL_WHITE | BL_FIX); | |
1982 u_clearline(); /* "U" command not possible after "dd" */ | |
1983 } | |
1984 } | |
1985 else | |
1986 { | |
1987 #ifdef FEAT_VIRTUALEDIT | |
1988 if (virtual_op) | |
1989 { | |
1990 int endcol = 0; | |
1991 | |
1992 /* For virtualedit: break the tabs that are partly included. */ | |
1993 if (gchar_pos(&oap->start) == '\t') | |
1994 { | |
1995 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
1996 return FAIL; | |
1997 if (oap->line_count == 1) | |
1998 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
1999 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
2000 oap->start = curwin->w_cursor; | |
2001 if (oap->line_count == 1) | |
2002 { | |
2003 coladvance(endcol); | |
2004 oap->end.col = curwin->w_cursor.col; | |
2005 oap->end.coladd = curwin->w_cursor.coladd; | |
2006 curwin->w_cursor = oap->start; | |
2007 } | |
2008 } | |
2009 | |
2010 /* Break a tab only when it's included in the area. */ | |
2011 if (gchar_pos(&oap->end) == '\t' | |
2012 && (int)oap->end.coladd < oap->inclusive) | |
2013 { | |
2014 /* save last line for undo */ | |
2015 if (u_save((linenr_T)(oap->end.lnum - 1), | |
2016 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2017 return FAIL; | |
2018 curwin->w_cursor = oap->end; | |
2019 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
2020 oap->end = curwin->w_cursor; | |
2021 curwin->w_cursor = oap->start; | |
2022 } | |
2023 } | |
2024 #endif | |
2025 | |
2026 if (oap->line_count == 1) /* delete characters within one line */ | |
2027 { | |
2028 if (u_save_cursor() == FAIL) /* save line for undo */ | |
2029 return FAIL; | |
2030 | |
2031 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
5735 | 2032 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
7 | 2033 && oap->op_type == OP_CHANGE |
2034 && oap->end.lnum == curwin->w_cursor.lnum | |
5735 | 2035 && !oap->is_VIsual) |
7 | 2036 display_dollar(oap->end.col - !oap->inclusive); |
2037 | |
2038 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
2039 | |
2040 #ifdef FEAT_VIRTUALEDIT | |
2041 if (virtual_op) | |
2042 { | |
2043 /* fix up things for virtualedit-delete: | |
2044 * break the tabs which are going to get in our way | |
2045 */ | |
2046 char_u *curline = ml_get_curline(); | |
2047 int len = (int)STRLEN(curline); | |
2048 | |
2049 if (oap->end.coladd != 0 | |
2050 && (int)oap->end.col >= len - 1 | |
2051 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
2052 n++; | |
2053 /* Delete at least one char (e.g, when on a control char). */ | |
2054 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
2055 n = 1; | |
2056 | |
2057 /* When deleted a char in the line, reset coladd. */ | |
2058 if (gchar_cursor() != NUL) | |
2059 curwin->w_cursor.coladd = 0; | |
2060 } | |
2061 #endif | |
6826 | 2062 (void)del_bytes((long)n, !virtual_op, |
2063 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
7 | 2064 } |
2065 else /* delete characters between lines */ | |
2066 { | |
2067 pos_T curpos; | |
2068 | |
2069 /* save deleted and changed lines for undo */ | |
2070 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
2071 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
2072 return FAIL; | |
2073 | |
2074 truncate_line(TRUE); /* delete from cursor to end of line */ | |
2075 | |
2076 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
2077 ++curwin->w_cursor.lnum; | |
2078 del_lines((long)(oap->line_count - 2), FALSE); | |
2079 | |
6826 | 2080 /* delete from start of line until op_end */ |
2957 | 2081 n = (oap->end.col + 1 - !oap->inclusive); |
6826 | 2082 curwin->w_cursor.col = 0; |
2083 (void)del_bytes((long)n, !virtual_op, | |
2084 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
2085 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
2086 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
7 | 2087 } |
2088 } | |
2089 | |
2090 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
2091 | |
446 | 2092 #ifdef FEAT_VIRTUALEDIT |
2093 setmarks: | |
2094 #endif | |
7 | 2095 if (oap->block_mode) |
2096 { | |
2097 curbuf->b_op_end.lnum = oap->end.lnum; | |
2098 curbuf->b_op_end.col = oap->start.col; | |
2099 } | |
2100 else | |
2101 curbuf->b_op_end = oap->start; | |
2102 curbuf->b_op_start = oap->start; | |
2103 | |
2104 return OK; | |
2105 } | |
2106 | |
2107 #ifdef FEAT_MBYTE | |
2108 /* | |
2109 * Adjust end of operating area for ending on a multi-byte character. | |
2110 * Used for deletion. | |
2111 */ | |
2112 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2113 mb_adjust_opend(oparg_T *oap) |
7 | 2114 { |
2115 char_u *p; | |
2116 | |
2117 if (oap->inclusive) | |
2118 { | |
2119 p = ml_get(oap->end.lnum); | |
2120 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
2121 } | |
2122 } | |
2123 #endif | |
2124 | |
2125 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
2126 /* | |
2127 * Replace a whole area with one character. | |
2128 */ | |
2129 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2130 op_replace(oparg_T *oap, int c) |
7 | 2131 { |
2132 int n, numc; | |
2133 #ifdef FEAT_MBYTE | |
2134 int num_chars; | |
2135 #endif | |
2136 char_u *newp, *oldp; | |
2137 size_t oldlen; | |
2138 struct block_def bd; | |
5428 | 2139 char_u *after_p = NULL; |
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2140 int had_ctrl_v_cr = FALSE; |
7 | 2141 |
2142 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
2143 return OK; /* nothing to do */ | |
2144 | |
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2145 if (c == REPLACE_CR_NCHAR) |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2146 { |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2147 had_ctrl_v_cr = TRUE; |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2148 c = CAR; |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2149 } |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2150 else if (c == REPLACE_NL_NCHAR) |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2151 { |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2152 had_ctrl_v_cr = TRUE; |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2153 c = NL; |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2154 } |
5428 | 2155 |
7 | 2156 #ifdef FEAT_MBYTE |
2157 if (has_mbyte) | |
2158 mb_adjust_opend(oap); | |
2159 #endif | |
2160 | |
2161 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2162 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2163 return FAIL; | |
2164 | |
2165 /* | |
2166 * block mode replace | |
2167 */ | |
2168 if (oap->block_mode) | |
2169 { | |
2170 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2171 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
2172 { | |
1982 | 2173 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
7 | 2174 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
2175 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
2176 continue; /* nothing to replace */ | |
2177 | |
2178 /* n == number of extra chars required | |
2179 * If we split a TAB, it may be replaced by several characters. | |
2180 * Thus the number of characters may increase! | |
2181 */ | |
2182 #ifdef FEAT_VIRTUALEDIT | |
2183 /* If the range starts in virtual space, count the initial | |
2184 * coladd offset as part of "startspaces" */ | |
2185 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
2186 { | |
2187 pos_T vpos; | |
2188 | |
1982 | 2189 vpos.lnum = curwin->w_cursor.lnum; |
7 | 2190 getvpos(&vpos, oap->start_vcol); |
2191 bd.startspaces += vpos.coladd; | |
2192 n = bd.startspaces; | |
2193 } | |
2194 else | |
2195 #endif | |
2196 /* allow for pre spaces */ | |
2197 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
2198 | |
2199 /* allow for post spp */ | |
2200 n += (bd.endspaces | |
2201 #ifdef FEAT_VIRTUALEDIT | |
2202 && !bd.is_oneChar | |
2203 #endif | |
2204 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
2205 /* Figure out how many characters to replace. */ | |
2206 numc = oap->end_vcol - oap->start_vcol + 1; | |
2207 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
2208 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
2209 | |
2210 #ifdef FEAT_MBYTE | |
2211 /* A double-wide character can be replaced only up to half the | |
2212 * times. */ | |
2213 if ((*mb_char2cells)(c) > 1) | |
2214 { | |
2215 if ((numc & 1) && !bd.is_short) | |
2216 { | |
2217 ++bd.endspaces; | |
2218 ++n; | |
2219 } | |
2220 numc = numc / 2; | |
2221 } | |
2222 | |
2223 /* Compute bytes needed, move character count to num_chars. */ | |
2224 num_chars = numc; | |
2225 numc *= (*mb_char2len)(c); | |
2226 #endif | |
2227 /* oldlen includes textlen, so don't double count */ | |
2228 n += numc - bd.textlen; | |
2229 | |
2230 oldp = ml_get_curline(); | |
2231 oldlen = STRLEN(oldp); | |
2232 newp = alloc_check((unsigned)oldlen + 1 + n); | |
2233 if (newp == NULL) | |
2234 continue; | |
2235 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
2236 /* copy up to deleted part */ | |
2237 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2238 oldp += bd.textcol + bd.textlen; | |
2239 /* insert pre-spaces */ | |
6929 | 2240 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
7 | 2241 /* insert replacement chars CHECK FOR ALLOCATED SPACE */ |
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2242 /* REPLACE_CR_NCHAR/REPLACE_NL_NCHAR is used for entering CR |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2243 * literally. */ |
5428 | 2244 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) |
7 | 2245 { |
5428 | 2246 #ifdef FEAT_MBYTE |
2247 if (has_mbyte) | |
2248 { | |
2249 n = (int)STRLEN(newp); | |
2250 while (--num_chars >= 0) | |
2251 n += (*mb_char2bytes)(c, newp + n); | |
2252 } | |
2253 else | |
2254 #endif | |
6929 | 2255 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
5428 | 2256 if (!bd.is_short) |
2257 { | |
2258 /* insert post-spaces */ | |
6929 | 2259 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
5428 | 2260 /* copy the part after the changed part */ |
2261 STRMOVE(newp + STRLEN(newp), oldp); | |
2262 } | |
7 | 2263 } |
2264 else | |
2265 { | |
5428 | 2266 /* Replacing with \r or \n means splitting the line. */ |
5475 | 2267 after_p = alloc_check( |
2268 (unsigned)(oldlen + 1 + n - STRLEN(newp))); | |
5428 | 2269 if (after_p != NULL) |
2270 STRMOVE(after_p, oldp); | |
7 | 2271 } |
2272 /* replace the line */ | |
2273 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
5428 | 2274 if (after_p != NULL) |
2275 { | |
2276 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
2277 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
2278 oap->end.lnum++; | |
2279 vim_free(after_p); | |
2280 } | |
7 | 2281 } |
2282 } | |
2283 else | |
2284 { | |
2285 /* | |
2286 * MCHAR and MLINE motion replace. | |
2287 */ | |
2288 if (oap->motion_type == MLINE) | |
2289 { | |
2290 oap->start.col = 0; | |
2291 curwin->w_cursor.col = 0; | |
2292 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2293 if (oap->end.col) | |
2294 --oap->end.col; | |
2295 } | |
2296 else if (!oap->inclusive) | |
2297 dec(&(oap->end)); | |
2298 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2299 while (LTOREQ_POS(curwin->w_cursor, oap->end)) |
7 | 2300 { |
2301 n = gchar_cursor(); | |
2302 if (n != NUL) | |
2303 { | |
2304 #ifdef FEAT_MBYTE | |
2305 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
2306 { | |
2307 /* This is slow, but it handles replacing a single-byte | |
2308 * with a multi-byte and the other way around. */ | |
4203 | 2309 if (curwin->w_cursor.lnum == oap->end.lnum) |
2310 oap->end.col += (*mb_char2len)(c) - (*mb_char2len)(n); | |
7 | 2311 n = State; |
2312 State = REPLACE; | |
2313 ins_char(c); | |
2314 State = n; | |
2315 /* Backup to the replaced character. */ | |
2316 dec_cursor(); | |
2317 } | |
2318 else | |
2319 #endif | |
2320 { | |
2321 #ifdef FEAT_VIRTUALEDIT | |
2322 if (n == TAB) | |
2323 { | |
2324 int end_vcol = 0; | |
2325 | |
2326 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2327 { | |
2328 /* oap->end has to be recalculated when | |
2329 * the tab breaks */ | |
2330 end_vcol = getviscol2(oap->end.col, | |
2331 oap->end.coladd); | |
2332 } | |
2333 coladvance_force(getviscol()); | |
2334 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2335 getvpos(&oap->end, end_vcol); | |
2336 } | |
2337 #endif | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2338 PCHAR(curwin->w_cursor, c); |
7 | 2339 } |
2340 } | |
2341 #ifdef FEAT_VIRTUALEDIT | |
2342 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
2343 { | |
2344 int virtcols = oap->end.coladd; | |
2345 | |
2346 if (curwin->w_cursor.lnum == oap->start.lnum | |
2347 && oap->start.col == oap->end.col && oap->start.coladd) | |
2348 virtcols -= oap->start.coladd; | |
2349 | |
2350 /* oap->end has been trimmed so it's effectively inclusive; | |
2351 * as a result an extra +1 must be counted so we don't | |
2352 * trample the NUL byte. */ | |
2353 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
2354 curwin->w_cursor.col -= (virtcols + 1); | |
2355 for (; virtcols >= 0; virtcols--) | |
2356 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2357 PCHAR(curwin->w_cursor, c); |
7 | 2358 if (inc(&curwin->w_cursor) == -1) |
2359 break; | |
2360 } | |
2361 } | |
2362 #endif | |
2363 | |
2364 /* Advance to next character, stop at the end of the file. */ | |
2365 if (inc_cursor() == -1) | |
2366 break; | |
2367 } | |
2368 } | |
2369 | |
2370 curwin->w_cursor = oap->start; | |
2371 check_cursor(); | |
2372 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
2373 | |
2374 /* Set "'[" and "']" marks. */ | |
2375 curbuf->b_op_start = oap->start; | |
2376 curbuf->b_op_end = oap->end; | |
2377 | |
2378 return OK; | |
2379 } | |
2380 #endif | |
2381 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2382 static int swapchars(int op_type, pos_T *pos, int length); |
1525 | 2383 |
7 | 2384 /* |
2385 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
2386 */ | |
2387 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2388 op_tilde(oparg_T *oap) |
7 | 2389 { |
2390 pos_T pos; | |
2391 struct block_def bd; | |
1528 | 2392 int did_change = FALSE; |
7 | 2393 |
2394 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2395 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2396 return; | |
2397 | |
2398 pos = oap->start; | |
2399 if (oap->block_mode) /* Visual block mode */ | |
2400 { | |
2401 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
2402 { | |
1766 | 2403 int one_change; |
2404 | |
7 | 2405 block_prep(oap, &bd, pos.lnum, FALSE); |
2406 pos.col = bd.textcol; | |
1766 | 2407 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
2408 did_change |= one_change; | |
1525 | 2409 |
5735 | 2410 #ifdef FEAT_NETBEANS_INTG |
2210 | 2411 if (netbeans_active() && one_change) |
7 | 2412 { |
2413 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2414 | |
33 | 2415 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
2416 (long)bd.textlen); | |
7 | 2417 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
2210 | 2418 &ptr[bd.textcol], bd.textlen); |
7 | 2419 } |
5735 | 2420 #endif |
7 | 2421 } |
2422 if (did_change) | |
2423 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
2424 } | |
2425 else /* not block mode */ | |
2426 { | |
2427 if (oap->motion_type == MLINE) | |
2428 { | |
2429 oap->start.col = 0; | |
2430 pos.col = 0; | |
2431 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2432 if (oap->end.col) | |
2433 --oap->end.col; | |
2434 } | |
2435 else if (!oap->inclusive) | |
2436 dec(&(oap->end)); | |
2437 | |
1528 | 2438 if (pos.lnum == oap->end.lnum) |
2439 did_change = swapchars(oap->op_type, &pos, | |
2440 oap->end.col - pos.col + 1); | |
2441 else | |
2442 for (;;) | |
2443 { | |
2444 did_change |= swapchars(oap->op_type, &pos, | |
2445 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
2446 (int)STRLEN(ml_get_pos(&pos))); | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2447 if (LTOREQ_POS(oap->end, pos) || inc(&pos) == -1) |
1528 | 2448 break; |
2449 } | |
7 | 2450 if (did_change) |
2451 { | |
2452 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
2453 0L); | |
2454 #ifdef FEAT_NETBEANS_INTG | |
2210 | 2455 if (netbeans_active() && did_change) |
7 | 2456 { |
2457 char_u *ptr; | |
2458 int count; | |
2459 | |
2460 pos = oap->start; | |
2461 while (pos.lnum < oap->end.lnum) | |
2462 { | |
2463 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
835 | 2464 count = (int)STRLEN(ptr) - pos.col; |
33 | 2465 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2466 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2467 &ptr[pos.col], count); |
7 | 2468 pos.col = 0; |
2469 pos.lnum++; | |
2470 } | |
2471 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2472 count = oap->end.col - pos.col + 1; | |
33 | 2473 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2474 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2475 &ptr[pos.col], count); |
7 | 2476 } |
2477 #endif | |
2478 } | |
2479 } | |
2480 | |
2481 if (!did_change && oap->is_VIsual) | |
2482 /* No change: need to remove the Visual selection */ | |
2483 redraw_curbuf_later(INVERTED); | |
2484 | |
2485 /* | |
2486 * Set '[ and '] marks. | |
2487 */ | |
2488 curbuf->b_op_start = oap->start; | |
2489 curbuf->b_op_end = oap->end; | |
2490 | |
2491 if (oap->line_count > p_report) | |
2492 { | |
2493 if (oap->line_count == 1) | |
2494 MSG(_("1 line changed")); | |
2495 else | |
2496 smsg((char_u *)_("%ld lines changed"), oap->line_count); | |
2497 } | |
2498 } | |
2499 | |
2500 /* | |
1525 | 2501 * Invoke swapchar() on "length" bytes at position "pos". |
2502 * "pos" is advanced to just after the changed characters. | |
2503 * "length" is rounded up to include the whole last multi-byte character. | |
2504 * Also works correctly when the number of bytes changes. | |
2505 * Returns TRUE if some character was changed. | |
2506 */ | |
2507 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2508 swapchars(int op_type, pos_T *pos, int length) |
1525 | 2509 { |
2510 int todo; | |
2511 int did_change = 0; | |
2512 | |
2513 for (todo = length; todo > 0; --todo) | |
2514 { | |
2515 # ifdef FEAT_MBYTE | |
2516 if (has_mbyte) | |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2517 { |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2518 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2519 |
1525 | 2520 /* we're counting bytes, not characters */ |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2521 if (len > 0) |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2522 todo -= len - 1; |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2523 } |
1525 | 2524 # endif |
2525 did_change |= swapchar(op_type, pos); | |
2526 if (inc(pos) == -1) /* at end of file */ | |
2527 break; | |
2528 } | |
2529 return did_change; | |
2530 } | |
2531 | |
2532 /* | |
7 | 2533 * If op_type == OP_UPPER: make uppercase, |
2534 * if op_type == OP_LOWER: make lowercase, | |
2535 * if op_type == OP_ROT13: do rot13 encoding, | |
2536 * else swap case of character at 'pos' | |
2537 * returns TRUE when something actually changed. | |
2538 */ | |
2539 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2540 swapchar(int op_type, pos_T *pos) |
7 | 2541 { |
2542 int c; | |
2543 int nc; | |
2544 | |
2545 c = gchar_pos(pos); | |
2546 | |
2547 /* Only do rot13 encoding for ASCII characters. */ | |
2548 if (c >= 0x80 && op_type == OP_ROT13) | |
2549 return FALSE; | |
2550 | |
2551 #ifdef FEAT_MBYTE | |
1525 | 2552 if (op_type == OP_UPPER && c == 0xdf |
2553 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
493 | 2554 { |
2555 pos_T sp = curwin->w_cursor; | |
2556 | |
2557 /* Special handling of German sharp s: change to "SS". */ | |
2558 curwin->w_cursor = *pos; | |
2559 del_char(FALSE); | |
2560 ins_char('S'); | |
2561 ins_char('S'); | |
2562 curwin->w_cursor = sp; | |
2563 inc(pos); | |
2564 } | |
2565 | |
7 | 2566 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
2567 return FALSE; | |
2568 #endif | |
2569 nc = c; | |
2570 if (MB_ISLOWER(c)) | |
2571 { | |
2572 if (op_type == OP_ROT13) | |
2573 nc = ROT13(c, 'a'); | |
2574 else if (op_type != OP_LOWER) | |
2575 nc = MB_TOUPPER(c); | |
2576 } | |
2577 else if (MB_ISUPPER(c)) | |
2578 { | |
2579 if (op_type == OP_ROT13) | |
2580 nc = ROT13(c, 'A'); | |
2581 else if (op_type != OP_UPPER) | |
2582 nc = MB_TOLOWER(c); | |
2583 } | |
2584 if (nc != c) | |
2585 { | |
2586 #ifdef FEAT_MBYTE | |
2587 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
2588 { | |
2589 pos_T sp = curwin->w_cursor; | |
2590 | |
2591 curwin->w_cursor = *pos; | |
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2592 /* 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
|
2593 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
7 | 2594 ins_char(nc); |
2595 curwin->w_cursor = sp; | |
2596 } | |
2597 else | |
2598 #endif | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2599 PCHAR(*pos, nc); |
7 | 2600 return TRUE; |
2601 } | |
2602 return FALSE; | |
2603 } | |
2604 | |
2605 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
2606 /* | |
2607 * op_insert - Insert and append operators for Visual mode. | |
2608 */ | |
2609 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2610 op_insert(oparg_T *oap, long count1) |
7 | 2611 { |
2612 long ins_len, pre_textlen = 0; | |
2613 char_u *firstline, *ins_text; | |
12329
0b10cff73322
patch 8.0.1044: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12327
diff
changeset
|
2614 colnr_T ind_pre = 0, ind_post; |
7 | 2615 struct block_def bd; |
2616 int i; | |
6579 | 2617 pos_T t1; |
7 | 2618 |
2619 /* edit() changes this - record it for OP_APPEND */ | |
2620 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2621 | |
2622 /* vis block is still marked. Get rid of it now. */ | |
2623 curwin->w_cursor.lnum = oap->start.lnum; | |
2624 update_screen(INVERTED); | |
2625 | |
2626 if (oap->block_mode) | |
2627 { | |
2628 #ifdef FEAT_VIRTUALEDIT | |
2629 /* When 'virtualedit' is used, need to insert the extra spaces before | |
2630 * doing block_prep(). When only "block" is used, virtual edit is | |
2631 * already disabled, but still need it when calling | |
2632 * coladvance_force(). */ | |
2633 if (curwin->w_cursor.coladd > 0) | |
2634 { | |
2635 int old_ve_flags = ve_flags; | |
2636 | |
2637 ve_flags = VE_ALL; | |
2638 if (u_save_cursor() == FAIL) | |
2639 return; | |
2640 coladvance_force(oap->op_type == OP_APPEND | |
2641 ? oap->end_vcol + 1 : getviscol()); | |
2642 if (oap->op_type == OP_APPEND) | |
2643 --curwin->w_cursor.col; | |
2644 ve_flags = old_ve_flags; | |
2645 } | |
2646 #endif | |
2647 /* Get the info about the block before entering the text */ | |
2648 block_prep(oap, &bd, oap->start.lnum, TRUE); | |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2649 /* Get indent information */ |
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2650 ind_pre = (colnr_T)getwhitecols_curline(); |
7 | 2651 firstline = ml_get(oap->start.lnum) + bd.textcol; |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2652 |
7 | 2653 if (oap->op_type == OP_APPEND) |
2654 firstline += bd.textlen; | |
2655 pre_textlen = (long)STRLEN(firstline); | |
2656 } | |
2657 | |
2658 if (oap->op_type == OP_APPEND) | |
2659 { | |
2660 if (oap->block_mode | |
2661 #ifdef FEAT_VIRTUALEDIT | |
2662 && curwin->w_cursor.coladd == 0 | |
2663 #endif | |
2664 ) | |
2665 { | |
2666 /* Move the cursor to the character right of the block. */ | |
2667 curwin->w_set_curswant = TRUE; | |
2668 while (*ml_get_cursor() != NUL | |
2669 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
2670 ++curwin->w_cursor.col; | |
2671 if (bd.is_short && !bd.is_MAX) | |
2672 { | |
2673 /* First line was too short, make it longer and adjust the | |
2674 * values in "bd". */ | |
2675 if (u_save_cursor() == FAIL) | |
2676 return; | |
2677 for (i = 0; i < bd.endspaces; ++i) | |
2678 ins_char(' '); | |
2679 bd.textlen += bd.endspaces; | |
2680 } | |
2681 } | |
2682 else | |
2683 { | |
2684 curwin->w_cursor = oap->end; | |
893 | 2685 check_cursor_col(); |
7 | 2686 |
2687 /* Works just like an 'i'nsert on the next character. */ | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2688 if (!LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2689 && oap->start_vcol != oap->end_vcol) |
2690 inc_cursor(); | |
2691 } | |
2692 } | |
2693 | |
6579 | 2694 t1 = oap->start; |
10803
065da86ca6d2
patch 8.0.0291: Visual block insertion does not insert in all lines
Christian Brabandt <cb@256bit.org>
parents:
10785
diff
changeset
|
2695 (void)edit(NUL, FALSE, (linenr_T)count1); |
7 | 2696 |
6579 | 2697 /* When a tab was inserted, and the characters in front of the tab |
2698 * have been converted to a tab as well, the column of the cursor | |
2699 * might have actually been reduced, so need to adjust here. */ | |
2700 if (t1.lnum == curbuf->b_op_start_orig.lnum | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2701 && LT_POS(curbuf->b_op_start_orig, t1)) |
6579 | 2702 oap->start = curbuf->b_op_start_orig; |
2703 | |
1477 | 2704 /* If user has moved off this line, we don't know what to do, so do |
2705 * nothing. | |
2706 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
2707 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
7 | 2708 return; |
2709 | |
2710 if (oap->block_mode) | |
2711 { | |
2712 struct block_def bd2; | |
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2713 int did_indent = FALSE; |
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2714 size_t len; |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2715 int add; |
7 | 2716 |
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2717 /* If indent kicked in, the firstline might have changed |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2718 * but only do that, if the indent actually increased. */ |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2719 ind_post = (colnr_T)getwhitecols_curline(); |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2720 if (curbuf->b_op_start.col > ind_pre && ind_post > ind_pre) |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2721 { |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2722 bd.textcol += ind_post - ind_pre; |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2723 bd.start_vcol += ind_post - ind_pre; |
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2724 did_indent = TRUE; |
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2725 } |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2726 |
5471 | 2727 /* The user may have moved the cursor before inserting something, try |
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2728 * to adjust the block for that. But only do it, if the difference |
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2729 * does not come from indent kicking in. */ |
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2730 if (oap->start.lnum == curbuf->b_op_start_orig.lnum |
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2731 && !bd.is_MAX && !did_indent) |
5471 | 2732 { |
2733 if (oap->op_type == OP_INSERT | |
5730 | 2734 && oap->start.col |
2735 #ifdef FEAT_VIRTUALEDIT | |
2736 + oap->start.coladd | |
2737 #endif | |
2738 != curbuf->b_op_start_orig.col | |
2739 #ifdef FEAT_VIRTUALEDIT | |
2740 + curbuf->b_op_start_orig.coladd | |
2741 #endif | |
2742 ) | |
5471 | 2743 { |
6579 | 2744 int t = getviscol2(curbuf->b_op_start_orig.col, |
2745 curbuf->b_op_start_orig.coladd); | |
5680 | 2746 oap->start.col = curbuf->b_op_start_orig.col; |
6579 | 2747 pre_textlen -= t - oap->start_vcol; |
2748 oap->start_vcol = t; | |
5471 | 2749 } |
2750 else if (oap->op_type == OP_APPEND | |
5730 | 2751 && oap->end.col |
2752 #ifdef FEAT_VIRTUALEDIT | |
2753 + oap->end.coladd | |
2754 #endif | |
2755 >= curbuf->b_op_start_orig.col | |
2756 #ifdef FEAT_VIRTUALEDIT | |
2757 + curbuf->b_op_start_orig.coladd | |
2758 #endif | |
2759 ) | |
5471 | 2760 { |
6579 | 2761 int t = getviscol2(curbuf->b_op_start_orig.col, |
2762 curbuf->b_op_start_orig.coladd); | |
5680 | 2763 oap->start.col = curbuf->b_op_start_orig.col; |
5471 | 2764 /* reset pre_textlen to the value of OP_INSERT */ |
2765 pre_textlen += bd.textlen; | |
6579 | 2766 pre_textlen -= t - oap->start_vcol; |
2767 oap->start_vcol = t; | |
5471 | 2768 oap->op_type = OP_INSERT; |
2769 } | |
2770 } | |
2771 | |
7 | 2772 /* |
2773 * Spaces and tabs in the indent may have changed to other spaces and | |
1392 | 2774 * tabs. Get the starting column again and correct the length. |
7 | 2775 * Don't do this when "$" used, end-of-line will have changed. |
2776 */ | |
2777 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
2778 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
2779 { | |
2780 if (oap->op_type == OP_APPEND) | |
2781 { | |
2782 pre_textlen += bd2.textlen - bd.textlen; | |
2783 if (bd2.endspaces) | |
2784 --bd2.textlen; | |
2785 } | |
2786 bd.textcol = bd2.textcol; | |
2787 bd.textlen = bd2.textlen; | |
2788 } | |
2789 | |
2790 /* | |
2791 * Subsequent calls to ml_get() flush the firstline data - take a | |
2792 * copy of the required string. | |
2793 */ | |
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2794 firstline = ml_get(oap->start.lnum); |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2795 len = STRLEN(firstline); |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2796 add = bd.textcol; |
7 | 2797 if (oap->op_type == OP_APPEND) |
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2798 add += bd.textlen; |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2799 if ((size_t)add > len) |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2800 firstline += len; // short line, point to the NUL |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2801 else |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2802 firstline += add; |
3421 | 2803 if (pre_textlen >= 0 |
2804 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
7 | 2805 { |
2806 ins_text = vim_strnsave(firstline, (int)ins_len); | |
2807 if (ins_text != NULL) | |
2808 { | |
2809 /* block handled here */ | |
2810 if (u_save(oap->start.lnum, | |
2811 (linenr_T)(oap->end.lnum + 1)) == OK) | |
2812 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
2813 &bd); | |
2814 | |
2815 curwin->w_cursor.col = oap->start.col; | |
2816 check_cursor(); | |
2817 vim_free(ins_text); | |
2818 } | |
2819 } | |
2820 } | |
2821 } | |
2822 #endif | |
2823 | |
2824 /* | |
2825 * op_change - handle a change operation | |
2826 * | |
2827 * return TRUE if edit() returns because of a CTRL-O command | |
2828 */ | |
2829 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2830 op_change(oparg_T *oap) |
7 | 2831 { |
2832 colnr_T l; | |
2833 int retval; | |
2834 #ifdef FEAT_VISUALEXTRA | |
2835 long offset; | |
2836 linenr_T linenr; | |
1392 | 2837 long ins_len; |
2838 long pre_textlen = 0; | |
2839 long pre_indent = 0; | |
7 | 2840 char_u *firstline; |
2841 char_u *ins_text, *newp, *oldp; | |
2842 struct block_def bd; | |
2843 #endif | |
2844 | |
2845 l = oap->start.col; | |
2846 if (oap->motion_type == MLINE) | |
2847 { | |
2848 l = 0; | |
2849 #ifdef FEAT_SMARTINDENT | |
2850 if (!p_paste && curbuf->b_p_si | |
2851 # ifdef FEAT_CINDENT | |
2852 && !curbuf->b_p_cin | |
2853 # endif | |
2854 ) | |
2855 can_si = TRUE; /* It's like opening a new line, do si */ | |
2856 #endif | |
2857 } | |
2858 | |
2859 /* First delete the text in the region. In an empty buffer only need to | |
2860 * save for undo */ | |
2861 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
2862 { | |
2863 if (u_save_cursor() == FAIL) | |
2864 return FALSE; | |
2865 } | |
2866 else if (op_delete(oap) == FAIL) | |
2867 return FALSE; | |
2868 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2869 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2870 && !virtual_op) |
2871 inc_cursor(); | |
2872 | |
2873 #ifdef FEAT_VISUALEXTRA | |
2874 /* check for still on same line (<CR> in inserted text meaningless) */ | |
2875 /* skip blank lines too */ | |
2876 if (oap->block_mode) | |
2877 { | |
2878 # ifdef FEAT_VIRTUALEDIT | |
2879 /* Add spaces before getting the current line length. */ | |
2880 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
2881 || gchar_cursor() == NUL)) | |
2882 coladvance_force(getviscol()); | |
2883 # endif | |
1392 | 2884 firstline = ml_get(oap->start.lnum); |
2885 pre_textlen = (long)STRLEN(firstline); | |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2886 pre_indent = (long)getwhitecols(firstline); |
7 | 2887 bd.textcol = curwin->w_cursor.col; |
2888 } | |
2889 #endif | |
2890 | |
2891 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
2892 if (oap->motion_type == MLINE) | |
2893 fix_indent(); | |
2894 #endif | |
2895 | |
2896 retval = edit(NUL, FALSE, (linenr_T)1); | |
2897 | |
2898 #ifdef FEAT_VISUALEXTRA | |
2899 /* | |
39 | 2900 * In Visual block mode, handle copying the new text to all lines of the |
7 | 2901 * block. |
1477 | 2902 * Don't repeat the insert when Insert mode ended with CTRL-C. |
7 | 2903 */ |
1477 | 2904 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
7 | 2905 { |
1392 | 2906 /* Auto-indenting may have changed the indent. If the cursor was past |
2907 * the indent, exclude that indent change from the inserted text. */ | |
7 | 2908 firstline = ml_get(oap->start.lnum); |
1403 | 2909 if (bd.textcol > (colnr_T)pre_indent) |
7 | 2910 { |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2911 long new_indent = (long)getwhitecols(firstline); |
1392 | 2912 |
2913 pre_textlen += new_indent - pre_indent; | |
2914 bd.textcol += new_indent - pre_indent; | |
2915 } | |
2916 | |
2917 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
2918 if (ins_len > 0) | |
2919 { | |
2920 /* Subsequent calls to ml_get() flush the firstline data - take a | |
2921 * copy of the inserted text. */ | |
7 | 2922 if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL) |
2923 { | |
419 | 2924 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
7 | 2925 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
2926 linenr++) | |
2927 { | |
2928 block_prep(oap, &bd, linenr, TRUE); | |
2929 if (!bd.is_short || virtual_op) | |
2930 { | |
2931 # ifdef FEAT_VIRTUALEDIT | |
2932 pos_T vpos; | |
2933 | |
2934 /* If the block starts in virtual space, count the | |
2935 * initial coladd offset as part of "startspaces" */ | |
2936 if (bd.is_short) | |
2937 { | |
1982 | 2938 vpos.lnum = linenr; |
7 | 2939 (void)getvpos(&vpos, oap->start_vcol); |
2940 } | |
2941 else | |
2942 vpos.coladd = 0; | |
2943 # endif | |
2944 oldp = ml_get(linenr); | |
2945 newp = alloc_check((unsigned)(STRLEN(oldp) | |
2946 # ifdef FEAT_VIRTUALEDIT | |
2947 + vpos.coladd | |
2948 # endif | |
2949 + ins_len + 1)); | |
2950 if (newp == NULL) | |
2951 continue; | |
2952 /* copy up to block start */ | |
2953 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2954 offset = bd.textcol; | |
2955 # ifdef FEAT_VIRTUALEDIT | |
6929 | 2956 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
7 | 2957 offset += vpos.coladd; |
2958 # endif | |
2959 mch_memmove(newp + offset, ins_text, (size_t)ins_len); | |
2960 offset += ins_len; | |
2961 oldp += bd.textcol; | |
1622 | 2962 STRMOVE(newp + offset, oldp); |
7 | 2963 ml_replace(linenr, newp, FALSE); |
2964 } | |
2965 } | |
2966 check_cursor(); | |
2967 | |
2968 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
2969 } | |
2970 vim_free(ins_text); | |
2971 } | |
2972 } | |
2973 #endif | |
2974 | |
2975 return retval; | |
2976 } | |
2977 | |
2978 /* | |
2979 * set all the yank registers to empty (called from main()) | |
2980 */ | |
2981 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2982 init_yank(void) |
7 | 2983 { |
2984 int i; | |
2985 | |
2986 for (i = 0; i < NUM_REGISTERS; ++i) | |
2987 y_regs[i].y_array = NULL; | |
2988 } | |
2989 | |
356 | 2990 #if defined(EXITFREE) || defined(PROTO) |
2991 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2992 clear_registers(void) |
356 | 2993 { |
2994 int i; | |
2995 | |
2996 for (i = 0; i < NUM_REGISTERS; ++i) | |
2997 { | |
2998 y_current = &y_regs[i]; | |
2999 if (y_current->y_array != NULL) | |
3000 free_yank_all(); | |
3001 } | |
3002 } | |
3003 #endif | |
3004 | |
7 | 3005 /* |
3006 * Free "n" lines from the current yank register. | |
3007 * Called for normal freeing and in case of error. | |
3008 */ | |
3009 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3010 free_yank(long n) |
7 | 3011 { |
3012 if (y_current->y_array != NULL) | |
3013 { | |
3014 long i; | |
3015 | |
3016 for (i = n; --i >= 0; ) | |
3017 { | |
3018 #ifdef AMIGA /* only for very slow machines */ | |
3019 if ((i & 1023) == 1023) /* this may take a while */ | |
3020 { | |
3021 /* | |
3022 * This message should never cause a hit-return message. | |
3023 * Overwrite this message with any next message. | |
3024 */ | |
3025 ++no_wait_return; | |
3026 smsg((char_u *)_("freeing %ld lines"), i + 1); | |
3027 --no_wait_return; | |
3028 msg_didout = FALSE; | |
3029 msg_col = 0; | |
3030 } | |
3031 #endif | |
3032 vim_free(y_current->y_array[i]); | |
3033 } | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
3034 VIM_CLEAR(y_current->y_array); |
7 | 3035 #ifdef AMIGA |
3036 if (n >= 1000) | |
3037 MSG(""); | |
3038 #endif | |
3039 } | |
3040 } | |
3041 | |
3042 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3043 free_yank_all(void) |
7 | 3044 { |
3045 free_yank(y_current->y_size); | |
3046 } | |
3047 | |
3048 /* | |
3049 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
3050 * If we are to append (uppercase register), we first yank into a new yank | |
3051 * register and then concatenate the old and the new one (so we keep the old | |
3052 * one in case of out-of-memory). | |
3053 * | |
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
3054 * Return FAIL for failure, OK otherwise. |
7 | 3055 */ |
3056 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3057 op_yank(oparg_T *oap, int deleting, int mess) |
7 | 3058 { |
3059 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
|
3060 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
|
3061 yankreg_T newreg; /* new yank register when appending */ |
7 | 3062 char_u **new_ptr; |
3063 linenr_T lnum; /* current line number */ | |
3064 long j; | |
3065 int yanktype = oap->motion_type; | |
3066 long yanklines = oap->line_count; | |
3067 linenr_T yankendlnum = oap->end.lnum; | |
3068 char_u *p; | |
3069 char_u *pnew; | |
3070 struct block_def bd; | |
2658 | 3071 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
2654 | 3072 int did_star = FALSE; |
2658 | 3073 #endif |
7 | 3074 |
3075 /* check for read-only register */ | |
3076 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
3077 { | |
3078 beep_flush(); | |
3079 return FAIL; | |
3080 } | |
3081 if (oap->regname == '_') /* black hole: nothing to do */ | |
3082 return OK; | |
3083 | |
3084 #ifdef FEAT_CLIPBOARD | |
3085 if (!clip_star.available && oap->regname == '*') | |
3086 oap->regname = 0; | |
3087 else if (!clip_plus.available && oap->regname == '+') | |
3088 oap->regname = 0; | |
3089 #endif | |
3090 | |
3091 if (!deleting) /* op_delete() already set y_current */ | |
3092 get_yank_register(oap->regname, TRUE); | |
3093 | |
3094 curr = y_current; | |
3095 /* append to existing contents */ | |
3096 if (y_append && y_current->y_array != NULL) | |
3097 y_current = &newreg; | |
3098 else | |
3099 free_yank_all(); /* free previously yanked lines */ | |
3100 | |
593 | 3101 /* |
3102 * If the cursor was in column 1 before and after the movement, and the | |
3103 * operator is not inclusive, the yank is always linewise. | |
3104 */ | |
7 | 3105 if ( oap->motion_type == MCHAR |
3106 && oap->start.col == 0 | |
3107 && !oap->inclusive | |
3108 && (!oap->is_VIsual || *p_sel == 'o') | |
50 | 3109 && !oap->block_mode |
7 | 3110 && oap->end.col == 0 |
3111 && yanklines > 1) | |
3112 { | |
3113 yanktype = MLINE; | |
3114 --yankendlnum; | |
3115 --yanklines; | |
3116 } | |
3117 | |
3118 y_current->y_size = yanklines; | |
3119 y_current->y_type = yanktype; /* set the yank register type */ | |
3120 y_current->y_width = 0; | |
3121 y_current->y_array = (char_u **)lalloc_clear((long_u)(sizeof(char_u *) * | |
3122 yanklines), TRUE); | |
3123 if (y_current->y_array == NULL) | |
3124 { | |
3125 y_current = curr; | |
3126 return FAIL; | |
3127 } | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3128 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3129 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
|
3130 #endif |
7 | 3131 |
3132 y_idx = 0; | |
3133 lnum = oap->start.lnum; | |
3134 | |
3135 if (oap->block_mode) | |
3136 { | |
3137 /* Visual block mode */ | |
3138 y_current->y_type = MBLOCK; /* set the yank register type */ | |
3139 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
3140 | |
3141 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
3142 y_current->y_width--; | |
3143 } | |
3144 | |
3145 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
3146 { | |
3147 switch (y_current->y_type) | |
3148 { | |
3149 case MBLOCK: | |
3150 block_prep(oap, &bd, lnum, FALSE); | |
3151 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3152 goto fail; | |
3153 break; | |
3154 | |
3155 case MLINE: | |
3156 if ((y_current->y_array[y_idx] = | |
3157 vim_strsave(ml_get(lnum))) == NULL) | |
3158 goto fail; | |
3159 break; | |
3160 | |
3161 case MCHAR: | |
3162 { | |
3163 colnr_T startcol = 0, endcol = MAXCOL; | |
3164 #ifdef FEAT_VIRTUALEDIT | |
3165 int is_oneChar = FALSE; | |
3166 colnr_T cs, ce; | |
3167 #endif | |
3168 p = ml_get(lnum); | |
3169 bd.startspaces = 0; | |
3170 bd.endspaces = 0; | |
3171 | |
3172 if (lnum == oap->start.lnum) | |
3173 { | |
3174 startcol = oap->start.col; | |
3175 #ifdef FEAT_VIRTUALEDIT | |
3176 if (virtual_op) | |
3177 { | |
3178 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
3179 if (ce != cs && oap->start.coladd > 0) | |
3180 { | |
3181 /* Part of a tab selected -- but don't | |
3182 * double-count it. */ | |
3183 bd.startspaces = (ce - cs + 1) | |
3184 - oap->start.coladd; | |
3185 startcol++; | |
3186 } | |
3187 } | |
3188 #endif | |
3189 } | |
3190 | |
3191 if (lnum == oap->end.lnum) | |
3192 { | |
3193 endcol = oap->end.col; | |
3194 #ifdef FEAT_VIRTUALEDIT | |
3195 if (virtual_op) | |
3196 { | |
3197 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
3198 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
3199 # ifdef FEAT_MBYTE | |
3200 /* Don't add space for double-wide | |
3201 * char; endcol will be on last byte | |
3202 * of multi-byte char. */ | |
3203 && (*mb_head_off)(p, p + endcol) == 0 | |
3204 # endif | |
3205 )) | |
3206 { | |
3207 if (oap->start.lnum == oap->end.lnum | |
3208 && oap->start.col == oap->end.col) | |
3209 { | |
3210 /* Special case: inside a single char */ | |
3211 is_oneChar = TRUE; | |
3212 bd.startspaces = oap->end.coladd | |
3213 - oap->start.coladd + oap->inclusive; | |
3214 endcol = startcol; | |
3215 } | |
3216 else | |
3217 { | |
3218 bd.endspaces = oap->end.coladd | |
3219 + oap->inclusive; | |
3220 endcol -= oap->inclusive; | |
3221 } | |
3222 } | |
3223 } | |
3224 #endif | |
3225 } | |
3510 | 3226 if (endcol == MAXCOL) |
3227 endcol = (colnr_T)STRLEN(p); | |
7 | 3228 if (startcol > endcol |
3229 #ifdef FEAT_VIRTUALEDIT | |
3230 || is_oneChar | |
3231 #endif | |
3232 ) | |
3233 bd.textlen = 0; | |
3234 else | |
3235 { | |
3236 bd.textlen = endcol - startcol + oap->inclusive; | |
3237 } | |
3238 bd.textstart = p + startcol; | |
3239 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3240 goto fail; | |
3241 break; | |
3242 } | |
3243 /* NOTREACHED */ | |
3244 } | |
3245 } | |
3246 | |
3247 if (curr != y_current) /* append the new block to the old block */ | |
3248 { | |
3249 new_ptr = (char_u **)lalloc((long_u)(sizeof(char_u *) * | |
3250 (curr->y_size + y_current->y_size)), TRUE); | |
3251 if (new_ptr == NULL) | |
3252 goto fail; | |
3253 for (j = 0; j < curr->y_size; ++j) | |
3254 new_ptr[j] = curr->y_array[j]; | |
3255 vim_free(curr->y_array); | |
3256 curr->y_array = new_ptr; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3257 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3258 curr->y_time_set = vim_time(); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3259 #endif |
7 | 3260 |
3261 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
3262 curr->y_type = MLINE; | |
3263 | |
164 | 3264 /* Concatenate the last line of the old block with the first line of |
3265 * the new block, unless being Vi compatible. */ | |
3266 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
7 | 3267 { |
3268 pnew = lalloc((long_u)(STRLEN(curr->y_array[curr->y_size - 1]) | |
3269 + STRLEN(y_current->y_array[0]) + 1), TRUE); | |
3270 if (pnew == NULL) | |
3271 { | |
3272 y_idx = y_current->y_size - 1; | |
3273 goto fail; | |
3274 } | |
3275 STRCPY(pnew, curr->y_array[--j]); | |
3276 STRCAT(pnew, y_current->y_array[0]); | |
3277 vim_free(curr->y_array[j]); | |
3278 vim_free(y_current->y_array[0]); | |
3279 curr->y_array[j++] = pnew; | |
3280 y_idx = 1; | |
3281 } | |
3282 else | |
3283 y_idx = 0; | |
3284 while (y_idx < y_current->y_size) | |
3285 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
3286 curr->y_size = j; | |
3287 vim_free(y_current->y_array); | |
3288 y_current = curr; | |
3289 } | |
5981 | 3290 if (curwin->w_p_rnu) |
3291 redraw_later(SOME_VALID); /* cursor moved to start */ | |
7 | 3292 if (mess) /* Display message about yank? */ |
3293 { | |
3294 if (yanktype == MCHAR | |
3295 && !oap->block_mode | |
3296 && yanklines == 1) | |
3297 yanklines = 0; | |
3298 /* Some versions of Vi use ">=" here, some don't... */ | |
3299 if (yanklines > p_report) | |
3300 { | |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3301 char namebuf[100]; |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3302 |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3303 if (oap->regname == NUL) |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3304 *namebuf = NUL; |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3305 else |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3306 vim_snprintf(namebuf, sizeof(namebuf), |
11688
570f00932da8
patch 8.0.0727: message about what register to yank into is not translated
Christian Brabandt <cb@256bit.org>
parents:
11682
diff
changeset
|
3307 _(" into \"%c"), oap->regname); |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3308 |
7 | 3309 /* redisplay now, so message is not deleted */ |
3310 update_topline_redraw(); | |
3311 if (yanklines == 1) | |
205 | 3312 { |
3313 if (oap->block_mode) | |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3314 smsg((char_u *)_("block of 1 line yanked%s"), namebuf); |
205 | 3315 else |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3316 smsg((char_u *)_("1 line yanked%s"), namebuf); |
205 | 3317 } |
3318 else if (oap->block_mode) | |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3319 smsg((char_u *)_("block of %ld lines yanked%s"), |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3320 yanklines, namebuf); |
7 | 3321 else |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3322 smsg((char_u *)_("%ld lines yanked%s"), yanklines, |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3323 namebuf); |
7 | 3324 } |
3325 } | |
3326 | |
3327 /* | |
3328 * Set "'[" and "']" marks. | |
3329 */ | |
3330 curbuf->b_op_start = oap->start; | |
3331 curbuf->b_op_end = oap->end; | |
5735 | 3332 if (yanktype == MLINE && !oap->block_mode) |
36 | 3333 { |
3334 curbuf->b_op_start.col = 0; | |
3335 curbuf->b_op_end.col = MAXCOL; | |
3336 } | |
7 | 3337 |
3338 #ifdef FEAT_CLIPBOARD | |
3339 /* | |
3340 * If we were yanking to the '*' register, send result to clipboard. | |
3341 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
3342 * to the '*' register. | |
3343 */ | |
3344 if (clip_star.available | |
3345 && (curr == &(y_regs[STAR_REGISTER]) | |
2654 | 3346 || (!deleting && oap->regname == 0 |
6116 | 3347 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
7 | 3348 { |
3349 if (curr != &(y_regs[STAR_REGISTER])) | |
3350 /* Copy the text from register 0 to the clipboard register. */ | |
3351 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3352 | |
3353 clip_own_selection(&clip_star); | |
3354 clip_gen_set_selection(&clip_star); | |
2658 | 3355 # ifdef FEAT_X11 |
2654 | 3356 did_star = TRUE; |
2658 | 3357 # endif |
7 | 3358 } |
3359 | |
3360 # ifdef FEAT_X11 | |
3361 /* | |
3362 * If we were yanking to the '+' register, send result to selection. | |
3363 * Also copy to the '*' register, in case auto-select is off. | |
3364 */ | |
2654 | 3365 if (clip_plus.available |
3366 && (curr == &(y_regs[PLUS_REGISTER]) | |
3367 || (!deleting && oap->regname == 0 | |
6116 | 3368 && ((clip_unnamed | clip_unnamed_saved) & |
3369 CLIP_UNNAMED_PLUS)))) | |
7 | 3370 { |
2654 | 3371 if (curr != &(y_regs[PLUS_REGISTER])) |
3372 /* Copy the text from register 0 to the clipboard register. */ | |
3373 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
3374 | |
7 | 3375 clip_own_selection(&clip_plus); |
3376 clip_gen_set_selection(&clip_plus); | |
12642
d1cbe8cb05d0
patch 8.0.1199: when 'clipboard' is "autoselectplus" star register is set
Christian Brabandt <cb@256bit.org>
parents:
12329
diff
changeset
|
3377 if (!clip_isautosel_star() && !clip_isautosel_plus() |
d1cbe8cb05d0
patch 8.0.1199: when 'clipboard' is "autoselectplus" star register is set
Christian Brabandt <cb@256bit.org>
parents:
12329
diff
changeset
|
3378 && !did_star && curr == &(y_regs[PLUS_REGISTER])) |
7 | 3379 { |
3380 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3381 clip_own_selection(&clip_star); | |
3382 clip_gen_set_selection(&clip_star); | |
3383 } | |
3384 } | |
3385 # endif | |
3386 #endif | |
3387 | |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
3388 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3389 if (!deleting && has_textyankpost()) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3390 yank_do_autocmd(oap, y_current); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3391 #endif |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3392 |
7 | 3393 return OK; |
3394 | |
3395 fail: /* free the allocated lines */ | |
3396 free_yank(y_idx + 1); | |
3397 y_current = curr; | |
3398 return FAIL; | |
3399 } | |
3400 | |
3401 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3402 yank_copy_line(struct block_def *bd, long y_idx) |
7 | 3403 { |
3404 char_u *pnew; | |
3405 | |
3406 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
3407 == NULL) | |
3408 return FAIL; | |
3409 y_current->y_array[y_idx] = pnew; | |
6929 | 3410 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
7 | 3411 pnew += bd->startspaces; |
3412 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
3413 pnew += bd->textlen; | |
6929 | 3414 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
7 | 3415 pnew += bd->endspaces; |
3416 *pnew = NUL; | |
3417 return OK; | |
3418 } | |
3419 | |
3420 #ifdef FEAT_CLIPBOARD | |
3421 /* | |
3422 * Make a copy of the y_current register to register "reg". | |
3423 */ | |
3424 static void | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3425 copy_yank_reg(yankreg_T *reg) |
7 | 3426 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3427 yankreg_T *curr = y_current; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3428 long j; |
7 | 3429 |
3430 y_current = reg; | |
3431 free_yank_all(); | |
3432 *y_current = *curr; | |
3433 y_current->y_array = (char_u **)lalloc_clear( | |
3434 (long_u)(sizeof(char_u *) * y_current->y_size), TRUE); | |
3435 if (y_current->y_array == NULL) | |
3436 y_current->y_size = 0; | |
3437 else | |
3438 for (j = 0; j < y_current->y_size; ++j) | |
3439 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
3440 { | |
3441 free_yank(j); | |
3442 y_current->y_size = 0; | |
3443 break; | |
3444 } | |
3445 y_current = curr; | |
3446 } | |
3447 #endif | |
3448 | |
3449 /* | |
140 | 3450 * Put contents of register "regname" into the text. |
3451 * Caller must check "regname" to be valid! | |
3452 * "flags": PUT_FIXINDENT make indent look nice | |
3453 * PUT_CURSEND leave cursor after end of new text | |
3454 * PUT_LINE force linewise put (":put") | |
7 | 3455 */ |
3456 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3457 do_put( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3458 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3459 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
|
3460 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3461 int flags) |
7 | 3462 { |
3463 char_u *ptr; | |
3464 char_u *newp, *oldp; | |
3465 int yanklen; | |
3466 int totlen = 0; /* init for gcc */ | |
3467 linenr_T lnum; | |
3468 colnr_T col; | |
3469 long i; /* index in y_array[] */ | |
3470 int y_type; | |
3471 long y_size; | |
3472 int oldlen; | |
3473 long y_width = 0; | |
3474 colnr_T vcol; | |
3475 int delcount; | |
3476 int incr = 0; | |
3477 long j; | |
3478 struct block_def bd; | |
3479 char_u **y_array = NULL; | |
3480 long nr_lines = 0; | |
3481 pos_T new_cursor; | |
3482 int indent; | |
3483 int orig_indent = 0; /* init for gcc */ | |
3484 int indent_diff = 0; /* init for gcc */ | |
3485 int first_indent = TRUE; | |
3486 int lendiff = 0; | |
3487 pos_T old_pos; | |
3488 char_u *insert_string = NULL; | |
3489 int allocated = FALSE; | |
3490 long cnt; | |
3491 | |
3492 #ifdef FEAT_CLIPBOARD | |
3493 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
3494 adjust_clip_reg(®name); | |
3495 (void)may_get_selection(regname); | |
3496 #endif | |
3497 | |
3498 if (flags & PUT_FIXINDENT) | |
3499 orig_indent = get_indent(); | |
3500 | |
3501 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3502 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3503 | |
3504 /* | |
3505 * Using inserted text works differently, because the register includes | |
3506 * special characters (newlines, etc.). | |
3507 */ | |
3508 if (regname == '.') | |
3509 { | |
10494
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3510 if (VIsual_active) |
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3511 stuffcharReadbuff(VIsual_mode); |
7 | 3512 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : |
3513 (count == -1 ? 'O' : 'i')), count, FALSE); | |
3514 /* Putting the text is done later, so can't really move the cursor to | |
3515 * the next character. Use "l" to simulate it. */ | |
3516 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
3517 stuffcharReadbuff('l'); | |
3518 return; | |
3519 } | |
3520 | |
3521 /* | |
3522 * For special registers '%' (file name), '#' (alternate file name) and | |
3523 * ':' (last command line), etc. we have to create a fake yank register. | |
3524 */ | |
3525 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
3526 { | |
3527 if (insert_string == NULL) | |
3528 return; | |
3529 } | |
3530 | |
4005 | 3531 /* Autocommands may be executed when saving lines for undo, which may make |
3532 * y_array invalid. Start undo now to avoid that. */ | |
3533 u_save(curwin->w_cursor.lnum, curwin->w_cursor.lnum + 1); | |
3534 | |
7 | 3535 if (insert_string != NULL) |
3536 { | |
3537 y_type = MCHAR; | |
3538 #ifdef FEAT_EVAL | |
3539 if (regname == '=') | |
3540 { | |
3541 /* For the = register we need to split the string at NL | |
3093 | 3542 * characters. |
3543 * Loop twice: count the number of lines and save them. */ | |
7 | 3544 for (;;) |
3545 { | |
3546 y_size = 0; | |
3547 ptr = insert_string; | |
3548 while (ptr != NULL) | |
3549 { | |
3550 if (y_array != NULL) | |
3551 y_array[y_size] = ptr; | |
3552 ++y_size; | |
3553 ptr = vim_strchr(ptr, '\n'); | |
3554 if (ptr != NULL) | |
3555 { | |
3556 if (y_array != NULL) | |
3557 *ptr = NUL; | |
3558 ++ptr; | |
3093 | 3559 /* A trailing '\n' makes the register linewise. */ |
7 | 3560 if (*ptr == NUL) |
3561 { | |
3562 y_type = MLINE; | |
3563 break; | |
3564 } | |
3565 } | |
3566 } | |
3567 if (y_array != NULL) | |
3568 break; | |
3569 y_array = (char_u **)alloc((unsigned) | |
3570 (y_size * sizeof(char_u *))); | |
3571 if (y_array == NULL) | |
3572 goto end; | |
3573 } | |
3574 } | |
3575 else | |
3576 #endif | |
3577 { | |
3578 y_size = 1; /* use fake one-line yank register */ | |
3579 y_array = &insert_string; | |
3580 } | |
3581 } | |
3582 else | |
3583 { | |
3584 get_yank_register(regname, FALSE); | |
3585 | |
3586 y_type = y_current->y_type; | |
3587 y_width = y_current->y_width; | |
3588 y_size = y_current->y_size; | |
3589 y_array = y_current->y_array; | |
3590 } | |
3591 | |
3592 if (y_type == MLINE) | |
3593 { | |
3594 if (flags & PUT_LINE_SPLIT) | |
3595 { | |
6845 | 3596 char_u *p; |
3597 | |
7 | 3598 /* "p" or "P" in Visual mode: split the lines to put the text in |
3599 * between. */ | |
3600 if (u_save_cursor() == FAIL) | |
3601 goto end; | |
6845 | 3602 p = ml_get_cursor(); |
3603 if (dir == FORWARD && *p != NUL) | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3604 MB_PTR_ADV(p); |
6845 | 3605 ptr = vim_strsave(p); |
7 | 3606 if (ptr == NULL) |
3607 goto end; | |
3608 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
3609 vim_free(ptr); | |
3610 | |
6845 | 3611 oldp = ml_get_curline(); |
3612 p = oldp + curwin->w_cursor.col; | |
3613 if (dir == FORWARD && *p != NUL) | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3614 MB_PTR_ADV(p); |
6845 | 3615 ptr = vim_strnsave(oldp, p - oldp); |
7 | 3616 if (ptr == NULL) |
3617 goto end; | |
3618 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
3619 ++nr_lines; | |
3620 dir = FORWARD; | |
3621 } | |
3622 if (flags & PUT_LINE_FORWARD) | |
3623 { | |
3624 /* Must be "p" for a Visual block, put lines below the block. */ | |
692 | 3625 curwin->w_cursor = curbuf->b_visual.vi_end; |
7 | 3626 dir = FORWARD; |
3627 } | |
3628 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3629 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3630 } | |
3631 | |
3632 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
3633 y_type = MLINE; | |
3634 | |
3635 if (y_size == 0 || y_array == NULL) | |
3636 { | |
3637 EMSG2(_("E353: Nothing in register %s"), | |
3638 regname == 0 ? (char_u *)"\"" : transchar(regname)); | |
3639 goto end; | |
3640 } | |
3641 | |
3642 if (y_type == MBLOCK) | |
3643 { | |
3644 lnum = curwin->w_cursor.lnum + y_size + 1; | |
3645 if (lnum > curbuf->b_ml.ml_line_count) | |
3646 lnum = curbuf->b_ml.ml_line_count + 1; | |
3647 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
3648 goto end; | |
3649 } | |
5735 | 3650 else if (y_type == MLINE) |
7 | 3651 { |
3652 lnum = curwin->w_cursor.lnum; | |
3653 #ifdef FEAT_FOLDING | |
3654 /* Correct line number for closed fold. Don't move the cursor yet, | |
3655 * u_save() uses it. */ | |
3656 if (dir == BACKWARD) | |
3657 (void)hasFolding(lnum, &lnum, NULL); | |
3658 else | |
3659 (void)hasFolding(lnum, NULL, &lnum); | |
3660 #endif | |
3661 if (dir == FORWARD) | |
3662 ++lnum; | |
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3663 /* 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
|
3664 * it in the saved lines. */ |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
3665 if ((BUFEMPTY() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
7 | 3666 goto end; |
3667 #ifdef FEAT_FOLDING | |
3668 if (dir == FORWARD) | |
3669 curwin->w_cursor.lnum = lnum - 1; | |
3670 else | |
3671 curwin->w_cursor.lnum = lnum; | |
3672 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
3673 #endif | |
3674 } | |
3675 else if (u_save_cursor() == FAIL) | |
3676 goto end; | |
3677 | |
3678 yanklen = (int)STRLEN(y_array[0]); | |
3679 | |
3680 #ifdef FEAT_VIRTUALEDIT | |
3681 if (ve_flags == VE_ALL && y_type == MCHAR) | |
3682 { | |
3683 if (gchar_cursor() == TAB) | |
3684 { | |
3685 /* Don't need to insert spaces when "p" on the last position of a | |
3686 * tab or "P" on the first position. */ | |
3687 if (dir == FORWARD | |
3688 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
3689 : curwin->w_cursor.coladd > 0) | |
3690 coladvance_force(getviscol()); | |
3691 else | |
3692 curwin->w_cursor.coladd = 0; | |
3693 } | |
3694 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
3695 coladvance_force(getviscol() + (dir == FORWARD)); | |
3696 } | |
3697 #endif | |
3698 | |
3699 lnum = curwin->w_cursor.lnum; | |
3700 col = curwin->w_cursor.col; | |
3701 | |
3702 /* | |
3703 * Block mode | |
3704 */ | |
3705 if (y_type == MBLOCK) | |
3706 { | |
10664
94db9c08e206
patch 8.0.0222: blockwise put on multi-byte character misplaced
Christian Brabandt <cb@256bit.org>
parents:
10494
diff
changeset
|
3707 int c = gchar_cursor(); |
7 | 3708 colnr_T endcol2 = 0; |
3709 | |
3710 if (dir == FORWARD && c != NUL) | |
3711 { | |
3712 #ifdef FEAT_VIRTUALEDIT | |
3713 if (ve_flags == VE_ALL) | |
3714 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3715 else | |
3716 #endif | |
3717 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
3718 | |
3719 #ifdef FEAT_MBYTE | |
3720 if (has_mbyte) | |
3721 /* move to start of next multi-byte character */ | |
474 | 3722 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
7 | 3723 else |
3724 #endif | |
3725 #ifdef FEAT_VIRTUALEDIT | |
3726 if (c != TAB || ve_flags != VE_ALL) | |
3727 #endif | |
3728 ++curwin->w_cursor.col; | |
3729 ++col; | |
3730 } | |
3731 else | |
3732 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3733 | |
3734 #ifdef FEAT_VIRTUALEDIT | |
3735 col += curwin->w_cursor.coladd; | |
1304 | 3736 if (ve_flags == VE_ALL |
3737 && (curwin->w_cursor.coladd > 0 | |
3738 || endcol2 == curwin->w_cursor.col)) | |
7 | 3739 { |
3740 if (dir == FORWARD && c == NUL) | |
3741 ++col; | |
3742 if (dir != FORWARD && c != NUL) | |
3743 ++curwin->w_cursor.col; | |
3744 if (c == TAB) | |
3745 { | |
3746 if (dir == BACKWARD && curwin->w_cursor.col) | |
3747 curwin->w_cursor.col--; | |
3748 if (dir == FORWARD && col - 1 == endcol2) | |
3749 curwin->w_cursor.col++; | |
3750 } | |
3751 } | |
3752 curwin->w_cursor.coladd = 0; | |
3753 #endif | |
699 | 3754 bd.textcol = 0; |
7 | 3755 for (i = 0; i < y_size; ++i) |
3756 { | |
3757 int spaces; | |
3758 char shortline; | |
3759 | |
3760 bd.startspaces = 0; | |
3761 bd.endspaces = 0; | |
3762 vcol = 0; | |
3763 delcount = 0; | |
3764 | |
3765 /* add a new line */ | |
3766 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
3767 { | |
3768 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
3769 (colnr_T)1, FALSE) == FAIL) | |
3770 break; | |
3771 ++nr_lines; | |
3772 } | |
3773 /* get the old line and advance to the position to insert at */ | |
3774 oldp = ml_get_curline(); | |
3775 oldlen = (int)STRLEN(oldp); | |
3776 for (ptr = oldp; vcol < col && *ptr; ) | |
3777 { | |
3778 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 3779 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
7 | 3780 vcol += incr; |
3781 } | |
3782 bd.textcol = (colnr_T)(ptr - oldp); | |
3783 | |
3784 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
3785 | |
3786 if (vcol < col) /* line too short, padd with spaces */ | |
3787 bd.startspaces = col - vcol; | |
3788 else if (vcol > col) | |
3789 { | |
3790 bd.endspaces = vcol - col; | |
3791 bd.startspaces = incr - bd.endspaces; | |
3792 --bd.textcol; | |
3793 delcount = 1; | |
3794 #ifdef FEAT_MBYTE | |
3795 if (has_mbyte) | |
3796 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
3797 #endif | |
3798 if (oldp[bd.textcol] != TAB) | |
3799 { | |
3800 /* Only a Tab can be split into spaces. Other | |
3801 * characters will have to be moved to after the | |
3802 * block, causing misalignment. */ | |
3803 delcount = 0; | |
3804 bd.endspaces = 0; | |
3805 } | |
3806 } | |
3807 | |
3808 yanklen = (int)STRLEN(y_array[i]); | |
3809 | |
3810 /* calculate number of spaces required to fill right side of block*/ | |
3811 spaces = y_width + 1; | |
3812 for (j = 0; j < yanklen; j++) | |
5995 | 3813 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
7 | 3814 if (spaces < 0) |
3815 spaces = 0; | |
3816 | |
3817 /* insert the new text */ | |
3818 totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces; | |
3819 newp = alloc_check((unsigned)totlen + oldlen + 1); | |
3820 if (newp == NULL) | |
3821 break; | |
3822 /* copy part up to cursor to new line */ | |
3823 ptr = newp; | |
3824 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
3825 ptr += bd.textcol; | |
3826 /* may insert some spaces before the new text */ | |
6929 | 3827 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
7 | 3828 ptr += bd.startspaces; |
3829 /* insert the new text */ | |
3830 for (j = 0; j < count; ++j) | |
3831 { | |
3832 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
3833 ptr += yanklen; | |
3834 | |
3835 /* insert block's trailing spaces only if there's text behind */ | |
3836 if ((j < count - 1 || !shortline) && spaces) | |
3837 { | |
6929 | 3838 vim_memset(ptr, ' ', (size_t)spaces); |
7 | 3839 ptr += spaces; |
3840 } | |
3841 } | |
3842 /* may insert some spaces after the new text */ | |
6929 | 3843 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
7 | 3844 ptr += bd.endspaces; |
3845 /* move the text after the cursor to the end of the line. */ | |
3846 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
3847 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
3848 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
3849 | |
3850 ++curwin->w_cursor.lnum; | |
3851 if (i == 0) | |
3852 curwin->w_cursor.col += bd.startspaces; | |
3853 } | |
3854 | |
3855 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
3856 | |
3857 /* Set '[ mark. */ | |
3858 curbuf->b_op_start = curwin->w_cursor; | |
3859 curbuf->b_op_start.lnum = lnum; | |
3860 | |
3861 /* adjust '] mark */ | |
3862 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
3863 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
237 | 3864 # ifdef FEAT_VIRTUALEDIT |
7 | 3865 curbuf->b_op_end.coladd = 0; |
237 | 3866 # endif |
7 | 3867 if (flags & PUT_CURSEND) |
3868 { | |
916 | 3869 colnr_T len; |
3870 | |
7 | 3871 curwin->w_cursor = curbuf->b_op_end; |
3872 curwin->w_cursor.col++; | |
916 | 3873 |
3874 /* in Insert mode we might be after the NUL, correct for that */ | |
3875 len = (colnr_T)STRLEN(ml_get_curline()); | |
3876 if (curwin->w_cursor.col > len) | |
3877 curwin->w_cursor.col = len; | |
7 | 3878 } |
3879 else | |
3880 curwin->w_cursor.lnum = lnum; | |
3881 } | |
3882 else | |
3883 { | |
3884 /* | |
3885 * Character or Line mode | |
3886 */ | |
3887 if (y_type == MCHAR) | |
3888 { | |
3889 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
3890 * char */ | |
3891 if (dir == FORWARD && gchar_cursor() != NUL) | |
3892 { | |
3893 #ifdef FEAT_MBYTE | |
3894 if (has_mbyte) | |
3895 { | |
474 | 3896 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
7 | 3897 |
3898 /* put it on the next of the multi-byte character. */ | |
3899 col += bytelen; | |
3900 if (yanklen) | |
3901 { | |
3902 curwin->w_cursor.col += bytelen; | |
3903 curbuf->b_op_end.col += bytelen; | |
3904 } | |
3905 } | |
3906 else | |
3907 #endif | |
3908 { | |
3909 ++col; | |
3910 if (yanklen) | |
3911 { | |
3912 ++curwin->w_cursor.col; | |
3913 ++curbuf->b_op_end.col; | |
3914 } | |
3915 } | |
3916 } | |
3917 curbuf->b_op_start = curwin->w_cursor; | |
3918 } | |
3919 /* | |
3920 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
3921 */ | |
3922 else if (dir == BACKWARD) | |
3923 --lnum; | |
699 | 3924 new_cursor = curwin->w_cursor; |
7 | 3925 |
3926 /* | |
3927 * simple case: insert into current line | |
3928 */ | |
3929 if (y_type == MCHAR && y_size == 1) | |
3930 { | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3931 linenr_T end_lnum = 0; /* init for gcc */ |
10688
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3932 |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3933 if (VIsual_active) |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3934 { |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3935 end_lnum = curbuf->b_visual.vi_end.lnum; |
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3936 if (end_lnum < curbuf->b_visual.vi_start.lnum) |
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3937 end_lnum = curbuf->b_visual.vi_start.lnum; |
10688
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3938 } |
10670
bce3eccea39a
patch 8.0.0225: put in Visual block mode terminates early
Christian Brabandt <cb@256bit.org>
parents:
10664
diff
changeset
|
3939 |
5365 | 3940 do { |
3941 totlen = count * yanklen; | |
3942 if (totlen > 0) | |
7 | 3943 { |
5365 | 3944 oldp = ml_get(lnum); |
10688
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3945 if (VIsual_active && col > (int)STRLEN(oldp)) |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3946 { |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3947 lnum++; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3948 continue; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3949 } |
5365 | 3950 newp = alloc_check((unsigned)(STRLEN(oldp) + totlen + 1)); |
3951 if (newp == NULL) | |
3952 goto end; /* alloc() gave an error message */ | |
3953 mch_memmove(newp, oldp, (size_t)col); | |
3954 ptr = newp + col; | |
3955 for (i = 0; i < count; ++i) | |
3956 { | |
3957 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
3958 ptr += yanklen; | |
3959 } | |
3960 STRMOVE(ptr, oldp + col); | |
3961 ml_replace(lnum, newp, FALSE); | |
3962 /* Place cursor on last putted char. */ | |
3963 if (lnum == curwin->w_cursor.lnum) | |
5496 | 3964 { |
3965 /* make sure curwin->w_virtcol is updated */ | |
3966 changed_cline_bef_curs(); | |
5365 | 3967 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
5496 | 3968 } |
7 | 3969 } |
5365 | 3970 if (VIsual_active) |
3971 lnum++; | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3972 } while (VIsual_active && lnum <= end_lnum); |
5365 | 3973 |
6379 | 3974 if (VIsual_active) /* reset lnum to the last visual line */ |
3975 lnum--; | |
3976 | |
7 | 3977 curbuf->b_op_end = curwin->w_cursor; |
3978 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
3979 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
3980 ++curwin->w_cursor.col; | |
3981 changed_bytes(lnum, col); | |
3982 } | |
3983 else | |
3984 { | |
3985 /* | |
3986 * Insert at least one line. When y_type is MCHAR, break the first | |
3987 * line in two. | |
3988 */ | |
3989 for (cnt = 1; cnt <= count; ++cnt) | |
3990 { | |
3991 i = 0; | |
3992 if (y_type == MCHAR) | |
3993 { | |
3994 /* | |
3995 * Split the current line in two at the insert position. | |
3996 * First insert y_array[size - 1] in front of second line. | |
3997 * Then append y_array[0] to first line. | |
3998 */ | |
3999 lnum = new_cursor.lnum; | |
4000 ptr = ml_get(lnum) + col; | |
4001 totlen = (int)STRLEN(y_array[y_size - 1]); | |
4002 newp = alloc_check((unsigned)(STRLEN(ptr) + totlen + 1)); | |
4003 if (newp == NULL) | |
4004 goto error; | |
4005 STRCPY(newp, y_array[y_size - 1]); | |
4006 STRCAT(newp, ptr); | |
4007 /* insert second line */ | |
4008 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
4009 vim_free(newp); | |
4010 | |
4011 oldp = ml_get(lnum); | |
4012 newp = alloc_check((unsigned)(col + yanklen + 1)); | |
4013 if (newp == NULL) | |
4014 goto error; | |
4015 /* copy first part of line */ | |
4016 mch_memmove(newp, oldp, (size_t)col); | |
4017 /* append to first line */ | |
4018 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
4019 ml_replace(lnum, newp, FALSE); | |
4020 | |
4021 curwin->w_cursor.lnum = lnum; | |
4022 i = 1; | |
4023 } | |
4024 | |
4025 for (; i < y_size; ++i) | |
4026 { | |
4027 if ((y_type != MCHAR || i < y_size - 1) | |
4028 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
4029 == FAIL) | |
4030 goto error; | |
4031 lnum++; | |
4032 ++nr_lines; | |
4033 if (flags & PUT_FIXINDENT) | |
4034 { | |
4035 old_pos = curwin->w_cursor; | |
4036 curwin->w_cursor.lnum = lnum; | |
4037 ptr = ml_get(lnum); | |
4038 if (cnt == count && i == y_size - 1) | |
4039 lendiff = (int)STRLEN(ptr); | |
4040 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
4041 if (*ptr == '#' && preprocs_left()) | |
4042 indent = 0; /* Leave # lines at start */ | |
4043 else | |
4044 #endif | |
4045 if (*ptr == NUL) | |
4046 indent = 0; /* Ignore empty lines */ | |
4047 else if (first_indent) | |
4048 { | |
4049 indent_diff = orig_indent - get_indent(); | |
4050 indent = orig_indent; | |
4051 first_indent = FALSE; | |
4052 } | |
4053 else if ((indent = get_indent() + indent_diff) < 0) | |
4054 indent = 0; | |
4055 (void)set_indent(indent, 0); | |
4056 curwin->w_cursor = old_pos; | |
4057 /* remember how many chars were removed */ | |
4058 if (cnt == count && i == y_size - 1) | |
4059 lendiff -= (int)STRLEN(ml_get(lnum)); | |
4060 } | |
4061 } | |
4062 } | |
4063 | |
4064 error: | |
4065 /* Adjust marks. */ | |
4066 if (y_type == MLINE) | |
4067 { | |
4068 curbuf->b_op_start.col = 0; | |
4069 if (dir == FORWARD) | |
4070 curbuf->b_op_start.lnum++; | |
4071 } | |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
4072 /* Skip mark_adjust when adding lines after the last one, there |
11065
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
4073 * can't be marks there. But still needed in diff mode. */ |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
4074 if (curbuf->b_op_start.lnum + (y_type == MCHAR) - 1 + nr_lines |
11065
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
4075 < curbuf->b_ml.ml_line_count |
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
4076 #ifdef FEAT_DIFF |
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
4077 || curwin->w_p_diff |
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
4078 #endif |
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
4079 ) |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
4080 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
7 | 4081 (linenr_T)MAXLNUM, nr_lines, 0L); |
4082 | |
4083 /* note changed text for displaying and folding */ | |
4084 if (y_type == MCHAR) | |
4085 changed_lines(curwin->w_cursor.lnum, col, | |
4086 curwin->w_cursor.lnum + 1, nr_lines); | |
4087 else | |
4088 changed_lines(curbuf->b_op_start.lnum, 0, | |
4089 curbuf->b_op_start.lnum, nr_lines); | |
4090 | |
4091 /* put '] mark at last inserted character */ | |
4092 curbuf->b_op_end.lnum = lnum; | |
4093 /* correct length for change in indent */ | |
4094 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
4095 if (col > 1) | |
4096 curbuf->b_op_end.col = col - 1; | |
4097 else | |
4098 curbuf->b_op_end.col = 0; | |
4099 | |
168 | 4100 if (flags & PUT_CURSLINE) |
4101 { | |
237 | 4102 /* ":put": put cursor on last inserted line */ |
168 | 4103 curwin->w_cursor.lnum = lnum; |
4104 beginline(BL_WHITE | BL_FIX); | |
4105 } | |
4106 else if (flags & PUT_CURSEND) | |
7 | 4107 { |
4108 /* put cursor after inserted text */ | |
4109 if (y_type == MLINE) | |
4110 { | |
4111 if (lnum >= curbuf->b_ml.ml_line_count) | |
4112 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
4113 else | |
4114 curwin->w_cursor.lnum = lnum + 1; | |
4115 curwin->w_cursor.col = 0; | |
4116 } | |
4117 else | |
4118 { | |
4119 curwin->w_cursor.lnum = lnum; | |
4120 curwin->w_cursor.col = col; | |
4121 } | |
4122 } | |
4123 else if (y_type == MLINE) | |
4124 { | |
168 | 4125 /* put cursor on first non-blank in first inserted line */ |
7 | 4126 curwin->w_cursor.col = 0; |
4127 if (dir == FORWARD) | |
4128 ++curwin->w_cursor.lnum; | |
4129 beginline(BL_WHITE | BL_FIX); | |
4130 } | |
4131 else /* put cursor on first inserted character */ | |
4132 curwin->w_cursor = new_cursor; | |
4133 } | |
4134 } | |
4135 | |
4136 msgmore(nr_lines); | |
4137 curwin->w_set_curswant = TRUE; | |
4138 | |
4139 end: | |
4140 if (allocated) | |
4141 vim_free(insert_string); | |
840 | 4142 if (regname == '=') |
4143 vim_free(y_array); | |
4144 | |
5380 | 4145 VIsual_active = FALSE; |
4146 | |
140 | 4147 /* If the cursor is past the end of the line put it at the end. */ |
844 | 4148 adjust_cursor_eol(); |
4149 } | |
4150 | |
4151 /* | |
4152 * When the cursor is on the NUL past the end of the line and it should not be | |
4153 * there move it left. | |
4154 */ | |
4155 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4156 adjust_cursor_eol(void) |
844 | 4157 { |
4158 if (curwin->w_cursor.col > 0 | |
4159 && gchar_cursor() == NUL | |
773 | 4160 #ifdef FEAT_VIRTUALEDIT |
4161 && (ve_flags & VE_ONEMORE) == 0 | |
4162 #endif | |
7 | 4163 && !(restart_edit || (State & INSERT))) |
4164 { | |
557 | 4165 /* Put the cursor on the last character in the line. */ |
555 | 4166 dec_cursor(); |
844 | 4167 |
7 | 4168 #ifdef FEAT_VIRTUALEDIT |
4169 if (ve_flags == VE_ALL) | |
557 | 4170 { |
4171 colnr_T scol, ecol; | |
4172 | |
4173 /* Coladd is set to the width of the last character. */ | |
4174 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
4175 curwin->w_cursor.coladd = ecol - scol + 1; | |
4176 } | |
7 | 4177 #endif |
4178 } | |
4179 } | |
4180 | |
4181 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
4182 /* | |
4183 * Return TRUE if lines starting with '#' should be left aligned. | |
4184 */ | |
4185 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4186 preprocs_left(void) |
7 | 4187 { |
4188 return | |
4189 # ifdef FEAT_SMARTINDENT | |
4190 # ifdef FEAT_CINDENT | |
4191 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
4192 # else | |
4193 curbuf->b_p_si | |
4194 # endif | |
4195 # endif | |
4196 # ifdef FEAT_CINDENT | |
5438 | 4197 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
4198 && curbuf->b_ind_hash_comment == 0) | |
7 | 4199 # endif |
4200 ; | |
4201 } | |
4202 #endif | |
4203 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4204 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4205 * 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
|
4206 */ |
7 | 4207 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4208 get_register_name(int num) |
7 | 4209 { |
4210 if (num == -1) | |
4211 return '"'; | |
4212 else if (num < 10) | |
4213 return num + '0'; | |
4214 else if (num == DELETION_REGISTER) | |
4215 return '-'; | |
4216 #ifdef FEAT_CLIPBOARD | |
4217 else if (num == STAR_REGISTER) | |
4218 return '*'; | |
4219 else if (num == PLUS_REGISTER) | |
4220 return '+'; | |
4221 #endif | |
4222 else | |
4223 { | |
4224 #ifdef EBCDIC | |
4225 int i; | |
4226 | |
4227 /* EBCDIC is really braindead ... */ | |
4228 i = 'a' + (num - 10); | |
4229 if (i > 'i') | |
4230 i += 7; | |
4231 if (i > 'r') | |
4232 i += 8; | |
4233 return i; | |
4234 #else | |
4235 return num + 'a' - 10; | |
4236 #endif | |
4237 } | |
4238 } | |
4239 | |
4240 /* | |
4241 * ":dis" and ":registers": Display the contents of the yank registers. | |
4242 */ | |
4243 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4244 ex_display(exarg_T *eap) |
7 | 4245 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4246 int i, n; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4247 long j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4248 char_u *p; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4249 yankreg_T *yb; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4250 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4251 int attr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4252 char_u *arg = eap->arg; |
22 | 4253 #ifdef FEAT_MBYTE |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4254 int clen; |
22 | 4255 #else |
4256 # define clen 1 | |
4257 #endif | |
7 | 4258 |
4259 if (arg != NULL && *arg == NUL) | |
4260 arg = NULL; | |
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
4261 attr = HL_ATTR(HLF_8); |
7 | 4262 |
4263 /* Highlight title */ | |
4264 MSG_PUTS_TITLE(_("\n--- Registers ---")); | |
4265 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) | |
4266 { | |
4267 name = get_register_name(i); | |
2644 | 4268 if (arg != NULL && vim_strchr(arg, name) == NULL |
4269 #ifdef ONE_CLIPBOARD | |
4270 /* Star register and plus register contain the same thing. */ | |
4271 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
4272 #endif | |
4273 ) | |
7 | 4274 continue; /* did not ask for this register */ |
4275 | |
4276 #ifdef FEAT_CLIPBOARD | |
4277 /* Adjust register name for "unnamed" in 'clipboard'. | |
4278 * When it's a clipboard register, fill it with the current contents | |
4279 * of the clipboard. */ | |
4280 adjust_clip_reg(&name); | |
4281 (void)may_get_selection(name); | |
4282 #endif | |
4283 | |
4284 if (i == -1) | |
4285 { | |
4286 if (y_previous != NULL) | |
4287 yb = y_previous; | |
4288 else | |
4289 yb = &(y_regs[0]); | |
4290 } | |
4291 else | |
4292 yb = &(y_regs[i]); | |
2000 | 4293 |
4294 #ifdef FEAT_EVAL | |
4295 if (name == MB_TOLOWER(redir_reg) | |
4296 || (redir_reg == '"' && yb == y_previous)) | |
4297 continue; /* do not list register being written to, the | |
4298 * pointer can be freed */ | |
4299 #endif | |
4300 | |
7 | 4301 if (yb->y_array != NULL) |
4302 { | |
4303 msg_putchar('\n'); | |
4304 msg_putchar('"'); | |
4305 msg_putchar(name); | |
4306 MSG_PUTS(" "); | |
4307 | |
4308 n = (int)Columns - 6; | |
4309 for (j = 0; j < yb->y_size && n > 1; ++j) | |
4310 { | |
4311 if (j) | |
4312 { | |
4313 MSG_PUTS_ATTR("^J", attr); | |
4314 n -= 2; | |
4315 } | |
4316 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
4317 { | |
4318 #ifdef FEAT_MBYTE | |
474 | 4319 clen = (*mb_ptr2len)(p); |
22 | 4320 #endif |
4321 msg_outtrans_len(p, clen); | |
4322 #ifdef FEAT_MBYTE | |
4323 p += clen - 1; | |
7 | 4324 #endif |
4325 } | |
4326 } | |
4327 if (n > 1 && yb->y_type == MLINE) | |
4328 MSG_PUTS_ATTR("^J", attr); | |
4329 out_flush(); /* show one line at a time */ | |
4330 } | |
4331 ui_breakcheck(); | |
4332 } | |
4333 | |
4334 /* | |
4335 * display last inserted text | |
4336 */ | |
4337 if ((p = get_last_insert()) != NULL | |
4338 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
4339 { | |
4340 MSG_PUTS("\n\". "); | |
4341 dis_msg(p, TRUE); | |
4342 } | |
4343 | |
4344 /* | |
4345 * display last command line | |
4346 */ | |
4347 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
4348 && !got_int) | |
4349 { | |
4350 MSG_PUTS("\n\": "); | |
4351 dis_msg(last_cmdline, FALSE); | |
4352 } | |
4353 | |
4354 /* | |
4355 * display current file name | |
4356 */ | |
4357 if (curbuf->b_fname != NULL | |
4358 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4359 { | |
4360 MSG_PUTS("\n\"% "); | |
4361 dis_msg(curbuf->b_fname, FALSE); | |
4362 } | |
4363 | |
4364 /* | |
4365 * display alternate file name | |
4366 */ | |
4367 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4368 { | |
4369 char_u *fname; | |
4370 linenr_T dummy; | |
4371 | |
4372 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
4373 { | |
4374 MSG_PUTS("\n\"# "); | |
4375 dis_msg(fname, FALSE); | |
4376 } | |
4377 } | |
4378 | |
4379 /* | |
4380 * display last search pattern | |
4381 */ | |
4382 if (last_search_pat() != NULL | |
4383 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
4384 { | |
4385 MSG_PUTS("\n\"/ "); | |
4386 dis_msg(last_search_pat(), FALSE); | |
4387 } | |
4388 | |
4389 #ifdef FEAT_EVAL | |
4390 /* | |
4391 * display last used expression | |
4392 */ | |
4393 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
4394 && !got_int) | |
4395 { | |
4396 MSG_PUTS("\n\"= "); | |
4397 dis_msg(expr_line, FALSE); | |
4398 } | |
4399 #endif | |
4400 } | |
4401 | |
4402 /* | |
4403 * display a string for do_dis() | |
4404 * truncate at end of screen line | |
4405 */ | |
4406 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4407 dis_msg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4408 char_u *p, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4409 int skip_esc) /* if TRUE, ignore trailing ESC */ |
7 | 4410 { |
4411 int n; | |
4412 #ifdef FEAT_MBYTE | |
4413 int l; | |
4414 #endif | |
4415 | |
4416 n = (int)Columns - 6; | |
4417 while (*p != NUL | |
4418 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
4419 && (n -= ptr2cells(p)) >= 0) | |
4420 { | |
4421 #ifdef FEAT_MBYTE | |
474 | 4422 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
7 | 4423 { |
4424 msg_outtrans_len(p, l); | |
4425 p += l; | |
4426 } | |
4427 else | |
4428 #endif | |
4429 msg_outtrans_len(p++, 1); | |
4430 } | |
4431 ui_breakcheck(); | |
4432 } | |
4433 | |
3562 | 4434 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4435 /* | |
4436 * If "process" is TRUE and the line begins with a comment leader (possibly | |
4437 * after some white space), return a pointer to the text after it. Put a boolean | |
4438 * value indicating whether the line ends with an unclosed comment in | |
4439 * "is_comment". | |
4440 * line - line to be processed, | |
4441 * process - if FALSE, will only check whether the line ends with an unclosed | |
3584 | 4442 * comment, |
3562 | 4443 * include_space - whether to also skip space following the comment leader, |
4444 * is_comment - will indicate whether the current line ends with an unclosed | |
3584 | 4445 * comment. |
3562 | 4446 */ |
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4447 char_u * |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4448 skip_comment( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4449 char_u *line, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4450 int process, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4451 int include_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4452 int *is_comment) |
3562 | 4453 { |
4454 char_u *comment_flags = NULL; | |
4455 int lead_len; | |
4456 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
4457 | |
4458 *is_comment = FALSE; | |
4459 if (leader_offset != -1) | |
4460 { | |
4461 /* Let's check whether the line ends with an unclosed comment. | |
4462 * If the last comment leader has COM_END in flags, there's no comment. | |
4463 */ | |
4464 while (*comment_flags) | |
4465 { | |
4466 if (*comment_flags == COM_END | |
4467 || *comment_flags == ':') | |
4468 break; | |
4469 ++comment_flags; | |
4470 } | |
4471 if (*comment_flags != COM_END) | |
4472 *is_comment = TRUE; | |
4473 } | |
4474 | |
4475 if (process == FALSE) | |
4476 return line; | |
4477 | |
4478 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
4479 | |
4480 if (lead_len == 0) | |
4481 return line; | |
4482 | |
4483 /* Find: | |
4484 * - COM_END, | |
4485 * - colon, | |
4486 * whichever comes first. | |
4487 */ | |
4488 while (*comment_flags) | |
4489 { | |
3580 | 4490 if (*comment_flags == COM_END |
3562 | 4491 || *comment_flags == ':') |
4492 { | |
4493 break; | |
4494 } | |
4495 ++comment_flags; | |
4496 } | |
4497 | |
4498 /* If we found a colon, it means that we are not processing a line | |
3580 | 4499 * starting with a closing part of a three-part comment. That's good, |
4500 * because we don't want to remove those as this would be annoying. | |
3562 | 4501 */ |
4502 if (*comment_flags == ':' || *comment_flags == NUL) | |
4503 line += lead_len; | |
4504 | |
4505 return line; | |
4506 } | |
4507 #endif | |
4508 | |
7 | 4509 /* |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4510 * 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
|
4511 * When "save_undo" is TRUE save lines for undo first. |
5848 | 4512 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
4513 * leaders should not be removed. | |
4514 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
4515 * to set those marks. | |
7 | 4516 * |
1217 | 4517 * return FAIL for failure, OK otherwise |
7 | 4518 */ |
4519 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4520 do_join( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4521 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4522 int insert_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4523 int save_undo, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4524 int use_formatoptions UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4525 int setmark) |
7 | 4526 { |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4527 char_u *curr = NULL; |
2597 | 4528 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
|
4529 char_u *cend; |
7 | 4530 char_u *newp; |
2597 | 4531 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
|
4532 int endcurr1 = NUL; |
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4533 int endcurr2 = NUL; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4534 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
|
4535 int sumsize = 0; /* size of the long new line */ |
7 | 4536 linenr_T t; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4537 colnr_T col = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4538 int ret = OK; |
3562 | 4539 #if defined(FEAT_COMMENTS) || defined(PROTO) |
3574 | 4540 int *comments = NULL; |
3562 | 4541 int remove_comments = (use_formatoptions == TRUE) |
4542 && has_format_option(FO_REMOVE_COMS); | |
4543 int prev_was_comment; | |
4544 #endif | |
4545 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4546 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4547 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
|
4548 (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
|
4549 return FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4550 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4551 /* 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
|
4552 * 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
|
4553 * 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
|
4554 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
|
4555 if (spaces == NULL) |
7 | 4556 return FAIL; |
3562 | 4557 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4558 if (remove_comments) | |
4559 { | |
4560 comments = (int *)lalloc_clear((long_u)count * sizeof(int), TRUE); | |
4561 if (comments == NULL) | |
4562 { | |
4563 vim_free(spaces); | |
4564 return FAIL; | |
4565 } | |
4566 } | |
4567 #endif | |
7 | 4568 |
4569 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4570 * 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
|
4571 * and setup the array of space strings lengths |
7 | 4572 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4573 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
|
4574 { |
2597 | 4575 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
5848 | 4576 if (t == 0 && setmark) |
5664 | 4577 { |
4578 /* Set the '[ mark. */ | |
4579 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
4580 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
4581 } | |
3562 | 4582 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4583 if (remove_comments) | |
4584 { | |
4585 /* We don't want to remove the comment leader if the | |
4586 * previous line is not a comment. */ | |
4587 if (t > 0 && prev_was_comment) | |
4588 { | |
4589 | |
4590 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
4591 &prev_was_comment); | |
3576 | 4592 comments[t] = (int)(new_curr - curr); |
3562 | 4593 curr = new_curr; |
4594 } | |
4595 else | |
4596 curr = skip_comment(curr, FALSE, insert_space, | |
4597 &prev_was_comment); | |
4598 } | |
4599 #endif | |
4600 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4601 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
|
4602 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4603 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4604 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
|
4605 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4606 && (!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
|
4607 || (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
|
4608 && (!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
|
4609 || 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
|
4610 #endif |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4611 ) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4612 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4613 /* 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
|
4614 if (endcurr1 == ' ') |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4615 endcurr1 = endcurr2; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4616 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4617 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4618 /* 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
|
4619 if ( p_js |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4620 && (endcurr1 == '.' |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4621 || (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
|
4622 && (endcurr1 == '?' || endcurr1 == '!')))) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4623 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4624 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4625 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4626 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4627 sumsize += currsize + spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4628 endcurr1 = endcurr2 = NUL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4629 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
|
4630 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4631 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4632 if (has_mbyte) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4633 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4634 cend = curr + currsize; |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4635 MB_PTR_BACK(curr, cend); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4636 endcurr1 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4637 if (cend > curr) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4638 { |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4639 MB_PTR_BACK(curr, cend); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4640 endcurr2 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4641 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4642 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4643 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4644 #endif |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4645 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4646 endcurr1 = *(curr + currsize - 1); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4647 if (currsize > 1) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4648 endcurr2 = *(curr + currsize - 2); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4649 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4650 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4651 line_breakcheck(); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4652 if (got_int) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4653 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4654 ret = FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4655 goto theend; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4656 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4657 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4658 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4659 /* 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
|
4660 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
|
4661 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4662 /* 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
|
4663 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
|
4664 cend = newp + sumsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4665 *cend = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4666 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4667 /* |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4668 * 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
|
4669 * |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4670 * 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
|
4671 * 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
|
4672 * 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
|
4673 */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4674 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
|
4675 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4676 cend -= currsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4677 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
|
4678 if (spaces[t] > 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4679 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4680 cend -= spaces[t]; |
6929 | 4681 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
|
4682 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4683 mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t, |
2597 | 4684 (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
|
4685 if (t == 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4686 break; |
2597 | 4687 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1)); |
3562 | 4688 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4689 if (remove_comments) | |
4690 curr += comments[t - 1]; | |
4691 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4692 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
|
4693 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4694 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4695 } |
7 | 4696 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
4697 | |
5848 | 4698 if (setmark) |
4699 { | |
4700 /* Set the '] mark. */ | |
4701 curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; | |
4702 curwin->w_buffer->b_op_end.col = (colnr_T)STRLEN(newp); | |
4703 } | |
5664 | 4704 |
7 | 4705 /* Only report the change in the first line here, del_lines() will report |
4706 * the deleted line. */ | |
4707 changed_lines(curwin->w_cursor.lnum, currsize, | |
4708 curwin->w_cursor.lnum + 1, 0L); | |
4709 | |
4710 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4711 * Delete following lines. To do this we move the cursor there |
7 | 4712 * briefly, and then move it back. After del_lines() the cursor may |
4713 * have moved up (last line deleted), so the current lnum is kept in t. | |
4714 */ | |
4715 t = curwin->w_cursor.lnum; | |
4716 ++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
|
4717 del_lines(count - 1, FALSE); |
7 | 4718 curwin->w_cursor.lnum = t; |
4719 | |
4720 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4721 * Set the cursor column: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4722 * 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
|
4723 * vim: use the column of the last join |
7 | 4724 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4725 curwin->w_cursor.col = |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4726 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
7 | 4727 check_cursor_col(); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4728 |
7 | 4729 #ifdef FEAT_VIRTUALEDIT |
4730 curwin->w_cursor.coladd = 0; | |
4731 #endif | |
4732 curwin->w_set_curswant = TRUE; | |
4733 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4734 theend: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4735 vim_free(spaces); |
3562 | 4736 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4737 if (remove_comments) | |
4738 vim_free(comments); | |
4739 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4740 return ret; |
7 | 4741 } |
4742 | |
4743 #ifdef FEAT_COMMENTS | |
4744 /* | |
4745 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
4746 * the first line. White-space is ignored. Note that the whole of | |
4747 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
4748 */ | |
4749 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4750 same_leader( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4751 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4752 int leader1_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4753 char_u *leader1_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4754 int leader2_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4755 char_u *leader2_flags) |
7 | 4756 { |
4757 int idx1 = 0, idx2 = 0; | |
4758 char_u *p; | |
4759 char_u *line1; | |
4760 char_u *line2; | |
4761 | |
4762 if (leader1_len == 0) | |
4763 return (leader2_len == 0); | |
4764 | |
4765 /* | |
4766 * If first leader has 'f' flag, the lines can be joined only if the | |
4767 * second line does not have a leader. | |
4768 * If first leader has 'e' flag, the lines can never be joined. | |
4769 * If fist leader has 's' flag, the lines can only be joined if there is | |
4770 * some text after it and the second line has the 'm' flag. | |
4771 */ | |
4772 if (leader1_flags != NULL) | |
4773 { | |
4774 for (p = leader1_flags; *p && *p != ':'; ++p) | |
4775 { | |
4776 if (*p == COM_FIRST) | |
4777 return (leader2_len == 0); | |
4778 if (*p == COM_END) | |
4779 return FALSE; | |
4780 if (*p == COM_START) | |
4781 { | |
4782 if (*(ml_get(lnum) + leader1_len) == NUL) | |
4783 return FALSE; | |
4784 if (leader2_flags == NULL || leader2_len == 0) | |
4785 return FALSE; | |
4786 for (p = leader2_flags; *p && *p != ':'; ++p) | |
4787 if (*p == COM_MIDDLE) | |
4788 return TRUE; | |
4789 return FALSE; | |
4790 } | |
4791 } | |
4792 } | |
4793 | |
4794 /* | |
4795 * Get current line and next line, compare the leaders. | |
4796 * The first line has to be saved, only one line can be locked at a time. | |
4797 */ | |
4798 line1 = vim_strsave(ml_get(lnum)); | |
4799 if (line1 != NULL) | |
4800 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4801 for (idx1 = 0; VIM_ISWHITE(line1[idx1]); ++idx1) |
7 | 4802 ; |
4803 line2 = ml_get(lnum + 1); | |
4804 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
4805 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4806 if (!VIM_ISWHITE(line2[idx2])) |
7 | 4807 { |
4808 if (line1[idx1++] != line2[idx2]) | |
4809 break; | |
4810 } | |
4811 else | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4812 while (VIM_ISWHITE(line1[idx1])) |
7 | 4813 ++idx1; |
4814 } | |
4815 vim_free(line1); | |
4816 } | |
4817 return (idx2 == leader2_len && idx1 == leader1_len); | |
4818 } | |
4819 #endif | |
4820 | |
4821 /* | |
3252 | 4822 * Implementation of the format operator 'gq'. |
7 | 4823 */ |
4824 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4825 op_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4826 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4827 int keep_cursor) /* keep cursor on same text char */ |
7 | 4828 { |
4829 long old_line_count = curbuf->b_ml.ml_line_count; | |
4830 | |
4831 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
4832 * can put it back there. */ | |
4833 curwin->w_cursor = oap->cursor_start; | |
4834 | |
4835 if (u_save((linenr_T)(oap->start.lnum - 1), | |
4836 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
4837 return; | |
4838 curwin->w_cursor = oap->start; | |
4839 | |
4840 if (oap->is_VIsual) | |
4841 /* When there is no change: need to remove the Visual selection */ | |
4842 redraw_curbuf_later(INVERTED); | |
4843 | |
4844 /* Set '[ mark at the start of the formatted area */ | |
4845 curbuf->b_op_start = oap->start; | |
4846 | |
4847 /* For "gw" remember the cursor position and put it back below (adjusted | |
4848 * for joined and split lines). */ | |
4849 if (keep_cursor) | |
4850 saved_cursor = oap->cursor_start; | |
4851 | |
1563 | 4852 format_lines(oap->line_count, keep_cursor); |
7 | 4853 |
4854 /* | |
4855 * Leave the cursor at the first non-blank of the last formatted line. | |
4856 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
4857 * line, so "." will do the next lines. | |
4858 */ | |
4859 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
4860 ++curwin->w_cursor.lnum; | |
4861 beginline(BL_WHITE | BL_FIX); | |
4862 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
4863 msgmore(old_line_count); | |
4864 | |
4865 /* put '] mark on the end of the formatted area */ | |
4866 curbuf->b_op_end = curwin->w_cursor; | |
4867 | |
4868 if (keep_cursor) | |
4869 { | |
4870 curwin->w_cursor = saved_cursor; | |
4871 saved_cursor.lnum = 0; | |
4872 } | |
4873 | |
4874 if (oap->is_VIsual) | |
4875 { | |
4876 win_T *wp; | |
4877 | |
4878 FOR_ALL_WINDOWS(wp) | |
4879 { | |
4880 if (wp->w_old_cursor_lnum != 0) | |
4881 { | |
4882 /* When lines have been inserted or deleted, adjust the end of | |
4883 * the Visual area to be redrawn. */ | |
4884 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
4885 wp->w_old_cursor_lnum += old_line_count; | |
4886 else | |
4887 wp->w_old_visual_lnum += old_line_count; | |
4888 } | |
4889 } | |
4890 } | |
4891 } | |
4892 | |
667 | 4893 #if defined(FEAT_EVAL) || defined(PROTO) |
4894 /* | |
4895 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
4896 */ | |
4897 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4898 op_formatexpr(oparg_T *oap) |
667 | 4899 { |
4900 if (oap->is_VIsual) | |
4901 /* When there is no change: need to remove the Visual selection */ | |
4902 redraw_curbuf_later(INVERTED); | |
4903 | |
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4904 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
|
4905 /* 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
|
4906 * internal formatting. */ |
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4907 op_format(oap, FALSE); |
667 | 4908 } |
4909 | |
4910 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4911 fex_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4912 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4913 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4914 int c) /* character to be inserted */ |
667 | 4915 { |
681 | 4916 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
4917 OPT_LOCAL); | |
667 | 4918 int r; |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4919 char_u *fex; |
667 | 4920 |
4921 /* | |
4922 * Set v:lnum to the first line number and v:count to the number of lines. | |
844 | 4923 * Set v:char to the character to be inserted (can be NUL). |
667 | 4924 */ |
4925 set_vim_var_nr(VV_LNUM, lnum); | |
4926 set_vim_var_nr(VV_COUNT, count); | |
1969 | 4927 set_vim_var_char(c); |
844 | 4928 |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4929 /* 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
|
4930 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
|
4931 if (fex == NULL) |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4932 return 0; |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4933 |
667 | 4934 /* |
4935 * Evaluate the function. | |
4936 */ | |
4937 if (use_sandbox) | |
4938 ++sandbox; | |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4939 r = (int)eval_to_number(fex); |
667 | 4940 if (use_sandbox) |
4941 --sandbox; | |
844 | 4942 |
4943 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
|
4944 vim_free(fex); |
844 | 4945 |
667 | 4946 return r; |
4947 } | |
4948 #endif | |
4949 | |
7 | 4950 /* |
4951 * Format "line_count" lines, starting at the cursor position. | |
4952 * When "line_count" is negative, format until the end of the paragraph. | |
4953 * Lines after the cursor line are saved for undo, caller must have saved the | |
4954 * first line. | |
4955 */ | |
4956 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4957 format_lines( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4958 linenr_T line_count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4959 int avoid_fex) /* don't use 'formatexpr' */ |
7 | 4960 { |
4961 int max_len; | |
4962 int is_not_par; /* current line not part of parag. */ | |
4963 int next_is_not_par; /* next line not part of paragraph */ | |
4964 int is_end_par; /* at end of paragraph */ | |
4965 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
4966 int next_is_start_par = FALSE; | |
4967 #ifdef FEAT_COMMENTS | |
4968 int leader_len = 0; /* leader len of current line */ | |
4969 int next_leader_len; /* leader len of next line */ | |
4970 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
4971 char_u *next_leader_flags; /* flags for leader of next line */ | |
4972 int do_comments; /* format comments */ | |
3584 | 4973 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
7 | 4974 #endif |
4975 int advance = TRUE; | |
3584 | 4976 int second_indent = -1; /* indent for second line (comment |
4977 * aware) */ | |
7 | 4978 int do_second_indent; |
4979 int do_number_indent; | |
4980 int do_trail_white; | |
4981 int first_par_line = TRUE; | |
4982 int smd_save; | |
4983 long count; | |
4984 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
4985 int force_format = FALSE; | |
4986 int old_State = State; | |
4987 | |
4988 /* length of a line to force formatting: 3 * 'tw' */ | |
4989 max_len = comp_textwidth(TRUE) * 3; | |
4990 | |
4991 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
4992 #ifdef FEAT_COMMENTS | |
4993 do_comments = has_format_option(FO_Q_COMS); | |
4994 #endif | |
4995 do_second_indent = has_format_option(FO_Q_SECOND); | |
4996 do_number_indent = has_format_option(FO_Q_NUMBER); | |
4997 do_trail_white = has_format_option(FO_WHITE_PAR); | |
4998 | |
4999 /* | |
5000 * Get info about the previous and current line. | |
5001 */ | |
5002 if (curwin->w_cursor.lnum > 1) | |
5003 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
5004 #ifdef FEAT_COMMENTS | |
5005 , &leader_len, &leader_flags, do_comments | |
5006 #endif | |
5007 ); | |
5008 else | |
5009 is_not_par = TRUE; | |
5010 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
5011 #ifdef FEAT_COMMENTS | |
5012 , &next_leader_len, &next_leader_flags, do_comments | |
5013 #endif | |
5014 ); | |
5015 is_end_par = (is_not_par || next_is_not_par); | |
5016 if (!is_end_par && do_trail_white) | |
5017 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
5018 | |
5019 curwin->w_cursor.lnum--; | |
5020 for (count = line_count; count != 0 && !got_int; --count) | |
5021 { | |
5022 /* | |
5023 * Advance to next paragraph. | |
5024 */ | |
5025 if (advance) | |
5026 { | |
5027 curwin->w_cursor.lnum++; | |
5028 prev_is_end_par = is_end_par; | |
5029 is_not_par = next_is_not_par; | |
5030 #ifdef FEAT_COMMENTS | |
5031 leader_len = next_leader_len; | |
5032 leader_flags = next_leader_flags; | |
5033 #endif | |
5034 } | |
5035 | |
5036 /* | |
5037 * The last line to be formatted. | |
5038 */ | |
5039 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
5040 { | |
5041 next_is_not_par = TRUE; | |
5042 #ifdef FEAT_COMMENTS | |
5043 next_leader_len = 0; | |
5044 next_leader_flags = NULL; | |
5045 #endif | |
5046 } | |
5047 else | |
5048 { | |
5049 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
5050 #ifdef FEAT_COMMENTS | |
5051 , &next_leader_len, &next_leader_flags, do_comments | |
5052 #endif | |
5053 ); | |
5054 if (do_number_indent) | |
5055 next_is_start_par = | |
5056 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
5057 } | |
5058 advance = TRUE; | |
5059 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
5060 if (!is_end_par && do_trail_white) | |
5061 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
5062 | |
5063 /* | |
5064 * Skip lines that are not in a paragraph. | |
5065 */ | |
5066 if (is_not_par) | |
5067 { | |
5068 if (line_count < 0) | |
5069 break; | |
5070 } | |
5071 else | |
5072 { | |
5073 /* | |
5074 * For the first line of a paragraph, check indent of second line. | |
5075 * Don't do this for comments and empty lines. | |
5076 */ | |
5077 if (first_par_line | |
5078 && (do_second_indent || do_number_indent) | |
5079 && prev_is_end_par | |
3584 | 5080 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
5081 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
5082 if (do_second_indent && !LINEEMPTY(curwin->w_cursor.lnum + 1)) |
3584 | 5083 { |
5084 #ifdef FEAT_COMMENTS | |
5085 if (leader_len == 0 && next_leader_len == 0) | |
5086 { | |
5087 /* no comment found */ | |
5088 #endif | |
5089 second_indent = | |
5090 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
7 | 5091 #ifdef FEAT_COMMENTS |
3584 | 5092 } |
5093 else | |
5094 { | |
5095 second_indent = next_leader_len; | |
5096 do_comments_list = 1; | |
5097 } | |
5098 #endif | |
5099 } | |
7 | 5100 else if (do_number_indent) |
3584 | 5101 { |
5102 #ifdef FEAT_COMMENTS | |
5103 if (leader_len == 0 && next_leader_len == 0) | |
5104 { | |
5105 /* no comment found */ | |
5106 #endif | |
5107 second_indent = | |
5108 get_number_indent(curwin->w_cursor.lnum); | |
5109 #ifdef FEAT_COMMENTS | |
5110 } | |
5111 else | |
5112 { | |
5113 /* get_number_indent() is now "comment aware"... */ | |
5114 second_indent = | |
5115 get_number_indent(curwin->w_cursor.lnum); | |
5116 do_comments_list = 1; | |
5117 } | |
5118 #endif | |
5119 } | |
7 | 5120 } |
5121 | |
5122 /* | |
5123 * When the comment leader changes, it's the end of the paragraph. | |
5124 */ | |
5125 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
5126 #ifdef FEAT_COMMENTS | |
5127 || !same_leader(curwin->w_cursor.lnum, | |
5128 leader_len, leader_flags, | |
5129 next_leader_len, next_leader_flags) | |
5130 #endif | |
5131 ) | |
5132 is_end_par = TRUE; | |
5133 | |
5134 /* | |
5135 * If we have got to the end of a paragraph, or the line is | |
5136 * getting long, format it. | |
5137 */ | |
5138 if (is_end_par || force_format) | |
5139 { | |
5140 if (need_set_indent) | |
5141 /* replace indent in first line with minimal number of | |
5142 * tabs and spaces, according to current options */ | |
5143 (void)set_indent(get_indent(), SIN_CHANGED); | |
5144 | |
5145 /* put cursor on last non-space */ | |
5146 State = NORMAL; /* don't go past end-of-line */ | |
5147 coladvance((colnr_T)MAXCOL); | |
5148 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
5149 dec_cursor(); | |
5150 | |
5151 /* do the formatting, without 'showmode' */ | |
5152 State = INSERT; /* for open_line() */ | |
5153 smd_save = p_smd; | |
5154 p_smd = FALSE; | |
5155 insertchar(NUL, INSCHAR_FORMAT | |
5156 #ifdef FEAT_COMMENTS | |
5157 + (do_comments ? INSCHAR_DO_COM : 0) | |
3584 | 5158 + (do_comments && do_comments_list |
5159 ? INSCHAR_COM_LIST : 0) | |
7 | 5160 #endif |
1563 | 5161 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
7 | 5162 State = old_State; |
5163 p_smd = smd_save; | |
5164 second_indent = -1; | |
5165 /* at end of par.: need to set indent of next par. */ | |
5166 need_set_indent = is_end_par; | |
5167 if (is_end_par) | |
5168 { | |
5169 /* When called with a negative line count, break at the | |
5170 * end of the paragraph. */ | |
5171 if (line_count < 0) | |
5172 break; | |
5173 first_par_line = TRUE; | |
5174 } | |
5175 force_format = FALSE; | |
5176 } | |
5177 | |
5178 /* | |
5179 * When still in same paragraph, join the lines together. But | |
5403 | 5180 * first delete the leader from the second line. |
7 | 5181 */ |
5182 if (!is_end_par) | |
5183 { | |
5184 advance = FALSE; | |
5185 curwin->w_cursor.lnum++; | |
5186 curwin->w_cursor.col = 0; | |
5187 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
|
5188 break; |
7 | 5189 #ifdef FEAT_COMMENTS |
5190 if (next_leader_len > 0) | |
5403 | 5191 { |
5192 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
7 | 5193 mark_col_adjust(curwin->w_cursor.lnum, (colnr_T)0, 0L, |
5194 (long)-next_leader_len); | |
5403 | 5195 } else |
5196 #endif | |
5197 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
5198 { | |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
5199 int indent = getwhitecols_curline(); |
5403 | 5200 |
5201 if (indent > 0) | |
5202 { | |
5203 (void)del_bytes(indent, FALSE, FALSE); | |
5204 mark_col_adjust(curwin->w_cursor.lnum, | |
5205 (colnr_T)0, 0L, (long)-indent); | |
5415 | 5206 } |
5403 | 5207 } |
7 | 5208 curwin->w_cursor.lnum--; |
5848 | 5209 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
7 | 5210 { |
5211 beep_flush(); | |
5212 break; | |
5213 } | |
5214 first_par_line = FALSE; | |
5215 /* If the line is getting long, format it next time */ | |
5216 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
5217 force_format = TRUE; | |
5218 else | |
5219 force_format = FALSE; | |
5220 } | |
5221 } | |
5222 line_breakcheck(); | |
5223 } | |
5224 } | |
5225 | |
5226 /* | |
5227 * Return TRUE if line "lnum" ends in a white character. | |
5228 */ | |
5229 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5230 ends_in_white(linenr_T lnum) |
7 | 5231 { |
5232 char_u *s = ml_get(lnum); | |
5233 size_t l; | |
5234 | |
5235 if (*s == NUL) | |
5236 return FALSE; | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5237 /* Don't use STRLEN() inside VIM_ISWHITE(), SAS/C complains: "macro |
7 | 5238 * invocation may call function multiple times". */ |
5239 l = STRLEN(s) - 1; | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5240 return VIM_ISWHITE(s[l]); |
7 | 5241 } |
5242 | |
5243 /* | |
5244 * Blank lines, and lines containing only the comment leader, are left | |
5245 * untouched by the formatting. The function returns TRUE in this | |
5246 * case. It also returns TRUE when a line starts with the end of a comment | |
5247 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
5248 * previous line. A new paragraph starts after a blank line, or when the | |
5249 * comment leader changes -- webb. | |
5250 */ | |
5251 #ifdef FEAT_COMMENTS | |
5252 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5253 fmt_check_par( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5254 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5255 int *leader_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5256 char_u **leader_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5257 int do_comments) |
7 | 5258 { |
5259 char_u *flags = NULL; /* init for GCC */ | |
5260 char_u *ptr; | |
5261 | |
5262 ptr = ml_get(lnum); | |
5263 if (do_comments) | |
3562 | 5264 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
7 | 5265 else |
5266 *leader_len = 0; | |
5267 | |
5268 if (*leader_len > 0) | |
5269 { | |
5270 /* | |
5271 * Search for 'e' flag in comment leader flags. | |
5272 */ | |
5273 flags = *leader_flags; | |
5274 while (*flags && *flags != ':' && *flags != COM_END) | |
5275 ++flags; | |
5276 } | |
5277 | |
5278 return (*skipwhite(ptr + *leader_len) == NUL | |
5279 || (*leader_len > 0 && *flags == COM_END) | |
5280 || startPS(lnum, NUL, FALSE)); | |
5281 } | |
5282 #else | |
5283 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5284 fmt_check_par(linenr_T lnum) |
7 | 5285 { |
5286 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
5287 } | |
5288 #endif | |
5289 | |
5290 /* | |
5291 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
5292 * previous line is in the same paragraph. Used for auto-formatting. | |
5293 */ | |
5294 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5295 paragraph_start(linenr_T lnum) |
7 | 5296 { |
5297 char_u *p; | |
5298 #ifdef FEAT_COMMENTS | |
5299 int leader_len = 0; /* leader len of current line */ | |
5300 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
5301 int next_leader_len; /* leader len of next line */ | |
5302 char_u *next_leader_flags; /* flags for leader of next line */ | |
5303 int do_comments; /* format comments */ | |
5304 #endif | |
5305 | |
5306 if (lnum <= 1) | |
5307 return TRUE; /* start of the file */ | |
5308 | |
5309 p = ml_get(lnum - 1); | |
5310 if (*p == NUL) | |
5311 return TRUE; /* after empty line */ | |
5312 | |
5313 #ifdef FEAT_COMMENTS | |
5314 do_comments = has_format_option(FO_Q_COMS); | |
5315 #endif | |
5316 if (fmt_check_par(lnum - 1 | |
5317 #ifdef FEAT_COMMENTS | |
5318 , &leader_len, &leader_flags, do_comments | |
5319 #endif | |
5320 )) | |
5321 return TRUE; /* after non-paragraph line */ | |
5322 | |
5323 if (fmt_check_par(lnum | |
5324 #ifdef FEAT_COMMENTS | |
5325 , &next_leader_len, &next_leader_flags, do_comments | |
5326 #endif | |
5327 )) | |
5328 return TRUE; /* "lnum" is not a paragraph line */ | |
5329 | |
5330 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
5331 return TRUE; /* missing trailing space in previous line. */ | |
5332 | |
5333 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
5334 return TRUE; /* numbered item starts in "lnum". */ | |
5335 | |
5336 #ifdef FEAT_COMMENTS | |
5337 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
5338 next_leader_len, next_leader_flags)) | |
5339 return TRUE; /* change of comment leader. */ | |
5340 #endif | |
5341 | |
5342 return FALSE; | |
5343 } | |
5344 | |
5345 /* | |
5346 * prepare a few things for block mode yank/delete/tilde | |
5347 * | |
5348 * for delete: | |
5349 * - textlen includes the first/last char to be (partly) deleted | |
5350 * - start/endspaces is the number of columns that are taken by the | |
5351 * first/last deleted char minus the number of columns that have to be | |
1839 | 5352 * deleted. |
5353 * for yank and tilde: | |
7 | 5354 * - textlen includes the first/last char to be wholly yanked |
5355 * - start/endspaces is the number of columns of the first/last yanked char | |
5356 * that are to be yanked. | |
5357 */ | |
5358 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5359 block_prep( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5360 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5361 struct block_def *bdp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5362 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5363 int is_del) |
7 | 5364 { |
5365 int incr = 0; | |
5366 char_u *pend; | |
5367 char_u *pstart; | |
5368 char_u *line; | |
5369 char_u *prev_pstart; | |
5370 char_u *prev_pend; | |
5371 | |
5372 bdp->startspaces = 0; | |
5373 bdp->endspaces = 0; | |
5374 bdp->textlen = 0; | |
5375 bdp->start_vcol = 0; | |
5376 bdp->end_vcol = 0; | |
5377 #ifdef FEAT_VISUALEXTRA | |
5378 bdp->is_short = FALSE; | |
5379 bdp->is_oneChar = FALSE; | |
5380 bdp->pre_whitesp = 0; | |
5381 bdp->pre_whitesp_c = 0; | |
5382 bdp->end_char_vcols = 0; | |
5383 #endif | |
5384 bdp->start_char_vcols = 0; | |
5385 | |
5386 line = ml_get(lnum); | |
5387 pstart = line; | |
5388 prev_pstart = line; | |
5389 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
5390 { | |
5391 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 5392 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
7 | 5393 bdp->start_vcol += incr; |
5394 #ifdef FEAT_VISUALEXTRA | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5395 if (VIM_ISWHITE(*pstart)) |
7 | 5396 { |
5397 bdp->pre_whitesp += incr; | |
5398 bdp->pre_whitesp_c++; | |
5399 } | |
5400 else | |
5401 { | |
5402 bdp->pre_whitesp = 0; | |
5403 bdp->pre_whitesp_c = 0; | |
5404 } | |
5405 #endif | |
5406 prev_pstart = pstart; | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
5407 MB_PTR_ADV(pstart); |
7 | 5408 } |
5409 bdp->start_char_vcols = incr; | |
5410 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
5411 { | |
5412 bdp->end_vcol = bdp->start_vcol; | |
5413 #ifdef FEAT_VISUALEXTRA | |
5414 bdp->is_short = TRUE; | |
5415 #endif | |
5416 if (!is_del || oap->op_type == OP_APPEND) | |
5417 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
5418 } | |
5419 else | |
5420 { | |
5421 /* notice: this converts partly selected Multibyte characters to | |
5422 * spaces, too. */ | |
5423 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
5424 if (is_del && bdp->startspaces) | |
5425 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
5426 pend = pstart; | |
5427 bdp->end_vcol = bdp->start_vcol; | |
5428 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
5429 { | |
5430 #ifdef FEAT_VISUALEXTRA | |
5431 bdp->is_oneChar = TRUE; | |
5432 #endif | |
5433 if (oap->op_type == OP_INSERT) | |
5434 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5435 else if (oap->op_type == OP_APPEND) | |
5436 { | |
5437 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
5438 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5439 } | |
5440 else | |
5441 { | |
5442 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
5443 if (is_del && oap->op_type != OP_LSHIFT) | |
5444 { | |
5445 /* just putting the sum of those two into | |
5446 * bdp->startspaces doesn't work for Visual replace, | |
5447 * so we have to split the tab in two */ | |
5448 bdp->startspaces = bdp->start_char_vcols | |
5449 - (bdp->start_vcol - oap->start_vcol); | |
5450 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5451 } | |
5452 } | |
5453 } | |
5454 else | |
5455 { | |
5456 prev_pend = pend; | |
5457 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
5458 { | |
5459 /* Count a tab for what it's worth (if list mode not on) */ | |
5460 prev_pend = pend; | |
6535 | 5461 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
7 | 5462 bdp->end_vcol += incr; |
5463 } | |
5464 if (bdp->end_vcol <= oap->end_vcol | |
5465 && (!is_del | |
5466 || oap->op_type == OP_APPEND | |
5467 || oap->op_type == OP_REPLACE)) /* line too short */ | |
5468 { | |
5469 #ifdef FEAT_VISUALEXTRA | |
5470 bdp->is_short = TRUE; | |
5471 #endif | |
5472 /* Alternative: include spaces to fill up the block. | |
5473 * Disadvantage: can lead to trailing spaces when the line is | |
5474 * short where the text is put */ | |
5475 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
5476 if (oap->op_type == OP_APPEND || virtual_op) | |
5477 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
593 | 5478 + oap->inclusive; |
7 | 5479 else |
5480 bdp->endspaces = 0; /* replace doesn't add characters */ | |
5481 } | |
5482 else if (bdp->end_vcol > oap->end_vcol) | |
5483 { | |
5484 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5485 if (!is_del && bdp->endspaces) | |
5486 { | |
5487 bdp->endspaces = incr - bdp->endspaces; | |
5488 if (pend != pstart) | |
5489 pend = prev_pend; | |
5490 } | |
5491 } | |
5492 } | |
5493 #ifdef FEAT_VISUALEXTRA | |
5494 bdp->end_char_vcols = incr; | |
5495 #endif | |
5496 if (is_del && bdp->startspaces) | |
5497 pstart = prev_pstart; | |
5498 bdp->textlen = (int)(pend - pstart); | |
5499 } | |
5500 bdp->textcol = (colnr_T) (pstart - line); | |
5501 bdp->textstart = pstart; | |
5502 } | |
5503 | |
5504 /* | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5505 * Handle the add/subtract operator. |
7 | 5506 */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5507 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5508 op_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5509 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5510 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
|
5511 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
|
5512 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5513 pos_T pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5514 struct block_def bd; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5515 int change_cnt = 0; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5516 linenr_T amount = Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5517 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5518 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5519 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5520 pos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5521 if (u_save_cursor() == FAIL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5522 return; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5523 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
|
5524 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5525 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
|
5526 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5527 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5528 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5529 int one_change; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5530 int length; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5531 pos_T startpos; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5532 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5533 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
|
5534 (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
|
5535 return; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5536 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5537 pos = oap->start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5538 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
|
5539 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5540 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
|
5541 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5542 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
|
5543 pos.col = bd.textcol; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5544 length = bd.textlen; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5545 } |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5546 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
|
5547 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5548 curwin->w_cursor.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5549 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5550 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
|
5551 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5552 else /* oap->motion_type == MCHAR */ |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5553 { |
12996
973a0037f4c3
patch 8.0.1374: CTRL-A does not work with an empty line
Christian Brabandt <cb@256bit.org>
parents:
12642
diff
changeset
|
5554 if (pos.lnum == oap->start.lnum && !oap->inclusive) |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5555 dec(&(oap->end)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5556 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
|
5557 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5558 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
|
5559 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5560 pos.col += oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5561 length -= oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5562 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5563 if (pos.lnum == oap->end.lnum) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5564 { |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5565 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
|
5566 if (oap->end.col >= length) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5567 oap->end.col = length - 1; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5568 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
|
5569 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5570 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5571 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
|
5572 if (one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5573 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5574 /* 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
|
5575 if (change_cnt == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5576 startpos = curbuf->b_op_start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5577 ++change_cnt; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5578 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5579 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5580 #ifdef FEAT_NETBEANS_INTG |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5581 if (netbeans_active() && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5582 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5583 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
|
5584 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5585 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
|
5586 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
|
5587 &ptr[pos.col], length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5588 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5589 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5590 if (g_cmd && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5591 amount += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5592 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5593 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5594 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
|
5595 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5596 if (!change_cnt && oap->is_VIsual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5597 /* 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
|
5598 redraw_curbuf_later(INVERTED); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5599 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5600 /* 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
|
5601 * position from do_addsub(). */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5602 if (change_cnt > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5603 curbuf->b_op_start = startpos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5604 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5605 if (change_cnt > p_report) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5606 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5607 if (change_cnt == 1) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5608 MSG(_("1 line changed")); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5609 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5610 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
|
5611 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5612 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5613 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5614 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5615 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5616 * 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
|
5617 * 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
|
5618 * |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5619 * 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
|
5620 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5621 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5622 do_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5623 int op_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5624 pos_T *pos, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5625 int length, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5626 linenr_T Prenum1) |
7 | 5627 { |
5628 int col; | |
5629 char_u *buf1; | |
5630 char_u buf2[NUMBUFLEN]; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5631 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
7 | 5632 static int hexupper = FALSE; /* 0xABC */ |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5633 uvarnumber_T n; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5634 uvarnumber_T oldn; |
7 | 5635 char_u *ptr; |
5636 int c; | |
5637 int todel; | |
5638 int dohex; | |
5639 int dooct; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5640 int dobin; |
7 | 5641 int doalp; |
5642 int firstdigit; | |
5643 int subtract; | |
6868 | 5644 int negative = FALSE; |
6891 | 5645 int was_positive = TRUE; |
6868 | 5646 int visual = VIsual_active; |
6921 | 5647 int did_change = FALSE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5648 pos_T save_cursor = curwin->w_cursor; |
6927 | 5649 int maxlen = 0; |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5650 pos_T startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5651 pos_T endpos; |
7 | 5652 |
5653 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
5654 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
|
5655 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
7 | 5656 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
5657 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5658 curwin->w_cursor = *pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5659 ptr = ml_get(pos->lnum); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5660 col = pos->col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5661 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5662 if (*ptr == NUL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5663 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5664 |
7 | 5665 /* |
5666 * First check if we are on a hexadecimal number, after the "0x". | |
5667 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5668 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5669 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5670 if (dobin) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5671 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
|
5672 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5673 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5674 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5675 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5676 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
|
5677 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5678 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5679 |
6868 | 5680 if (dohex) |
5681 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
|
5682 { |
6868 | 5683 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5684 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5685 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5686 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
|
5687 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5688 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5689 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5690 if ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5691 && dohex |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5692 && ! ((col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5693 && (ptr[col] == 'X' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5694 || ptr[col] == 'x') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5695 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5696 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5697 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5698 !(*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
|
5699 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5700 && vim_isxdigit(ptr[col + 1])))) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5701 { |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5702 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5703 /* 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
|
5704 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5705 col = pos->col; |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5706 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5707 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
|
5708 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5709 col--; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5710 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5711 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5712 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
|
5713 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5714 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5715 } |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5716 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5717 if (( dohex |
6868 | 5718 && col > 0 |
5719 && (ptr[col] == 'X' | |
5720 || ptr[col] == 'x') | |
5721 && ptr[col - 1] == '0' | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5722 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5723 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5724 !(*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
|
5725 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5726 && vim_isxdigit(ptr[col + 1])) || |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5727 ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5728 && col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5729 && (ptr[col] == 'B' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5730 || ptr[col] == 'b') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5731 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5732 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5733 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5734 !(*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
|
5735 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5736 && vim_isbdigit(ptr[col + 1]))) |
6868 | 5737 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5738 /* Found hexadecimal or binary number, move to its start. */ |
7 | 5739 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5740 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5741 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5742 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
|
5743 #endif |
6868 | 5744 } |
5745 else | |
7 | 5746 { |
6868 | 5747 /* |
5748 * Search forward and then backward to find the start of number. | |
5749 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5750 col = pos->col; |
6868 | 5751 |
5752 while (ptr[col] != NUL | |
5753 && !vim_isdigit(ptr[col]) | |
5754 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5755 col += MB_PTR2LEN(ptr + col); |
6868 | 5756 |
5757 while (col > 0 | |
5758 && vim_isdigit(ptr[col - 1]) | |
5759 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5760 { |
6868 | 5761 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5762 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5763 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5764 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
|
5765 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5766 } |
6868 | 5767 } |
5768 } | |
5769 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5770 if (visual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5771 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5772 while (ptr[col] != NUL && length > 0 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5773 && !vim_isdigit(ptr[col]) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5774 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5775 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5776 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
|
5777 |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5778 col += mb_len; |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5779 length -= mb_len; |
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 if (length == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5783 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5784 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5785 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
|
5786 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5787 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5788 !(*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
|
5789 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5790 ) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5791 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5792 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5793 was_positive = FALSE; |
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 } |
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 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5798 * 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
|
5799 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5800 firstdigit = ptr[col]; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5801 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
|
5802 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5803 beep_flush(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5804 goto theend; |
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 if (doalp && ASCII_ISALPHA(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5808 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5809 /* decrement or increment alphabetic character */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5810 if (op_type == OP_NR_SUB) |
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 if (CharOrd(firstdigit) < Prenum1) |
6927 | 5813 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5814 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5815 firstdigit = 'A'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5816 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5817 firstdigit = 'a'; |
6927 | 5818 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5819 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5820 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5821 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5822 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5823 firstdigit -= Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5824 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5825 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5826 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5827 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5828 if (26 - CharOrd(firstdigit) - 1 < Prenum1) |
6927 | 5829 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5830 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5831 firstdigit = 'Z'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5832 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5833 firstdigit = 'z'; |
6927 | 5834 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5835 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5836 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5837 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5838 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5839 firstdigit += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5840 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5841 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5842 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5843 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5844 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5845 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5846 (void)del_char(FALSE); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5847 ins_char(firstdigit); |
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 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5850 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5851 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5852 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5853 if (col > 0 && ptr[col - 1] == '-' |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5854 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5855 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5856 !(*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
|
5857 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5858 && !visual) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5859 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5860 /* negative number */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5861 --col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5862 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5863 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5864 /* get the number value (unsigned) */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5865 if (visual && VIsual_mode != 'V') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5866 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
|
5867 ? (int)STRLEN(ptr) - col |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5868 : length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5869 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5870 vim_str2nr(ptr + col, &pre, &length, |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5871 0 + (dobin ? STR2NR_BIN : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5872 + (dooct ? STR2NR_OCT : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5873 + (dohex ? STR2NR_HEX : 0), |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5874 NULL, &n, maxlen); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5875 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5876 /* 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
|
5877 if (pre && negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5878 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5879 ++col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5880 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5881 negative = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5882 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5883 /* add or subtract */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5884 subtract = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5885 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5886 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5887 if (negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5888 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5889 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5890 oldn = n; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5891 if (subtract) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5892 n -= (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5893 else |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5894 n += (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5895 /* handle wraparound for decimal numbers */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5896 if (!pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5897 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5898 if (subtract) |
6927 | 5899 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5900 if (n > oldn) |
6868 | 5901 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5902 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
|
5903 negative ^= TRUE; |
6868 | 5904 } |
7 | 5905 } |
5906 else | |
6868 | 5907 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5908 /* add */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5909 if (n < oldn) |
6868 | 5910 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5911 n = (n ^ (uvarnumber_T)-1); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5912 negative ^= TRUE; |
6868 | 5913 } |
6927 | 5914 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5915 if (n == 0) |
6868 | 5916 negative = FALSE; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5917 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5918 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5919 if (visual && !was_positive && !negative && col > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5920 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5921 /* need to remove the '-' */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5922 col--; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5923 length++; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5924 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5925 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5926 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5927 * Delete the old number. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5928 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5929 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5930 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5931 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5932 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5933 todel = length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5934 c = gchar_cursor(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5935 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5936 * 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
|
5937 * 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
|
5938 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5939 if (c == '-') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5940 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5941 while (todel-- > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5942 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5943 if (c < 0x100 && isalpha(c)) |
6868 | 5944 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5945 if (isupper(c)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5946 hexupper = TRUE; |
6868 | 5947 else |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5948 hexupper = FALSE; |
6891 | 5949 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5950 /* 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
|
5951 (void)del_char(FALSE); |
6868 | 5952 c = gchar_cursor(); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5953 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5954 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5955 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5956 * Prepare the leading characters in buf1[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5957 * 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
|
5958 * Allocate a bit too much. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5959 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5960 buf1 = alloc((unsigned)length + NUMBUFLEN); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5961 if (buf1 == NULL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5962 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5963 ptr = buf1; |
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
5964 if (negative && (!visual || was_positive)) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5965 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5966 *ptr++ = '-'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5967 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5968 if (pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5969 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5970 *ptr++ = '0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5971 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5972 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5973 if (pre == 'b' || pre == 'B' || |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5974 pre == 'x' || pre == 'X') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5975 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5976 *ptr++ = pre; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5977 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5978 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5979 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5980 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5981 * Put the number characters in buf2[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5982 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5983 if (pre == 'b' || pre == 'B') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5984 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5985 int i; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5986 int bit = 0; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5987 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
|
5988 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5989 /* leading zeros */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5990 for (bit = bits; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5991 if ((n >> (bit - 1)) & 0x1) break; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5992 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5993 for (i = 0; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5994 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
|
5995 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5996 buf2[i] = '\0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5997 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5998 else if (pre == 0) |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
5999 vim_snprintf((char *)buf2, NUMBUFLEN, "%llu", |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6000 (long long unsigned)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6001 else if (pre == '0') |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6002 vim_snprintf((char *)buf2, NUMBUFLEN, "%llo", |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6003 (long long unsigned)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6004 else if (pre && hexupper) |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6005 vim_snprintf((char *)buf2, NUMBUFLEN, "%llX", |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6006 (long long unsigned)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6007 else |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6008 vim_snprintf((char *)buf2, NUMBUFLEN, "%llx", |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6009 (long long unsigned)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6010 length -= (int)STRLEN(buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6011 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6012 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6013 * 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
|
6014 * 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
|
6015 * Don't do this when |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6016 * 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
|
6017 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6018 if (firstdigit == '0' && !(dooct && pre == 0)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6019 while (length-- > 0) |
6868 | 6020 *ptr++ = '0'; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6021 *ptr = NUL; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6022 STRCAT(buf1, buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6023 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
|
6024 vim_free(buf1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6025 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6026 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
|
6027 --curwin->w_cursor.col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6028 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6029 |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6030 if (did_change) |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6031 { |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6032 /* set the '[ and '] marks */ |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6033 curbuf->b_op_start = startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6034 curbuf->b_op_end = endpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6035 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
|
6036 --curbuf->b_op_end.col; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6037 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6038 |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6039 theend: |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6040 if (visual) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6041 curwin->w_cursor = save_cursor; |
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
6042 else if (did_change) |
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
6043 curwin->w_set_curswant = TRUE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6044 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6045 return did_change; |
7 | 6046 } |
6047 | |
6048 #ifdef FEAT_VIMINFO | |
9272
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 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
|
6051 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6052 #define REG_PREVIOUS 1 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6053 #define REG_EXEC 2 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6054 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6055 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6056 * 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
|
6057 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6058 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
6059 prepare_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6060 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6061 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
|
6062 * (int)sizeof(yankreg_T)); |
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 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6065 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
6066 finish_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6067 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6068 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6069 int j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6070 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6071 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6072 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6073 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
|
6074 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
|
6075 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6076 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
|
6077 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
|
6078 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
|
6079 } |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
6080 VIM_CLEAR(y_read_regs); |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6081 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6082 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6083 |
7 | 6084 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6085 read_viminfo_register(vir_T *virp, int force) |
7 | 6086 { |
6087 int eof; | |
6088 int do_it = TRUE; | |
6089 int size; | |
6090 int limit; | |
6091 int i; | |
6092 int set_prev = FALSE; | |
6093 char_u *str; | |
6094 char_u **array = NULL; | |
6508 | 6095 int new_type = MCHAR; /* init to shut up compiler */ |
6096 colnr_T new_width = 0; /* init to shut up compiler */ | |
7 | 6097 |
6098 /* We only get here (hopefully) if line[0] == '"' */ | |
6099 str = virp->vir_line + 1; | |
1893 | 6100 |
6101 /* If the line starts with "" this is the y_previous register. */ | |
7 | 6102 if (*str == '"') |
6103 { | |
6104 set_prev = TRUE; | |
6105 str++; | |
6106 } | |
1893 | 6107 |
7 | 6108 if (!ASCII_ISALNUM(*str) && *str != '-') |
6109 { | |
6110 if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line)) | |
6111 return TRUE; /* too many errors, pretend end-of-file */ | |
6112 do_it = FALSE; | |
6113 } | |
6114 get_yank_register(*str++, FALSE); | |
6115 if (!force && y_current->y_array != NULL) | |
6116 do_it = FALSE; | |
1893 | 6117 |
6118 if (*str == '@') | |
6119 { | |
6120 /* "x@: register x used for @@ */ | |
6121 if (force || execreg_lastc == NUL) | |
6122 execreg_lastc = str[-1]; | |
6123 } | |
6124 | |
7 | 6125 size = 0; |
6126 limit = 100; /* Optimized for registers containing <= 100 lines */ | |
6127 if (do_it) | |
6128 { | |
6462 | 6129 /* |
6130 * Build the new register in array[]. | |
6131 * y_array is kept as-is until done. | |
6132 * The "do_it" flag is reset when something is wrong, in which case | |
6133 * array[] needs to be freed. | |
6134 */ | |
7 | 6135 if (set_prev) |
6136 y_previous = y_current; | |
6462 | 6137 array = (char_u **)alloc((unsigned)(limit * sizeof(char_u *))); |
1893 | 6138 str = skipwhite(skiptowhite(str)); |
7 | 6139 if (STRNCMP(str, "CHAR", 4) == 0) |
6462 | 6140 new_type = MCHAR; |
7 | 6141 else if (STRNCMP(str, "BLOCK", 5) == 0) |
6462 | 6142 new_type = MBLOCK; |
7 | 6143 else |
6462 | 6144 new_type = MLINE; |
7 | 6145 /* get the block width; if it's missing we get a zero, which is OK */ |
6146 str = skipwhite(skiptowhite(str)); | |
6462 | 6147 new_width = getdigits(&str); |
7 | 6148 } |
6149 | |
6150 while (!(eof = viminfo_readline(virp)) | |
6151 && (virp->vir_line[0] == TAB || virp->vir_line[0] == '<')) | |
6152 { | |
6153 if (do_it) | |
6154 { | |
6462 | 6155 if (size == limit) |
7 | 6156 { |
6462 | 6157 char_u **new_array = (char_u **) |
7 | 6158 alloc((unsigned)(limit * 2 * sizeof(char_u *))); |
6462 | 6159 |
6160 if (new_array == NULL) | |
6161 { | |
6162 do_it = FALSE; | |
6163 break; | |
6164 } | |
7 | 6165 for (i = 0; i < limit; i++) |
6462 | 6166 new_array[i] = array[i]; |
7 | 6167 vim_free(array); |
6462 | 6168 array = new_array; |
7 | 6169 limit *= 2; |
6170 } | |
6171 str = viminfo_readstring(virp, 1, TRUE); | |
6172 if (str != NULL) | |
6173 array[size++] = str; | |
6174 else | |
6462 | 6175 /* error, don't store the result */ |
7 | 6176 do_it = FALSE; |
6177 } | |
6178 } | |
6508 | 6179 |
7 | 6180 if (do_it) |
6181 { | |
6462 | 6182 /* free y_array[] */ |
6183 for (i = 0; i < y_current->y_size; i++) | |
6184 vim_free(y_current->y_array[i]); | |
6185 vim_free(y_current->y_array); | |
6186 | |
6187 y_current->y_type = new_type; | |
6188 y_current->y_width = new_width; | |
6189 y_current->y_size = size; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6190 y_current->y_time_set = 0; |
7 | 6191 if (size == 0) |
6192 { | |
6193 y_current->y_array = NULL; | |
6194 } | |
6462 | 6195 else |
7 | 6196 { |
6462 | 6197 /* Move the lines from array[] to y_array[]. */ |
7 | 6198 y_current->y_array = |
6199 (char_u **)alloc((unsigned)(size * sizeof(char_u *))); | |
6200 for (i = 0; i < size; i++) | |
6462 | 6201 { |
6202 if (y_current->y_array == NULL) | |
6203 vim_free(array[i]); | |
6204 else | |
6205 y_current->y_array[i] = array[i]; | |
6206 } | |
7 | 6207 } |
6462 | 6208 } |
6209 else | |
6210 { | |
6211 /* Free array[] if it was filled. */ | |
6212 for (i = 0; i < size; i++) | |
6213 vim_free(array[i]); | |
6214 } | |
6215 vim_free(array); | |
6216 | |
7 | 6217 return eof; |
6218 } | |
6219 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6220 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6221 * 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
|
6222 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6223 void |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6224 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
|
6225 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6226 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
|
6227 int flags; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6228 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6229 int type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6230 int linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6231 int width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6232 time_t timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6233 yankreg_T *y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6234 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6235 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6236 /* Check the format: |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6237 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6238 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6239 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6240 if (values->ga_len < 6 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6241 || vp[0].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6242 || vp[1].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6243 || vp[2].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6244 || vp[3].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6245 || vp[4].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6246 || vp[5].bv_type != BVAL_NR) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6247 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6248 flags = vp[0].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6249 name = vp[1].bv_nr; |
9307
eb52a2670c96
commit https://github.com/vim/vim/commit/67e3720a9ddd8a9d2e8344358c28fa1f4196db0d
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
6250 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
|
6251 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6252 type = vp[2].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6253 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
|
6254 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6255 linecount = vp[3].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6256 if (values->ga_len < 6 + linecount) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6257 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6258 width = vp[4].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6259 if (width < 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6260 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6261 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6262 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6263 /* 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
|
6264 * 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
|
6265 y_ptr = &y_read_regs[name]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6266 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6267 y_ptr = &y_regs[name]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6268 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6269 /* 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
|
6270 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
|
6271 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
|
6272 && (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
|
6273 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6274 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6275 if (y_ptr->y_array != NULL) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6276 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
|
6277 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
|
6278 vim_free(y_ptr->y_array); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6279 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6280 if (y_read_regs == NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6281 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6282 if (flags & REG_PREVIOUS) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6283 y_previous = y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6284 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
|
6285 execreg_lastc = get_register_name(name); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6286 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6287 y_ptr->y_type = type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6288 y_ptr->y_width = width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6289 y_ptr->y_size = linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6290 y_ptr->y_time_set = timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6291 if (linecount == 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6292 y_ptr->y_array = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6293 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6294 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6295 y_ptr->y_array = |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6296 (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
|
6297 for (i = 0; i < linecount; i++) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6298 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6299 if (vp[i + 6].bv_allocated) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6300 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6301 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
|
6302 vp[i + 6].bv_string = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6303 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6304 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6305 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
|
6306 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6307 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6308 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6309 |
7 | 6310 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6311 write_viminfo_registers(FILE *fp) |
7 | 6312 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6313 int i, j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6314 char_u *type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6315 char_u c; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6316 int num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6317 int max_num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6318 int max_kbyte; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6319 long len; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6320 yankreg_T *y_ptr; |
7 | 6321 |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
6322 fputs(_("\n# Registers:\n"), fp); |
7 | 6323 |
6324 /* Get '<' value, use old '"' value if '<' is not found. */ | |
6325 max_num_lines = get_viminfo_parameter('<'); | |
6326 if (max_num_lines < 0) | |
6327 max_num_lines = get_viminfo_parameter('"'); | |
6328 if (max_num_lines == 0) | |
6329 return; | |
6330 max_kbyte = get_viminfo_parameter('s'); | |
6331 if (max_kbyte == 0) | |
6332 return; | |
1893 | 6333 |
7 | 6334 for (i = 0; i < NUM_REGISTERS; i++) |
6335 { | |
6336 #ifdef FEAT_CLIPBOARD | |
6337 /* Skip '*'/'+' register, we don't want them back next time */ | |
6338 if (i == STAR_REGISTER || i == PLUS_REGISTER) | |
6339 continue; | |
6340 #endif | |
6341 #ifdef FEAT_DND | |
6342 /* Neither do we want the '~' register */ | |
6343 if (i == TILDE_REGISTER) | |
6344 continue; | |
6345 #endif | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6346 /* 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
|
6347 * viminfo if it's newer. */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6348 if (y_read_regs != NULL |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6349 && 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
|
6350 && (y_regs[i].y_array == NULL || |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6351 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
|
6352 y_ptr = &y_read_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6353 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
|
6354 continue; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6355 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6356 y_ptr = &y_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6357 |
55 | 6358 /* Skip empty registers. */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6359 num_lines = y_ptr->y_size; |
55 | 6360 if (num_lines == 0 |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6361 || (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
|
6362 && *y_ptr->y_array[0] == NUL)) |
55 | 6363 continue; |
6364 | |
7 | 6365 if (max_kbyte > 0) |
6366 { | |
6367 /* Skip register if there is more text than the maximum size. */ | |
6368 len = 0; | |
6369 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
|
6370 len += (long)STRLEN(y_ptr->y_array[j]) + 1L; |
7 | 6371 if (len > (long)max_kbyte * 1024L) |
6372 continue; | |
6373 } | |
6374 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6375 switch (y_ptr->y_type) |
7 | 6376 { |
6377 case MLINE: | |
6378 type = (char_u *)"LINE"; | |
6379 break; | |
6380 case MCHAR: | |
6381 type = (char_u *)"CHAR"; | |
6382 break; | |
6383 case MBLOCK: | |
6384 type = (char_u *)"BLOCK"; | |
6385 break; | |
6386 default: | |
6387 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
|
6388 y_ptr->y_type); |
7 | 6389 emsg(IObuff); |
6390 type = (char_u *)"LINE"; | |
6391 break; | |
6392 } | |
6393 if (y_previous == &y_regs[i]) | |
6394 fprintf(fp, "\""); | |
6395 c = get_register_name(i); | |
1893 | 6396 fprintf(fp, "\"%c", c); |
6397 if (c == execreg_lastc) | |
6398 fprintf(fp, "@"); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6399 fprintf(fp, "\t%s\t%d\n", type, (int)y_ptr->y_width); |
7 | 6400 |
6401 /* If max_num_lines < 0, then we save ALL the lines in the register */ | |
6402 if (max_num_lines > 0 && num_lines > max_num_lines) | |
6403 num_lines = max_num_lines; | |
6404 for (j = 0; j < num_lines; j++) | |
6405 { | |
6406 putc('\t', fp); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6407 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
|
6408 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6409 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6410 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6411 int flags = 0; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6412 int remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6413 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6414 /* 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
|
6415 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6416 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6417 * flags: REG_PREVIOUS - register is y_previous |
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
6418 * REG_EXEC - used for @@ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6419 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6420 if (y_previous == &y_regs[i]) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6421 flags |= REG_PREVIOUS; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6422 if (c == execreg_lastc) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6423 flags |= REG_EXEC; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6424 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
|
6425 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
|
6426 (long)y_ptr->y_time_set); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6427 /* 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
|
6428 remaining = LSIZE - 71; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6429 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
|
6430 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6431 putc(',', fp); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6432 --remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6433 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
|
6434 remaining); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6435 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6436 putc('\n', fp); |
7 | 6437 } |
6438 } | |
6439 } | |
6440 #endif /* FEAT_VIMINFO */ | |
6441 | |
6442 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
6443 /* | |
6444 * SELECTION / PRIMARY ('*') | |
6445 * | |
6446 * Text selection stuff that uses the GUI selection register '*'. When using a | |
6447 * GUI this may be text from another window, otherwise it is the last text we | |
6448 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
6449 * button performs the paste, otherwise you will need to do <"*p>. " | |
6450 * If not under X, it is synonymous with the clipboard register '+'. | |
6451 * | |
6452 * X CLIPBOARD ('+') | |
6453 * | |
6454 * Text selection stuff that uses the GUI clipboard register '+'. | |
6455 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
6456 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
6457 * otherwise you will need to do <"+p>. " | |
6458 * If not under X, it is synonymous with the selection register '*'. | |
6459 */ | |
6460 | |
6461 /* | |
6462 * Routine to export any final X selection we had to the environment | |
11065
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
6463 * so that the text is still available after Vim has exited. X selections |
7 | 6464 * only exist while the owning application exists, so we write to the |
6465 * permanent (while X runs) store CUT_BUFFER0. | |
6466 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
6467 * 'permanent' of the two), otherwise the PRIMARY one. | |
6468 * For now, use a hard-coded sanity limit of 1Mb of data. | |
6469 */ | |
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
6470 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
7 | 6471 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6472 x11_export_final_selection(void) |
7 | 6473 { |
6474 Display *dpy; | |
6475 char_u *str = NULL; | |
6476 long_u len = 0; | |
6477 int motion_type = -1; | |
6478 | |
6479 # ifdef FEAT_GUI | |
6480 if (gui.in_use) | |
6481 dpy = X_DISPLAY; | |
6482 else | |
6483 # endif | |
6484 # ifdef FEAT_XCLIPBOARD | |
6485 dpy = xterm_dpy; | |
6486 # else | |
6487 return; | |
6488 # endif | |
6489 | |
6490 /* Get selection to export */ | |
6491 if (clip_plus.owned) | |
6492 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
6493 else if (clip_star.owned) | |
6494 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
6495 | |
6496 /* Check it's OK */ | |
6497 if (dpy != NULL && str != NULL && motion_type >= 0 | |
6498 && len < 1024*1024 && len > 0) | |
6499 { | |
1924 | 6500 #ifdef FEAT_MBYTE |
4201 | 6501 int ok = TRUE; |
6502 | |
1924 | 6503 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
6504 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
6505 * encoding conversion usually doesn't work, so keep the text as-is. | |
6506 */ | |
6507 if (has_mbyte) | |
6508 { | |
6509 vimconv_T vc; | |
6510 | |
6511 vc.vc_type = CONV_NONE; | |
6512 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
6513 { | |
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6514 int intlen = len; |
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6515 char_u *conv_str; |
2007 | 6516 |
4201 | 6517 vc.vc_fail = TRUE; |
2007 | 6518 conv_str = string_convert(&vc, str, &intlen); |
6519 len = intlen; | |
1924 | 6520 if (conv_str != NULL) |
6521 { | |
6522 vim_free(str); | |
6523 str = conv_str; | |
6524 } | |
4201 | 6525 else |
6526 { | |
6527 ok = FALSE; | |
6528 } | |
1924 | 6529 convert_setup(&vc, NULL, NULL); |
6530 } | |
4201 | 6531 else |
6532 { | |
6533 ok = FALSE; | |
6534 } | |
1924 | 6535 } |
4201 | 6536 |
6537 /* Do not store the string if conversion failed. Better to use any | |
6538 * other selection than garbled text. */ | |
6539 if (ok) | |
6540 #endif | |
6541 { | |
6542 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
6543 XFlush(dpy); | |
6544 } | |
7 | 6545 } |
6546 | |
6547 vim_free(str); | |
6548 } | |
6549 #endif | |
6550 | |
6551 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6552 clip_free_selection(VimClipboard *cbd) |
7 | 6553 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6554 yankreg_T *y_ptr = y_current; |
7 | 6555 |
6556 if (cbd == &clip_plus) | |
6557 y_current = &y_regs[PLUS_REGISTER]; | |
6558 else | |
6559 y_current = &y_regs[STAR_REGISTER]; | |
6560 free_yank_all(); | |
6561 y_current->y_size = 0; | |
6562 y_current = y_ptr; | |
6563 } | |
6564 | |
6565 /* | |
6566 * Get the selected text and put it in the gui selection register '*' or '+'. | |
6567 */ | |
6568 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6569 clip_get_selection(VimClipboard *cbd) |
7 | 6570 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6571 yankreg_T *old_y_previous, *old_y_current; |
7 | 6572 pos_T old_cursor; |
6573 pos_T old_visual; | |
6574 int old_visual_mode; | |
6575 colnr_T old_curswant; | |
6576 int old_set_curswant; | |
6577 pos_T old_op_start, old_op_end; | |
6578 oparg_T oa; | |
6579 cmdarg_T ca; | |
6580 | |
6581 if (cbd->owned) | |
6582 { | |
6583 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
6584 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
6585 return; | |
6586 | |
6587 /* Get the text between clip_star.start & clip_star.end */ | |
6588 old_y_previous = y_previous; | |
6589 old_y_current = y_current; | |
6590 old_cursor = curwin->w_cursor; | |
6591 old_curswant = curwin->w_curswant; | |
6592 old_set_curswant = curwin->w_set_curswant; | |
6593 old_op_start = curbuf->b_op_start; | |
6594 old_op_end = curbuf->b_op_end; | |
6595 old_visual = VIsual; | |
6596 old_visual_mode = VIsual_mode; | |
6597 clear_oparg(&oa); | |
6598 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
6599 oa.op_type = OP_YANK; | |
6600 vim_memset(&ca, 0, sizeof(ca)); | |
6601 ca.oap = &oa; | |
6602 ca.cmdchar = 'y'; | |
6603 ca.count1 = 1; | |
6604 ca.retval = CA_NO_ADJ_OP_END; | |
6605 do_pending_operator(&ca, 0, TRUE); | |
6606 y_previous = old_y_previous; | |
6607 y_current = old_y_current; | |
6608 curwin->w_cursor = old_cursor; | |
688 | 6609 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
7 | 6610 curwin->w_curswant = old_curswant; |
6611 curwin->w_set_curswant = old_set_curswant; | |
6612 curbuf->b_op_start = old_op_start; | |
6613 curbuf->b_op_end = old_op_end; | |
6614 VIsual = old_visual; | |
6615 VIsual_mode = old_visual_mode; | |
6616 } | |
11273
96d83cd2904a
patch 8.0.0522: Win32: when 'clipboard' is "unnamed" yyp does not work
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
6617 else if (!is_clipboard_needs_update()) |
7 | 6618 { |
6619 clip_free_selection(cbd); | |
6620 | |
6621 /* Try to get selected text from another window */ | |
6622 clip_gen_request_selection(cbd); | |
6623 } | |
6624 } | |
6625 | |
2896 | 6626 /* |
6627 * Convert from the GUI selection string into the '*'/'+' register. | |
6628 */ | |
7 | 6629 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6630 clip_yank_selection( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6631 int type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6632 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6633 long len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6634 VimClipboard *cbd) |
7 | 6635 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6636 yankreg_T *y_ptr; |
7 | 6637 |
6638 if (cbd == &clip_plus) | |
6639 y_ptr = &y_regs[PLUS_REGISTER]; | |
6640 else | |
6641 y_ptr = &y_regs[STAR_REGISTER]; | |
6642 | |
6643 clip_free_selection(cbd); | |
6644 | |
5798 | 6645 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
7 | 6646 } |
6647 | |
6648 /* | |
6649 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
6650 * with length *len. | |
6651 * Returns the motion type, or -1 for failure. | |
6652 */ | |
6653 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6654 clip_convert_selection(char_u **str, long_u *len, VimClipboard *cbd) |
7 | 6655 { |
6656 char_u *p; | |
6657 int lnum; | |
6658 int i, j; | |
6659 int_u eolsize; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6660 yankreg_T *y_ptr; |
7 | 6661 |
6662 if (cbd == &clip_plus) | |
6663 y_ptr = &y_regs[PLUS_REGISTER]; | |
6664 else | |
6665 y_ptr = &y_regs[STAR_REGISTER]; | |
6666 | |
6667 #ifdef USE_CRNL | |
6668 eolsize = 2; | |
6669 #else | |
6670 eolsize = 1; | |
6671 #endif | |
6672 | |
6673 *str = NULL; | |
6674 *len = 0; | |
6675 if (y_ptr->y_array == NULL) | |
6676 return -1; | |
6677 | |
6678 for (i = 0; i < y_ptr->y_size; i++) | |
6679 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
6680 | |
6681 /* | |
6682 * Don't want newline character at end of last line if we're in MCHAR mode. | |
6683 */ | |
6684 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
6685 *len -= eolsize; | |
6686 | |
6687 p = *str = lalloc(*len + 1, TRUE); /* add one to avoid zero */ | |
6688 if (p == NULL) | |
6689 return -1; | |
6690 lnum = 0; | |
6691 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
6692 { | |
6693 if (y_ptr->y_array[lnum][j] == '\n') | |
6694 p[i] = NUL; | |
6695 else if (y_ptr->y_array[lnum][j] == NUL) | |
6696 { | |
6697 #ifdef USE_CRNL | |
6698 p[i++] = '\r'; | |
6699 #endif | |
6700 #ifdef USE_CR | |
6701 p[i] = '\r'; | |
6702 #else | |
6703 p[i] = '\n'; | |
6704 #endif | |
6705 lnum++; | |
6706 j = -1; | |
6707 } | |
6708 else | |
6709 p[i] = y_ptr->y_array[lnum][j]; | |
6710 } | |
6711 return y_ptr->y_type; | |
6712 } | |
6713 | |
6714 | |
6715 /* | |
6716 * If we have written to a clipboard register, send the text to the clipboard. | |
6717 */ | |
6718 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6719 may_set_selection(void) |
7 | 6720 { |
6721 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
6722 { | |
6723 clip_own_selection(&clip_star); | |
6724 clip_gen_set_selection(&clip_star); | |
6725 } | |
6726 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
6727 { | |
6728 clip_own_selection(&clip_plus); | |
6729 clip_gen_set_selection(&clip_plus); | |
6730 } | |
6731 } | |
6732 | |
6733 #endif /* FEAT_CLIPBOARD || PROTO */ | |
6734 | |
6735 | |
6736 #if defined(FEAT_DND) || defined(PROTO) | |
6737 /* | |
6738 * Replace the contents of the '~' register with str. | |
6739 */ | |
6740 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6741 dnd_yank_drag_data(char_u *str, long len) |
7 | 6742 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6743 yankreg_T *curr; |
7 | 6744 |
6745 curr = y_current; | |
6746 y_current = &y_regs[TILDE_REGISTER]; | |
6747 free_yank_all(); | |
5798 | 6748 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
7 | 6749 y_current = curr; |
6750 } | |
6751 #endif | |
6752 | |
6753 | |
6754 #if defined(FEAT_EVAL) || defined(PROTO) | |
6755 /* | |
6756 * Return the type of a register. | |
6757 * Used for getregtype() | |
6758 * Returns MAUTO for error. | |
6759 */ | |
6760 char_u | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6761 get_reg_type(int regname, long *reglen) |
7 | 6762 { |
6763 switch (regname) | |
6764 { | |
6765 case '%': /* file name */ | |
6766 case '#': /* alternate file name */ | |
6767 case '=': /* expression */ | |
6768 case ':': /* last command line */ | |
6769 case '/': /* last search-pattern */ | |
6770 case '.': /* last inserted text */ | |
6771 #ifdef FEAT_SEARCHPATH | |
6772 case Ctrl_F: /* Filename under cursor */ | |
6773 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
6774 #endif | |
6775 case Ctrl_W: /* word under cursor */ | |
6776 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
6777 case '_': /* black hole: always empty */ | |
6778 return MCHAR; | |
6779 } | |
6780 | |
6781 #ifdef FEAT_CLIPBOARD | |
6782 regname = may_get_selection(regname); | |
6783 #endif | |
6784 | |
5596 | 6785 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
|
6786 return MAUTO; |
5596 | 6787 |
7 | 6788 get_yank_register(regname, FALSE); |
6789 | |
6790 if (y_current->y_array != NULL) | |
6791 { | |
6792 if (reglen != NULL && y_current->y_type == MBLOCK) | |
6793 *reglen = y_current->y_width; | |
6794 return y_current->y_type; | |
6795 } | |
6796 return MAUTO; | |
6797 } | |
6798 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
6799 static char_u *getreg_wrap_one_line(char_u *s, int flags); |
5796 | 6800 |
6801 /* | |
6802 * When "flags" has GREG_LIST return a list with text "s". | |
6803 * Otherwise just return "s". | |
6804 */ | |
6805 static char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6806 getreg_wrap_one_line(char_u *s, int flags) |
5796 | 6807 { |
6808 if (flags & GREG_LIST) | |
6809 { | |
6810 list_T *list = list_alloc(); | |
6811 | |
6812 if (list != NULL) | |
6813 { | |
6814 if (list_append_string(list, NULL, -1) == FAIL) | |
6815 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6816 list_free(list); |
5796 | 6817 return NULL; |
6818 } | |
6819 list->lv_first->li_tv.vval.v_string = s; | |
6820 } | |
6821 return (char_u *)list; | |
6822 } | |
6823 return s; | |
6824 } | |
6825 | |
7 | 6826 /* |
6827 * Return the contents of a register as a single allocated string. | |
6828 * Used for "@r" in expressions and for getreg(). | |
6829 * Returns NULL for error. | |
5796 | 6830 * Flags: |
6831 * GREG_NO_EXPR Do not allow expression register | |
6832 * GREG_EXPR_SRC For the expression register: return expression itself, | |
6833 * not the result of its evaluation. | |
6834 * GREG_LIST Return a list of lines in place of a single string. | |
7 | 6835 */ |
6836 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6837 get_reg_contents(int regname, int flags) |
7 | 6838 { |
6839 long i; | |
6840 char_u *retval; | |
6841 int allocated; | |
6842 long len; | |
6843 | |
6844 /* Don't allow using an expression register inside an expression */ | |
6845 if (regname == '=') | |
6846 { | |
5796 | 6847 if (flags & GREG_NO_EXPR) |
6848 return NULL; | |
6849 if (flags & GREG_EXPR_SRC) | |
6850 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
6851 return getreg_wrap_one_line(get_expr_line(), flags); | |
7 | 6852 } |
6853 | |
6854 if (regname == '@') /* "@@" is used for unnamed register */ | |
6855 regname = '"'; | |
6856 | |
6857 /* check for valid regname */ | |
6858 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
6859 return NULL; | |
6860 | |
6861 #ifdef FEAT_CLIPBOARD | |
6862 regname = may_get_selection(regname); | |
6863 #endif | |
6864 | |
6865 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
6866 { | |
6867 if (retval == NULL) | |
6868 return NULL; | |
5796 | 6869 if (allocated) |
6870 return getreg_wrap_one_line(retval, flags); | |
6871 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
7 | 6872 } |
6873 | |
6874 get_yank_register(regname, FALSE); | |
6875 if (y_current->y_array == NULL) | |
6876 return NULL; | |
6877 | |
5796 | 6878 if (flags & GREG_LIST) |
6879 { | |
6880 list_T *list = list_alloc(); | |
6881 int error = FALSE; | |
6882 | |
6883 if (list == NULL) | |
6884 return NULL; | |
6885 for (i = 0; i < y_current->y_size; ++i) | |
6886 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
6887 error = TRUE; | |
6888 if (error) | |
6889 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6890 list_free(list); |
5796 | 6891 return NULL; |
6892 } | |
6893 return (char_u *)list; | |
6894 } | |
6895 | |
7 | 6896 /* |
6897 * Compute length of resulting string. | |
6898 */ | |
6899 len = 0; | |
6900 for (i = 0; i < y_current->y_size; ++i) | |
6901 { | |
6902 len += (long)STRLEN(y_current->y_array[i]); | |
6903 /* | |
6904 * Insert a newline between lines and after last line if | |
6905 * y_type is MLINE. | |
6906 */ | |
6907 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6908 ++len; | |
6909 } | |
6910 | |
6911 retval = lalloc(len + 1, TRUE); | |
6912 | |
6913 /* | |
6914 * Copy the lines of the yank register into the string. | |
6915 */ | |
6916 if (retval != NULL) | |
6917 { | |
6918 len = 0; | |
6919 for (i = 0; i < y_current->y_size; ++i) | |
6920 { | |
6921 STRCPY(retval + len, y_current->y_array[i]); | |
6922 len += (long)STRLEN(retval + len); | |
6923 | |
6924 /* | |
6925 * Insert a NL between lines and after the last line if y_type is | |
6926 * MLINE. | |
6927 */ | |
6928 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6929 retval[len++] = '\n'; | |
6930 } | |
6931 retval[len] = NUL; | |
6932 } | |
6933 | |
6934 return retval; | |
6935 } | |
6936 | |
5798 | 6937 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6938 init_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6939 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6940 yankreg_T **old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6941 yankreg_T **old_y_current, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6942 int must_append, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6943 int *yank_type UNUSED) |
5798 | 6944 { |
6945 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
6946 { | |
6947 emsg_invreg(name); | |
6948 return FAIL; | |
6949 } | |
6950 | |
6951 /* Don't want to change the current (unnamed) register */ | |
6952 *old_y_previous = y_previous; | |
6953 *old_y_current = y_current; | |
6954 | |
6955 get_yank_register(name, TRUE); | |
6956 if (!y_append && !must_append) | |
6957 free_yank_all(); | |
6958 return OK; | |
6959 } | |
6960 | |
6961 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6962 finish_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6963 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6964 yankreg_T *old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6965 yankreg_T *old_y_current) |
5798 | 6966 { |
6967 # ifdef FEAT_CLIPBOARD | |
6968 /* Send text of clipboard register to the clipboard. */ | |
6969 may_set_selection(); | |
6970 # endif | |
6971 | |
6972 /* ':let @" = "val"' should change the meaning of the "" register */ | |
6973 if (name != '"') | |
6974 y_previous = old_y_previous; | |
6975 y_current = old_y_current; | |
6976 } | |
6977 | |
7 | 6978 /* |
6979 * Store string "str" in register "name". | |
6980 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
6981 * If "must_append" is TRUE, always append to the register. Otherwise append | |
6982 * if "name" is an uppercase letter. | |
6983 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
6984 * Careful: 'str' is modified, you may have to use a copy! | |
6985 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
6986 */ | |
6987 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6988 write_reg_contents( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6989 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6990 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6991 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6992 int must_append) |
7 | 6993 { |
6994 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
6995 } | |
6996 | |
6997 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6998 write_reg_contents_lst( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6999 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7000 char_u **strings, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7001 int maxlen UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7002 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7003 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7004 long block_len) |
5798 | 7005 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7006 yankreg_T *old_y_previous, *old_y_current; |
5798 | 7007 |
7008 if (name == '/' | |
7009 #ifdef FEAT_EVAL | |
7010 || name == '=' | |
7011 #endif | |
7012 ) | |
7013 { | |
7014 char_u *s; | |
7015 | |
7016 if (strings[0] == NULL) | |
7017 s = (char_u *)""; | |
7018 else if (strings[1] != NULL) | |
7019 { | |
7020 EMSG(_("E883: search pattern and expression register may not " | |
7021 "contain two or more lines")); | |
7022 return; | |
7023 } | |
7024 else | |
7025 s = strings[0]; | |
7026 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
7027 return; | |
7028 } | |
7029 | |
7030 if (name == '_') /* black hole: nothing to do */ | |
7031 return; | |
7032 | |
7033 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
7034 &yank_type) == FAIL) | |
7035 return; | |
7036 | |
7037 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
7038 | |
7039 finish_write_reg(name, old_y_previous, old_y_current); | |
7040 } | |
7041 | |
7042 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7043 write_reg_contents_ex( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7044 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7045 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7046 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7047 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7048 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7049 long block_len) |
7 | 7050 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7051 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
|
7052 long len; |
7 | 7053 |
336 | 7054 if (maxlen >= 0) |
7055 len = maxlen; | |
7056 else | |
7057 len = (long)STRLEN(str); | |
7058 | |
7 | 7059 /* Special case: '/' search pattern */ |
7060 if (name == '/') | |
7061 { | |
7062 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
7063 return; | |
7064 } | |
7065 | |
6557 | 7066 if (name == '#') |
7067 { | |
7068 buf_T *buf; | |
7069 | |
7070 if (VIM_ISDIGIT(*str)) | |
7071 { | |
7072 int num = atoi((char *)str); | |
7073 | |
7074 buf = buflist_findnr(num); | |
7075 if (buf == NULL) | |
7076 EMSGN(_(e_nobufnr), (long)num); | |
7077 } | |
7078 else | |
7079 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
7080 TRUE, FALSE, FALSE)); | |
7081 if (buf == NULL) | |
7082 return; | |
7083 curwin->w_alt_fnum = buf->b_fnum; | |
7084 return; | |
7085 } | |
7086 | |
336 | 7087 #ifdef FEAT_EVAL |
7088 if (name == '=') | |
7089 { | |
7090 char_u *p, *s; | |
7091 | |
7092 p = vim_strnsave(str, (int)len); | |
7093 if (p == NULL) | |
7094 return; | |
7095 if (must_append) | |
7096 { | |
7097 s = concat_str(get_expr_line_src(), p); | |
7098 vim_free(p); | |
7099 p = s; | |
7100 } | |
7101 set_expr_line(p); | |
7102 return; | |
7103 } | |
7104 #endif | |
7105 | |
7 | 7106 if (name == '_') /* black hole: nothing to do */ |
7107 return; | |
7108 | |
5798 | 7109 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
7110 &yank_type) == FAIL) | |
7111 return; | |
7112 | |
7113 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
7114 | |
7115 finish_write_reg(name, old_y_previous, old_y_current); | |
7 | 7116 } |
7117 #endif /* FEAT_EVAL */ | |
7118 | |
7119 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
7120 /* | |
7121 * Put a string into a register. When the register is not empty, the string | |
7122 * is appended. | |
7123 */ | |
7124 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7125 str_to_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7126 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
|
7127 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
|
7128 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
|
7129 long len, /* length of string */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7130 long blocklen, /* width of Visual block */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7131 int str_list) /* TRUE if str is char_u ** */ |
7 | 7132 { |
2896 | 7133 int type; /* MCHAR, MLINE or MBLOCK */ |
7 | 7134 int lnum; |
7135 long start; | |
7136 long i; | |
7137 int extra; | |
7138 int newlines; /* number of lines added */ | |
7139 int extraline = 0; /* extra line at the end */ | |
7140 int append = FALSE; /* append to last line in register */ | |
7141 char_u *s; | |
5798 | 7142 char_u **ss; |
7 | 7143 char_u **pp; |
7144 long maxlen; | |
7145 | |
2000 | 7146 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
7 | 7147 y_ptr->y_size = 0; |
7148 | |
2896 | 7149 if (yank_type == MAUTO) |
5798 | 7150 type = ((str_list || (len > 0 && (str[len - 1] == NL |
7151 || str[len - 1] == CAR))) | |
2896 | 7152 ? MLINE : MCHAR); |
7153 else | |
7154 type = yank_type; | |
7155 | |
7 | 7156 /* |
7157 * Count the number of lines within the string | |
7158 */ | |
7159 newlines = 0; | |
5798 | 7160 if (str_list) |
7161 { | |
7162 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
7 | 7163 ++newlines; |
5798 | 7164 } |
7165 else | |
7166 { | |
7167 for (i = 0; i < len; i++) | |
7168 if (str[i] == '\n') | |
7169 ++newlines; | |
7170 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
7171 { | |
7172 extraline = 1; | |
7173 ++newlines; /* count extra newline at the end */ | |
7174 } | |
7175 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
7176 { | |
7177 append = TRUE; | |
7178 --newlines; /* uncount newline when appending first line */ | |
7179 } | |
7 | 7180 } |
7181 | |
6807 | 7182 /* Without any lines make the register empty. */ |
7183 if (y_ptr->y_size + newlines == 0) | |
7184 { | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
7185 VIM_CLEAR(y_ptr->y_array); |
6807 | 7186 return; |
7187 } | |
7188 | |
7 | 7189 /* |
7190 * Allocate an array to hold the pointers to the new register lines. | |
7191 * If the register was not empty, move the existing lines to the new array. | |
7192 */ | |
7193 pp = (char_u **)lalloc_clear((y_ptr->y_size + newlines) | |
7194 * sizeof(char_u *), TRUE); | |
7195 if (pp == NULL) /* out of memory */ | |
7196 return; | |
7197 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
7198 pp[lnum] = y_ptr->y_array[lnum]; | |
7199 vim_free(y_ptr->y_array); | |
7200 y_ptr->y_array = pp; | |
7201 maxlen = 0; | |
7202 | |
7203 /* | |
7204 * Find the end of each line and save it into the array. | |
7205 */ | |
5798 | 7206 if (str_list) |
7207 { | |
7208 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
7 | 7209 { |
5856 | 7210 i = (long)STRLEN(*ss); |
5798 | 7211 pp[lnum] = vim_strnsave(*ss, i); |
7212 if (i > maxlen) | |
7213 maxlen = i; | |
7 | 7214 } |
5798 | 7215 } |
7216 else | |
7217 { | |
7218 for (start = 0; start < len + extraline; start += i + 1) | |
7 | 7219 { |
5798 | 7220 for (i = start; i < len; ++i) /* find the end of the line */ |
7221 if (str[i] == '\n') | |
7222 break; | |
7223 i -= start; /* i is now length of line */ | |
7224 if (i > maxlen) | |
7225 maxlen = i; | |
7226 if (append) | |
7227 { | |
7228 --lnum; | |
7229 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
7230 } | |
7231 else | |
7232 extra = 0; | |
7233 s = alloc((unsigned)(i + extra + 1)); | |
7234 if (s == NULL) | |
7235 break; | |
7236 if (extra) | |
7237 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
7238 if (append) | |
7239 vim_free(y_ptr->y_array[lnum]); | |
7240 if (i) | |
7241 mch_memmove(s + extra, str + start, (size_t)i); | |
7242 extra += i; | |
7243 s[extra] = NUL; | |
7244 y_ptr->y_array[lnum++] = s; | |
7245 while (--extra >= 0) | |
7246 { | |
7247 if (*s == NUL) | |
7248 *s = '\n'; /* replace NUL with newline */ | |
7249 ++s; | |
7250 } | |
7251 append = FALSE; /* only first line is appended */ | |
7 | 7252 } |
7253 } | |
7254 y_ptr->y_type = type; | |
7255 y_ptr->y_size = lnum; | |
7256 if (type == MBLOCK) | |
7257 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
7258 else | |
7259 y_ptr->y_width = 0; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7260 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7261 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
|
7262 #endif |
7 | 7263 } |
7264 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
7265 | |
7266 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7267 clear_oparg(oparg_T *oap) |
7 | 7268 { |
7269 vim_memset(oap, 0, sizeof(oparg_T)); | |
7270 } | |
7271 | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7272 static varnumber_T line_count_info(char_u *line, varnumber_T *wc, varnumber_T *cc, varnumber_T limit, int eol_size); |
7 | 7273 |
7274 /* | |
161 | 7275 * Count the number of bytes, characters and "words" in a line. |
7 | 7276 * |
7277 * "Words" are counted by looking for boundaries between non-space and | |
7278 * space characters. (it seems to produce results that match 'wc'.) | |
7279 * | |
161 | 7280 * Return value is byte count; word count for the line is added to "*wc". |
7281 * Char count is added to "*cc". | |
7 | 7282 * |
7283 * The function will only examine the first "limit" characters in the | |
7284 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
7285 * case, eol_size will be added to the character count to account for | |
7286 * the size of the EOL character. | |
7287 */ | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7288 static varnumber_T |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7289 line_count_info( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7290 char_u *line, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7291 varnumber_T *wc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7292 varnumber_T *cc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7293 varnumber_T limit, |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7294 int eol_size) |
7 | 7295 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7296 varnumber_T i; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7297 varnumber_T words = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7298 varnumber_T chars = 0; |
7 | 7299 int is_word = 0; |
7300 | |
3626 | 7301 for (i = 0; i < limit && line[i] != NUL; ) |
7 | 7302 { |
7303 if (is_word) | |
7304 { | |
7305 if (vim_isspace(line[i])) | |
7306 { | |
7307 words++; | |
7308 is_word = 0; | |
7309 } | |
7310 } | |
7311 else if (!vim_isspace(line[i])) | |
7312 is_word = 1; | |
161 | 7313 ++chars; |
7314 #ifdef FEAT_MBYTE | |
474 | 7315 i += (*mb_ptr2len)(line + i); |
161 | 7316 #else |
7317 ++i; | |
7318 #endif | |
7 | 7319 } |
7320 | |
7321 if (is_word) | |
7322 words++; | |
7323 *wc += words; | |
7324 | |
7325 /* Add eol_size if the end of line was reached before hitting limit. */ | |
2996 | 7326 if (i < limit && line[i] == NUL) |
161 | 7327 { |
7 | 7328 i += eol_size; |
161 | 7329 chars += eol_size; |
7330 } | |
7331 *cc += chars; | |
7 | 7332 return i; |
7333 } | |
7334 | |
7335 /* | |
7336 * Give some info about the position of the cursor (for "g CTRL-G"). | |
7337 * In Visual mode, give some info about the selected region. (In this case, | |
7338 * 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
|
7339 * When "dict" is not NULL store the info there instead of showing it. |
7 | 7340 */ |
7341 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7342 cursor_pos_info(dict_T *dict) |
7 | 7343 { |
7344 char_u *p; | |
274 | 7345 char_u buf1[50]; |
7346 char_u buf2[40]; | |
7 | 7347 linenr_T lnum; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7348 varnumber_T byte_count = 0; |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7349 #ifdef FEAT_MBYTE |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7350 varnumber_T bom_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7351 #endif |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7352 varnumber_T byte_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7353 varnumber_T char_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7354 varnumber_T char_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7355 varnumber_T word_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7356 varnumber_T word_count_cursor = 0; |
7 | 7357 int eol_size; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7358 varnumber_T last_check = 100000L; |
7 | 7359 long line_count_selected = 0; |
7360 pos_T min_pos, max_pos; | |
7361 oparg_T oparg; | |
7362 struct block_def bd; | |
7363 | |
7364 /* | |
7365 * Compute the length of the file in characters. | |
7366 */ | |
7367 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
7368 { | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7369 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7370 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7371 MSG(_(no_lines_msg)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7372 return; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7373 } |
7 | 7374 } |
7375 else | |
7376 { | |
7377 if (get_fileformat(curbuf) == EOL_DOS) | |
7378 eol_size = 2; | |
7379 else | |
7380 eol_size = 1; | |
7381 | |
7382 if (VIsual_active) | |
7383 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
7384 if (LT_POS(VIsual, curwin->w_cursor)) |
7 | 7385 { |
7386 min_pos = VIsual; | |
7387 max_pos = curwin->w_cursor; | |
7388 } | |
7389 else | |
7390 { | |
7391 min_pos = curwin->w_cursor; | |
7392 max_pos = VIsual; | |
7393 } | |
7394 if (*p_sel == 'e' && max_pos.col > 0) | |
7395 --max_pos.col; | |
7396 | |
7397 if (VIsual_mode == Ctrl_V) | |
7398 { | |
1866 | 7399 #ifdef FEAT_LINEBREAK |
7400 char_u * saved_sbr = p_sbr; | |
7401 | |
7402 /* Make 'sbr' empty for a moment to get the correct size. */ | |
7403 p_sbr = empty_option; | |
7404 #endif | |
7 | 7405 oparg.is_VIsual = 1; |
7406 oparg.block_mode = TRUE; | |
7407 oparg.op_type = OP_NOP; | |
7408 getvcols(curwin, &min_pos, &max_pos, | |
688 | 7409 &oparg.start_vcol, &oparg.end_vcol); |
1866 | 7410 #ifdef FEAT_LINEBREAK |
7411 p_sbr = saved_sbr; | |
7412 #endif | |
688 | 7413 if (curwin->w_curswant == MAXCOL) |
7414 oparg.end_vcol = MAXCOL; | |
7 | 7415 /* Swap the start, end vcol if needed */ |
7416 if (oparg.end_vcol < oparg.start_vcol) | |
7417 { | |
7418 oparg.end_vcol += oparg.start_vcol; | |
7419 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
7420 oparg.end_vcol -= oparg.start_vcol; | |
7421 } | |
7422 } | |
7423 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
7424 } | |
7425 | |
7426 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
7427 { | |
7428 /* Check for a CTRL-C every 100000 characters. */ | |
161 | 7429 if (byte_count > last_check) |
7 | 7430 { |
7431 ui_breakcheck(); | |
7432 if (got_int) | |
7433 return; | |
161 | 7434 last_check = byte_count + 100000L; |
7 | 7435 } |
7436 | |
7437 /* Do extra processing for VIsual mode. */ | |
7438 if (VIsual_active | |
7439 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
7440 { | |
45 | 7441 char_u *s = NULL; |
7442 long len = 0L; | |
7443 | |
7 | 7444 switch (VIsual_mode) |
7445 { | |
7446 case Ctrl_V: | |
5735 | 7447 #ifdef FEAT_VIRTUALEDIT |
7 | 7448 virtual_op = virtual_active(); |
5735 | 7449 #endif |
7 | 7450 block_prep(&oparg, &bd, lnum, 0); |
5735 | 7451 #ifdef FEAT_VIRTUALEDIT |
7 | 7452 virtual_op = MAYBE; |
5735 | 7453 #endif |
45 | 7454 s = bd.textstart; |
7455 len = (long)bd.textlen; | |
7 | 7456 break; |
7457 case 'V': | |
45 | 7458 s = ml_get(lnum); |
7459 len = MAXCOL; | |
7 | 7460 break; |
7461 case 'v': | |
7462 { | |
7463 colnr_T start_col = (lnum == min_pos.lnum) | |
7464 ? min_pos.col : 0; | |
7465 colnr_T end_col = (lnum == max_pos.lnum) | |
7466 ? max_pos.col - start_col + 1 : MAXCOL; | |
7467 | |
45 | 7468 s = ml_get(lnum) + start_col; |
7469 len = end_col; | |
7 | 7470 } |
7471 break; | |
7472 } | |
45 | 7473 if (s != NULL) |
7474 { | |
161 | 7475 byte_count_cursor += line_count_info(s, &word_count_cursor, |
7476 &char_count_cursor, len, eol_size); | |
45 | 7477 if (lnum == curbuf->b_ml.ml_line_count |
7478 && !curbuf->b_p_eol | |
6933 | 7479 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
50 | 7480 && (long)STRLEN(s) < len) |
161 | 7481 byte_count_cursor -= eol_size; |
45 | 7482 } |
7 | 7483 } |
7484 else | |
7485 { | |
7486 /* In non-visual mode, check for the line the cursor is on */ | |
7487 if (lnum == curwin->w_cursor.lnum) | |
7488 { | |
7489 word_count_cursor += word_count; | |
161 | 7490 char_count_cursor += char_count; |
7491 byte_count_cursor = byte_count + | |
7492 line_count_info(ml_get(lnum), | |
7493 &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
|
7494 (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
|
7495 eol_size); |
7 | 7496 } |
7497 } | |
7498 /* Add to the running totals */ | |
161 | 7499 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
|
7500 &char_count, (varnumber_T)MAXCOL, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7501 eol_size); |
7 | 7502 } |
7503 | |
7504 /* Correction for when last line doesn't have an EOL. */ | |
6933 | 7505 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
161 | 7506 byte_count -= eol_size; |
7 | 7507 |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7508 if (dict == NULL) |
7 | 7509 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7510 if (VIsual_active) |
7 | 7511 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7512 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
|
7513 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7514 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
|
7515 &max_pos.col); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7516 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
|
7517 (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
|
7518 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7519 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7520 buf1[0] = NUL; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7521 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7522 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
|
7523 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7524 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7525 _("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
|
7526 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7527 (long)curbuf->b_ml.ml_line_count, |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7528 (long long)word_count_cursor, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7529 (long long)word_count, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7530 (long long)byte_count_cursor, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7531 (long long)byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7532 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7533 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7534 _("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
|
7535 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7536 (long)curbuf->b_ml.ml_line_count, |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7537 (long long)word_count_cursor, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7538 (long long)word_count, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7539 (long long)char_count_cursor, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7540 (long long)char_count, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7541 (long long)byte_count_cursor, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7542 (long long)byte_count); |
7 | 7543 } |
7544 else | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7545 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7546 p = ml_get_curline(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7547 validate_virtcol(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7548 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
|
7549 (int)curwin->w_virtcol + 1); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7550 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
|
7551 linetabsize(p)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7552 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7553 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
|
7554 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7555 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7556 _("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
|
7557 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7558 (long)curwin->w_cursor.lnum, |
7 | 7559 (long)curbuf->b_ml.ml_line_count, |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7560 (long long)word_count_cursor, (long long)word_count, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7561 (long long)byte_count_cursor, (long long)byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7562 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7563 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7564 _("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
|
7565 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7566 (long)curwin->w_cursor.lnum, |
161 | 7567 (long)curbuf->b_ml.ml_line_count, |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7568 (long long)word_count_cursor, (long long)word_count, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7569 (long long)char_count_cursor, (long long)char_count, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7570 (long long)byte_count_cursor, (long long)byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7571 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7572 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7573 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7574 #ifdef FEAT_MBYTE |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7575 bom_count = bomb_size(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7576 if (bom_count > 0) |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7577 vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE, |
13614
87e5629fc915
patch 8.0.1679: compiler warning for printf format
Christian Brabandt <cb@256bit.org>
parents:
13610
diff
changeset
|
7578 _("(+%lld for BOM)"), (long long)bom_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7579 #endif |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7580 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7581 { |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7582 /* 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
|
7583 p = p_shm; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7584 p_shm = (char_u *)""; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7585 msg(IObuff); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7586 p_shm = p; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7587 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7588 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7589 #if defined(FEAT_EVAL) |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7590 if (dict != NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7591 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7592 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
|
7593 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
|
7594 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
|
7595 # ifdef FEAT_MBYTE |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7596 + bom_count |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7597 # endif |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7598 , NULL); |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7599 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
|
7600 byte_count_cursor, NULL); |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7601 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
|
7602 char_count_cursor, NULL); |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7603 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
|
7604 word_count_cursor, NULL); |
7 | 7605 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7606 #endif |
7 | 7607 } |