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