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