Mercurial > vim
annotate src/ops.c @ 11341:98abcd1227dc v8.0.0556
patch 8.0.0556: getting window position fails if GUI and term possible
commit https://github.com/vim/vim/commit/7860bac57baeda408d5ef84f3334b0e52cc690bd
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 9 15:03:15 2017 +0200
patch 8.0.0556: getting window position fails if GUI and term possible
Problem: Getting the window position fails if both the GUI and term
code is built in.
Solution: Return after getting the GUI window position. (Kazunobu Kuriyama)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 09 Apr 2017 15:15:03 +0200 |
| parents | 96d83cd2904a |
| children | 72b20190dce6 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9834
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * ops.c: implementation of various operators: op_shift, op_delete, op_tilde, | |
| 12 * op_change, op_yank, do_put, do_join | |
| 13 */ | |
| 14 | |
| 15 #include "vim.h" | |
| 16 | |
| 17 /* | |
| 18 * Number of registers. | |
| 19 * 0 = unnamed register, for normal yanks and puts | |
| 20 * 1..9 = registers '1' to '9', for deletes | |
| 21 * 10..35 = registers 'a' to 'z' | |
| 22 * 36 = delete register '-' | |
| 23 * 37 = Selection register '*'. Only if FEAT_CLIPBOARD defined | |
| 24 * 38 = Clipboard register '+'. Only if FEAT_CLIPBOARD and FEAT_X11 defined | |
| 25 */ | |
| 26 /* | |
| 27 * Symbolic names for some registers. | |
| 28 */ | |
| 29 #define DELETION_REGISTER 36 | |
| 30 #ifdef FEAT_CLIPBOARD | |
| 31 # define STAR_REGISTER 37 | |
| 32 # ifdef FEAT_X11 | |
| 33 # define PLUS_REGISTER 38 | |
| 34 # else | |
| 35 # define PLUS_REGISTER STAR_REGISTER /* there is only one */ | |
| 36 # endif | |
| 37 #endif | |
| 38 #ifdef FEAT_DND | |
| 39 # define TILDE_REGISTER (PLUS_REGISTER + 1) | |
| 40 #endif | |
| 41 | |
| 42 #ifdef FEAT_CLIPBOARD | |
| 43 # ifdef FEAT_DND | |
| 44 # define NUM_REGISTERS (TILDE_REGISTER + 1) | |
| 45 # else | |
| 46 # define NUM_REGISTERS (PLUS_REGISTER + 1) | |
| 47 # endif | |
| 48 #else | |
| 49 # define NUM_REGISTERS 37 | |
| 50 #endif | |
| 51 | |
| 52 /* | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
53 * Each yank register has an array of pointers to lines. |
| 7 | 54 */ |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
55 typedef struct |
| 7 | 56 { |
| 57 char_u **y_array; /* pointer to array of line pointers */ | |
| 58 linenr_T y_size; /* number of lines in y_array */ | |
| 59 char_u y_type; /* MLINE, MCHAR or MBLOCK */ | |
| 60 colnr_T y_width; /* only set if y_type == MBLOCK */ | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
61 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
62 time_t y_time_set; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
63 #endif |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
64 } yankreg_T; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
65 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
66 static yankreg_T y_regs[NUM_REGISTERS]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
67 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
68 static yankreg_T *y_current; /* ptr to current yankreg */ |
| 7 | 69 static int y_append; /* TRUE when appending */ |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
70 static yankreg_T *y_previous = NULL; /* ptr to last written yankreg */ |
| 7 | 71 |
| 72 /* | |
| 73 * structure used by block_prep, op_delete and op_yank for blockwise operators | |
| 74 * also op_change, op_shift, op_insert, op_replace - AKelly | |
| 75 */ | |
| 76 struct block_def | |
| 77 { | |
| 1839 | 78 int startspaces; /* 'extra' cols before first char */ |
| 79 int endspaces; /* 'extra' cols after last char */ | |
| 7 | 80 int textlen; /* chars in block */ |
| 1839 | 81 char_u *textstart; /* pointer to 1st char (partially) in block */ |
| 82 colnr_T textcol; /* index of chars (partially) in block */ | |
| 7 | 83 colnr_T start_vcol; /* start col of 1st char wholly inside block */ |
| 84 colnr_T end_vcol; /* start col of 1st char wholly after block */ | |
| 85 #ifdef FEAT_VISUALEXTRA | |
| 86 int is_short; /* TRUE if line is too short to fit in block */ | |
| 87 int is_MAX; /* TRUE if curswant==MAXCOL when starting */ | |
| 88 int is_oneChar; /* TRUE if block within one character */ | |
| 89 int pre_whitesp; /* screen cols of ws before block */ | |
| 90 int pre_whitesp_c; /* chars of ws before block */ | |
| 91 colnr_T end_char_vcols; /* number of vcols of post-block char */ | |
| 92 #endif | |
| 93 colnr_T start_char_vcols; /* number of vcols of pre-block char */ | |
| 94 }; | |
| 95 | |
| 96 #ifdef FEAT_VISUALEXTRA | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
97 static void shift_block(oparg_T *oap, int amount); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
98 static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def*bdp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
99 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
100 static int stuff_yank(int, char_u *); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
101 static void put_reedit_in_typebuf(int silent); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
102 static int put_in_typebuf(char_u *s, int esc, int colon, |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
103 int silent); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
104 static void stuffescaped(char_u *arg, int literally); |
| 7 | 105 #ifdef FEAT_MBYTE |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
106 static void mb_adjust_opend(oparg_T *oap); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
107 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
108 static void free_yank(long); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
109 static void free_yank_all(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
110 static int yank_copy_line(struct block_def *bd, long y_idx); |
| 7 | 111 #ifdef FEAT_CLIPBOARD |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
112 static void copy_yank_reg(yankreg_T *reg); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
113 static void may_set_selection(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
114 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
115 static void dis_msg(char_u *p, int skip_esc); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
116 static void block_prep(oparg_T *oap, struct block_def *, linenr_T, int); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
117 static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1); |
| 7 | 118 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
119 static void str_to_reg(yankreg_T *y_ptr, int yank_type, char_u *str, long len, long blocklen, int str_list); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
120 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
121 static int ends_in_white(linenr_T lnum); |
| 7 | 122 #ifdef FEAT_COMMENTS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
123 static int same_leader(linenr_T lnum, int, char_u *, int, char_u *); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
124 static int fmt_check_par(linenr_T, int *, char_u **, int do_comments); |
| 7 | 125 #else |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
126 static int fmt_check_par(linenr_T); |
| 7 | 127 #endif |
| 128 | |
| 129 /* | |
| 130 * The names of operators. | |
| 131 * IMPORTANT: Index must correspond with defines in vim.h!!! | |
| 132 * The third field indicates whether the operator always works on lines. | |
| 133 */ | |
| 134 static char opchars[][3] = | |
| 135 { | |
| 136 {NUL, NUL, FALSE}, /* OP_NOP */ | |
| 137 {'d', NUL, FALSE}, /* OP_DELETE */ | |
| 138 {'y', NUL, FALSE}, /* OP_YANK */ | |
| 139 {'c', NUL, FALSE}, /* OP_CHANGE */ | |
| 140 {'<', NUL, TRUE}, /* OP_LSHIFT */ | |
| 141 {'>', NUL, TRUE}, /* OP_RSHIFT */ | |
| 142 {'!', NUL, TRUE}, /* OP_FILTER */ | |
| 143 {'g', '~', FALSE}, /* OP_TILDE */ | |
| 144 {'=', NUL, TRUE}, /* OP_INDENT */ | |
| 145 {'g', 'q', TRUE}, /* OP_FORMAT */ | |
| 146 {':', NUL, TRUE}, /* OP_COLON */ | |
| 147 {'g', 'U', FALSE}, /* OP_UPPER */ | |
| 148 {'g', 'u', FALSE}, /* OP_LOWER */ | |
| 149 {'J', NUL, TRUE}, /* DO_JOIN */ | |
| 150 {'g', 'J', TRUE}, /* DO_JOIN_NS */ | |
| 151 {'g', '?', FALSE}, /* OP_ROT13 */ | |
| 152 {'r', NUL, FALSE}, /* OP_REPLACE */ | |
| 153 {'I', NUL, FALSE}, /* OP_INSERT */ | |
| 154 {'A', NUL, FALSE}, /* OP_APPEND */ | |
| 155 {'z', 'f', TRUE}, /* OP_FOLD */ | |
| 156 {'z', 'o', TRUE}, /* OP_FOLDOPEN */ | |
| 157 {'z', 'O', TRUE}, /* OP_FOLDOPENREC */ | |
| 158 {'z', 'c', TRUE}, /* OP_FOLDCLOSE */ | |
| 159 {'z', 'C', TRUE}, /* OP_FOLDCLOSEREC */ | |
| 160 {'z', 'd', TRUE}, /* OP_FOLDDEL */ | |
| 161 {'z', 'D', TRUE}, /* OP_FOLDDELREC */ | |
| 162 {'g', 'w', TRUE}, /* OP_FORMAT2 */ | |
| 603 | 163 {'g', '@', FALSE}, /* OP_FUNCTION */ |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
164 {Ctrl_A, NUL, FALSE}, /* OP_NR_ADD */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
165 {Ctrl_X, NUL, FALSE}, /* OP_NR_SUB */ |
| 7 | 166 }; |
| 167 | |
| 168 /* | |
| 169 * Translate a command name into an operator type. | |
| 170 * Must only be called with a valid operator name! | |
| 171 */ | |
| 172 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
173 get_op_type(int char1, int char2) |
| 7 | 174 { |
| 175 int i; | |
| 176 | |
| 177 if (char1 == 'r') /* ignore second character */ | |
| 178 return OP_REPLACE; | |
| 179 if (char1 == '~') /* when tilde is an operator */ | |
| 180 return OP_TILDE; | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
181 if (char1 == 'g' && char2 == Ctrl_A) /* add */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
182 return OP_NR_ADD; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
183 if (char1 == 'g' && char2 == Ctrl_X) /* subtract */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
184 return OP_NR_SUB; |
| 7 | 185 for (i = 0; ; ++i) |
| 186 if (opchars[i][0] == char1 && opchars[i][1] == char2) | |
| 187 break; | |
| 188 return i; | |
| 189 } | |
| 190 | |
| 191 /* | |
| 192 * Return TRUE if operator "op" always works on whole lines. | |
| 193 */ | |
| 194 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
195 op_on_lines(int op) |
| 7 | 196 { |
| 197 return opchars[op][2]; | |
| 198 } | |
| 199 | |
| 200 /* | |
| 201 * Get first operator command character. | |
| 202 * Returns 'g' or 'z' if there is another command character. | |
| 203 */ | |
| 204 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
205 get_op_char(int optype) |
| 7 | 206 { |
| 207 return opchars[optype][0]; | |
| 208 } | |
| 209 | |
| 210 /* | |
| 211 * Get second operator command character. | |
| 212 */ | |
| 213 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
214 get_extra_op_char(int optype) |
| 7 | 215 { |
| 216 return opchars[optype][1]; | |
| 217 } | |
| 218 | |
| 219 /* | |
| 220 * op_shift - handle a shift operation | |
| 221 */ | |
| 222 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
223 op_shift(oparg_T *oap, int curs_top, int amount) |
| 7 | 224 { |
| 225 long i; | |
| 226 int first_char; | |
| 227 char_u *s; | |
| 228 int block_col = 0; | |
| 229 | |
| 230 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 231 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 232 return; | |
| 233 | |
| 234 if (oap->block_mode) | |
| 235 block_col = curwin->w_cursor.col; | |
| 236 | |
| 237 for (i = oap->line_count; --i >= 0; ) | |
| 238 { | |
| 239 first_char = *ml_get_curline(); | |
| 240 if (first_char == NUL) /* empty line */ | |
| 241 curwin->w_cursor.col = 0; | |
| 242 #ifdef FEAT_VISUALEXTRA | |
| 243 else if (oap->block_mode) | |
| 244 shift_block(oap, amount); | |
| 245 #endif | |
| 246 else | |
| 247 /* Move the line right if it doesn't start with '#', 'smartindent' | |
| 248 * isn't set or 'cindent' isn't set or '#' isn't in 'cino'. */ | |
| 249 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
| 250 if (first_char != '#' || !preprocs_left()) | |
| 251 #endif | |
| 252 { | |
| 1516 | 253 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE); |
| 7 | 254 } |
| 255 ++curwin->w_cursor.lnum; | |
| 256 } | |
| 257 | |
| 258 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
| 259 if (oap->block_mode) | |
| 260 { | |
| 261 curwin->w_cursor.lnum = oap->start.lnum; | |
| 262 curwin->w_cursor.col = block_col; | |
| 263 } | |
| 5735 | 264 else if (curs_top) /* put cursor on first line, for ">>" */ |
| 7 | 265 { |
| 266 curwin->w_cursor.lnum = oap->start.lnum; | |
| 267 beginline(BL_SOL | BL_FIX); /* shift_line() may have set cursor.col */ | |
| 268 } | |
| 269 else | |
| 270 --curwin->w_cursor.lnum; /* put cursor on last line, for ":>" */ | |
| 271 | |
|
10486
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
272 #ifdef FEAT_FOLDING |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
273 /* The cursor line is not in a closed fold */ |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
274 foldOpenCursor(); |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
275 #endif |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
276 |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
277 |
| 7 | 278 if (oap->line_count > p_report) |
| 279 { | |
| 280 if (oap->op_type == OP_RSHIFT) | |
| 281 s = (char_u *)">"; | |
| 282 else | |
| 283 s = (char_u *)"<"; | |
| 284 if (oap->line_count == 1) | |
| 285 { | |
| 286 if (amount == 1) | |
| 287 sprintf((char *)IObuff, _("1 line %sed 1 time"), s); | |
| 288 else | |
| 289 sprintf((char *)IObuff, _("1 line %sed %d times"), s, amount); | |
| 290 } | |
| 291 else | |
| 292 { | |
| 293 if (amount == 1) | |
| 294 sprintf((char *)IObuff, _("%ld lines %sed 1 time"), | |
| 295 oap->line_count, s); | |
| 296 else | |
| 297 sprintf((char *)IObuff, _("%ld lines %sed %d times"), | |
| 298 oap->line_count, s, amount); | |
| 299 } | |
| 300 msg(IObuff); | |
| 301 } | |
| 302 | |
| 303 /* | |
| 304 * Set "'[" and "']" marks. | |
| 305 */ | |
| 306 curbuf->b_op_start = oap->start; | |
| 307 curbuf->b_op_end.lnum = oap->end.lnum; | |
| 308 curbuf->b_op_end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
| 309 if (curbuf->b_op_end.col > 0) | |
| 310 --curbuf->b_op_end.col; | |
| 311 } | |
| 312 | |
| 313 /* | |
| 314 * shift the current line one shiftwidth left (if left != 0) or right | |
| 315 * leaves cursor on first blank in the line | |
| 316 */ | |
| 317 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
318 shift_line( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
319 int left, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
320 int round, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
321 int amount, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
322 int call_changed_bytes) /* call changed_bytes() */ |
| 7 | 323 { |
| 324 int count; | |
| 325 int i, j; | |
| 5438 | 326 int p_sw = (int)get_sw_value(curbuf); |
| 7 | 327 |
| 328 count = get_indent(); /* get current indent */ | |
| 329 | |
| 330 if (round) /* round off indent */ | |
| 331 { | |
| 332 i = count / p_sw; /* number of p_sw rounded down */ | |
| 333 j = count % p_sw; /* extra spaces */ | |
| 334 if (j && left) /* first remove extra spaces */ | |
| 335 --amount; | |
| 336 if (left) | |
| 337 { | |
| 338 i -= amount; | |
| 339 if (i < 0) | |
| 340 i = 0; | |
| 341 } | |
| 342 else | |
| 343 i += amount; | |
| 344 count = i * p_sw; | |
| 345 } | |
| 346 else /* original vi indent */ | |
| 347 { | |
| 348 if (left) | |
| 349 { | |
| 350 count -= p_sw * amount; | |
| 351 if (count < 0) | |
| 352 count = 0; | |
| 353 } | |
| 354 else | |
| 355 count += p_sw * amount; | |
| 356 } | |
| 357 | |
| 358 /* Set new indent */ | |
| 359 #ifdef FEAT_VREPLACE | |
| 360 if (State & VREPLACE_FLAG) | |
| 1516 | 361 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes); |
| 7 | 362 else |
| 363 #endif | |
| 1516 | 364 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0); |
| 7 | 365 } |
| 366 | |
| 367 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
| 368 /* | |
| 369 * Shift one line of the current block one shiftwidth right or left. | |
| 370 * Leaves cursor on first character in block. | |
| 371 */ | |
| 372 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
373 shift_block(oparg_T *oap, int amount) |
| 7 | 374 { |
| 375 int left = (oap->op_type == OP_LSHIFT); | |
| 376 int oldstate = State; | |
| 1839 | 377 int total; |
| 378 char_u *newp, *oldp; | |
| 7 | 379 int oldcol = curwin->w_cursor.col; |
| 5438 | 380 int p_sw = (int)get_sw_value(curbuf); |
| 7 | 381 int p_ts = (int)curbuf->b_p_ts; |
| 382 struct block_def bd; | |
| 383 int incr; | |
| 1839 | 384 colnr_T ws_vcol; |
| 7 | 385 int i = 0, j = 0; |
| 386 int len; | |
| 387 #ifdef FEAT_RIGHTLEFT | |
| 388 int old_p_ri = p_ri; | |
| 389 | |
| 4352 | 390 p_ri = 0; /* don't want revins in indent */ |
| 7 | 391 #endif |
| 392 | |
| 393 State = INSERT; /* don't want REPLACE for State */ | |
| 394 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); | |
| 395 if (bd.is_short) | |
| 396 return; | |
| 397 | |
| 398 /* total is number of screen columns to be inserted/removed */ | |
| 399 total = amount * p_sw; | |
| 400 oldp = ml_get_curline(); | |
| 401 | |
| 402 if (!left) | |
| 403 { | |
| 404 /* | |
| 405 * 1. Get start vcol | |
| 406 * 2. Total ws vcols | |
| 407 * 3. Divvy into TABs & spp | |
| 408 * 4. Construct new string | |
| 409 */ | |
| 410 total += bd.pre_whitesp; /* all virtual WS upto & incl a split TAB */ | |
| 411 ws_vcol = bd.start_vcol - bd.pre_whitesp; | |
| 412 if (bd.startspaces) | |
| 413 { | |
| 414 #ifdef FEAT_MBYTE | |
| 415 if (has_mbyte) | |
|
8399
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
416 { |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
417 if ((*mb_ptr2len)(bd.textstart) == 1) |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
418 ++bd.textstart; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
419 else |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
420 { |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
421 ws_vcol = 0; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
422 bd.startspaces = 0; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
423 } |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
424 } |
| 1995 | 425 else |
| 426 #endif | |
| 427 ++bd.textstart; | |
| 7 | 428 } |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
429 for ( ; VIM_ISWHITE(*bd.textstart); ) |
| 7 | 430 { |
| 5995 | 431 /* TODO: is passing bd.textstart for start of the line OK? */ |
| 432 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, | |
| 433 (colnr_T)(bd.start_vcol)); | |
| 7 | 434 total += incr; |
| 435 bd.start_vcol += incr; | |
| 436 } | |
| 437 /* OK, now total=all the VWS reqd, and textstart points at the 1st | |
| 438 * non-ws char in the block. */ | |
| 439 if (!curbuf->b_p_et) | |
| 440 i = ((ws_vcol % p_ts) + total) / p_ts; /* number of tabs */ | |
| 441 if (i) | |
| 442 j = ((ws_vcol % p_ts) + total) % p_ts; /* number of spp */ | |
| 443 else | |
| 444 j = total; | |
| 445 /* if we're splitting a TAB, allow for it */ | |
| 446 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0); | |
| 447 len = (int)STRLEN(bd.textstart) + 1; | |
| 448 newp = alloc_check((unsigned)(bd.textcol + i + j + len)); | |
| 449 if (newp == NULL) | |
| 450 return; | |
| 451 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len)); | |
| 452 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 6929 | 453 vim_memset(newp + bd.textcol, TAB, (size_t)i); |
| 454 vim_memset(newp + bd.textcol + i, ' ', (size_t)j); | |
| 7 | 455 /* the end */ |
| 456 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len); | |
| 457 } | |
| 458 else /* left */ | |
| 459 { | |
| 1839 | 460 colnr_T destination_col; /* column to which text in block will |
| 461 be shifted */ | |
| 462 char_u *verbatim_copy_end; /* end of the part of the line which is | |
| 463 copied verbatim */ | |
| 464 colnr_T verbatim_copy_width;/* the (displayed) width of this part | |
| 465 of line */ | |
| 466 unsigned fill; /* nr of spaces that replace a TAB */ | |
| 467 unsigned new_line_len; /* the length of the line after the | |
| 468 block shift */ | |
| 469 size_t block_space_width; | |
| 470 size_t shift_amount; | |
| 471 char_u *non_white = bd.textstart; | |
| 472 colnr_T non_white_col; | |
| 473 | |
| 474 /* | |
| 475 * Firstly, let's find the first non-whitespace character that is | |
| 476 * displayed after the block's start column and the character's column | |
| 477 * number. Also, let's calculate the width of all the whitespace | |
| 478 * characters that are displayed in the block and precede the searched | |
| 479 * non-whitespace character. | |
| 480 */ | |
| 481 | |
| 482 /* If "bd.startspaces" is set, "bd.textstart" points to the character, | |
| 483 * the part of which is displayed at the block's beginning. Let's start | |
| 484 * searching from the next character. */ | |
| 485 if (bd.startspaces) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
486 MB_PTR_ADV(non_white); |
| 1839 | 487 |
| 488 /* The character's column is in "bd.start_vcol". */ | |
| 489 non_white_col = bd.start_vcol; | |
| 490 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
491 while (VIM_ISWHITE(*non_white)) |
| 7 | 492 { |
| 5995 | 493 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col); |
| 1839 | 494 non_white_col += incr; |
| 7 | 495 } |
| 1839 | 496 |
| 497 block_space_width = non_white_col - oap->start_vcol; | |
| 498 /* We will shift by "total" or "block_space_width", whichever is less. | |
| 499 */ | |
| 1860 | 500 shift_amount = (block_space_width < (size_t)total |
| 501 ? block_space_width : (size_t)total); | |
| 1839 | 502 |
| 503 /* The column to which we will shift the text. */ | |
| 1860 | 504 destination_col = (colnr_T)(non_white_col - shift_amount); |
| 1839 | 505 |
| 506 /* Now let's find out how much of the beginning of the line we can | |
| 507 * reuse without modification. */ | |
| 508 verbatim_copy_end = bd.textstart; | |
| 509 verbatim_copy_width = bd.start_vcol; | |
| 510 | |
| 511 /* If "bd.startspaces" is set, "bd.textstart" points to the character | |
| 512 * preceding the block. We have to subtract its width to obtain its | |
| 513 * column number. */ | |
| 514 if (bd.startspaces) | |
| 515 verbatim_copy_width -= bd.start_char_vcols; | |
| 516 while (verbatim_copy_width < destination_col) | |
| 7 | 517 { |
| 5995 | 518 char_u *line = verbatim_copy_end; |
| 519 | |
| 520 /* TODO: is passing verbatim_copy_end for start of the line OK? */ | |
| 521 incr = lbr_chartabsize(line, verbatim_copy_end, | |
| 522 verbatim_copy_width); | |
| 1839 | 523 if (verbatim_copy_width + incr > destination_col) |
| 524 break; | |
| 525 verbatim_copy_width += incr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
526 MB_PTR_ADV(verbatim_copy_end); |
| 7 | 527 } |
| 528 | |
| 1839 | 529 /* If "destination_col" is different from the width of the initial |
| 530 * part of the line that will be copied, it means we encountered a tab | |
| 531 * character, which we will have to partly replace with spaces. */ | |
| 532 fill = destination_col - verbatim_copy_width; | |
| 533 | |
| 534 /* The replacement line will consist of: | |
| 535 * - the beginning of the original line up to "verbatim_copy_end", | |
| 536 * - "fill" number of spaces, | |
| 537 * - the rest of the line, pointed to by non_white. */ | |
| 538 new_line_len = (unsigned)(verbatim_copy_end - oldp) | |
| 539 + fill | |
| 540 + (unsigned)STRLEN(non_white) + 1; | |
| 541 | |
| 542 newp = alloc_check(new_line_len); | |
| 7 | 543 if (newp == NULL) |
| 544 return; | |
| 1839 | 545 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); |
| 6929 | 546 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill); |
| 1839 | 547 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); |
| 7 | 548 } |
| 549 /* replace the line */ | |
| 550 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 551 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol); | |
| 552 State = oldstate; | |
| 553 curwin->w_cursor.col = oldcol; | |
| 554 #ifdef FEAT_RIGHTLEFT | |
| 555 p_ri = old_p_ri; | |
| 556 #endif | |
| 557 } | |
| 558 #endif | |
| 559 | |
| 560 #ifdef FEAT_VISUALEXTRA | |
| 561 /* | |
| 562 * Insert string "s" (b_insert ? before : after) block :AKelly | |
| 563 * Caller must prepare for undo. | |
| 564 */ | |
| 565 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
566 block_insert( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
567 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
568 char_u *s, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
569 int b_insert, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
570 struct block_def *bdp) |
| 7 | 571 { |
| 572 int p_ts; | |
| 573 int count = 0; /* extra spaces to replace a cut TAB */ | |
| 574 int spaces = 0; /* non-zero if cutting a TAB */ | |
| 575 colnr_T offset; /* pointer along new line */ | |
| 576 unsigned s_len; /* STRLEN(s) */ | |
| 577 char_u *newp, *oldp; /* new, old lines */ | |
| 578 linenr_T lnum; /* loop var */ | |
| 579 int oldstate = State; | |
| 580 | |
| 581 State = INSERT; /* don't want REPLACE for State */ | |
| 582 s_len = (unsigned)STRLEN(s); | |
| 583 | |
| 584 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) | |
| 585 { | |
| 586 block_prep(oap, bdp, lnum, TRUE); | |
| 587 if (bdp->is_short && b_insert) | |
| 588 continue; /* OP_INSERT, line ends before block start */ | |
| 589 | |
| 590 oldp = ml_get(lnum); | |
| 591 | |
| 592 if (b_insert) | |
| 593 { | |
| 594 p_ts = bdp->start_char_vcols; | |
| 595 spaces = bdp->startspaces; | |
| 596 if (spaces != 0) | |
| 597 count = p_ts - 1; /* we're cutting a TAB */ | |
| 598 offset = bdp->textcol; | |
| 599 } | |
| 600 else /* append */ | |
| 601 { | |
| 602 p_ts = bdp->end_char_vcols; | |
| 603 if (!bdp->is_short) /* spaces = padding after block */ | |
| 604 { | |
| 605 spaces = (bdp->endspaces ? p_ts - bdp->endspaces : 0); | |
| 606 if (spaces != 0) | |
| 607 count = p_ts - 1; /* we're cutting a TAB */ | |
| 608 offset = bdp->textcol + bdp->textlen - (spaces != 0); | |
| 609 } | |
| 610 else /* spaces = padding to block edge */ | |
| 611 { | |
| 612 /* if $ used, just append to EOL (ie spaces==0) */ | |
| 613 if (!bdp->is_MAX) | |
| 614 spaces = (oap->end_vcol - bdp->end_vcol) + 1; | |
| 615 count = spaces; | |
| 616 offset = bdp->textcol + bdp->textlen; | |
| 617 } | |
| 618 } | |
| 619 | |
| 6140 | 620 #ifdef FEAT_MBYTE |
| 621 if (has_mbyte && spaces > 0) | |
| 622 { | |
| 6460 | 623 int off; |
| 624 | |
| 6140 | 625 /* Avoid starting halfway a multi-byte character. */ |
| 626 if (b_insert) | |
| 627 { | |
| 6460 | 628 off = (*mb_head_off)(oldp, oldp + offset + spaces); |
| 6140 | 629 } |
| 630 else | |
| 631 { | |
| 6460 | 632 off = (*mb_off_next)(oldp, oldp + offset); |
| 6140 | 633 offset += off; |
| 634 } | |
| 6460 | 635 spaces -= off; |
| 636 count -= off; | |
| 6140 | 637 } |
| 638 #endif | |
| 639 | |
| 7 | 640 newp = alloc_check((unsigned)(STRLEN(oldp)) + s_len + count + 1); |
| 641 if (newp == NULL) | |
| 642 continue; | |
| 643 | |
| 644 /* copy up to shifted part */ | |
| 645 mch_memmove(newp, oldp, (size_t)(offset)); | |
| 646 oldp += offset; | |
| 647 | |
| 648 /* insert pre-padding */ | |
| 6929 | 649 vim_memset(newp + offset, ' ', (size_t)spaces); |
| 7 | 650 |
| 651 /* copy the new text */ | |
| 652 mch_memmove(newp + offset + spaces, s, (size_t)s_len); | |
| 653 offset += s_len; | |
| 654 | |
| 655 if (spaces && !bdp->is_short) | |
| 656 { | |
| 657 /* insert post-padding */ | |
| 6929 | 658 vim_memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces)); |
| 7 | 659 /* We're splitting a TAB, don't copy it. */ |
| 660 oldp++; | |
| 661 /* We allowed for that TAB, remember this now */ | |
| 662 count++; | |
| 663 } | |
| 664 | |
| 665 if (spaces > 0) | |
| 666 offset += count; | |
| 1622 | 667 STRMOVE(newp + offset, oldp); |
| 7 | 668 |
| 669 ml_replace(lnum, newp, FALSE); | |
| 670 | |
| 671 if (lnum == oap->end.lnum) | |
| 672 { | |
| 673 /* Set "']" mark to the end of the block instead of the end of | |
| 674 * the insert in the first line. */ | |
| 675 curbuf->b_op_end.lnum = oap->end.lnum; | |
| 676 curbuf->b_op_end.col = offset; | |
| 677 } | |
| 678 } /* for all lnum */ | |
| 679 | |
| 680 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
| 681 | |
| 682 State = oldstate; | |
| 683 } | |
| 684 #endif | |
| 685 | |
| 686 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(PROTO) | |
| 687 /* | |
| 688 * op_reindent - handle reindenting a block of lines. | |
| 689 */ | |
| 690 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
691 op_reindent(oparg_T *oap, int (*how)(void)) |
| 7 | 692 { |
| 693 long i; | |
| 694 char_u *l; | |
| 6971 | 695 int amount; |
| 7 | 696 linenr_T first_changed = 0; |
| 697 linenr_T last_changed = 0; | |
| 698 linenr_T start_lnum = curwin->w_cursor.lnum; | |
| 699 | |
| 216 | 700 /* Don't even try when 'modifiable' is off. */ |
| 701 if (!curbuf->b_p_ma) | |
| 702 { | |
| 703 EMSG(_(e_modifiable)); | |
| 704 return; | |
| 705 } | |
| 706 | |
| 7 | 707 for (i = oap->line_count; --i >= 0 && !got_int; ) |
| 708 { | |
| 709 /* it's a slow thing to do, so give feedback so there's no worry that | |
| 710 * the computer's just hung. */ | |
| 711 | |
| 712 if (i > 1 | |
| 713 && (i % 50 == 0 || i == oap->line_count - 1) | |
| 714 && oap->line_count > p_report) | |
| 715 smsg((char_u *)_("%ld lines to indent... "), i); | |
| 716 | |
| 717 /* | |
| 718 * Be vi-compatible: For lisp indenting the first line is not | |
| 719 * indented, unless there is only one line. | |
| 720 */ | |
| 721 #ifdef FEAT_LISP | |
| 722 if (i != oap->line_count - 1 || oap->line_count == 1 | |
| 723 || how != get_lisp_indent) | |
| 724 #endif | |
| 725 { | |
| 726 l = skipwhite(ml_get_curline()); | |
| 727 if (*l == NUL) /* empty or blank line */ | |
| 6971 | 728 amount = 0; |
| 7 | 729 else |
| 6971 | 730 amount = how(); /* get the indent for this line */ |
| 731 | |
| 732 if (amount >= 0 && set_indent(amount, SIN_UNDO)) | |
| 7 | 733 { |
| 734 /* did change the indent, call changed_lines() later */ | |
| 735 if (first_changed == 0) | |
| 736 first_changed = curwin->w_cursor.lnum; | |
| 737 last_changed = curwin->w_cursor.lnum; | |
| 738 } | |
| 739 } | |
| 740 ++curwin->w_cursor.lnum; | |
| 1550 | 741 curwin->w_cursor.col = 0; /* make sure it's valid */ |
| 7 | 742 } |
| 743 | |
| 744 /* put cursor on first non-blank of indented line */ | |
| 745 curwin->w_cursor.lnum = start_lnum; | |
| 746 beginline(BL_SOL | BL_FIX); | |
| 747 | |
| 748 /* Mark changed lines so that they will be redrawn. When Visual | |
| 749 * highlighting was present, need to continue until the last line. When | |
| 750 * there is no change still need to remove the Visual highlighting. */ | |
| 751 if (last_changed != 0) | |
| 752 changed_lines(first_changed, 0, | |
| 753 oap->is_VIsual ? start_lnum + oap->line_count : | |
| 754 last_changed + 1, 0L); | |
| 755 else if (oap->is_VIsual) | |
| 756 redraw_curbuf_later(INVERTED); | |
| 757 | |
| 758 if (oap->line_count > p_report) | |
| 759 { | |
| 760 i = oap->line_count - (i + 1); | |
| 761 if (i == 1) | |
| 762 MSG(_("1 line indented ")); | |
| 763 else | |
| 764 smsg((char_u *)_("%ld lines indented "), i); | |
| 765 } | |
| 766 /* set '[ and '] marks */ | |
| 767 curbuf->b_op_start = oap->start; | |
| 768 curbuf->b_op_end = oap->end; | |
| 769 } | |
| 770 #endif /* defined(FEAT_LISP) || defined(FEAT_CINDENT) */ | |
| 771 | |
| 772 #if defined(FEAT_EVAL) || defined(PROTO) | |
| 773 /* | |
| 774 * Keep the last expression line here, for repeating. | |
| 775 */ | |
| 776 static char_u *expr_line = NULL; | |
| 777 | |
| 778 /* | |
| 779 * Get an expression for the "\"=expr1" or "CTRL-R =expr1" | |
| 780 * Returns '=' when OK, NUL otherwise. | |
| 781 */ | |
| 782 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
783 get_expr_register(void) |
| 7 | 784 { |
| 785 char_u *new_line; | |
| 786 | |
| 787 new_line = getcmdline('=', 0L, 0); | |
| 788 if (new_line == NULL) | |
| 789 return NUL; | |
| 790 if (*new_line == NUL) /* use previous line */ | |
| 791 vim_free(new_line); | |
| 792 else | |
| 793 set_expr_line(new_line); | |
| 794 return '='; | |
| 795 } | |
| 796 | |
| 797 /* | |
| 798 * Set the expression for the '=' register. | |
| 799 * Argument must be an allocated string. | |
| 800 */ | |
| 801 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
802 set_expr_line(char_u *new_line) |
| 7 | 803 { |
| 804 vim_free(expr_line); | |
| 805 expr_line = new_line; | |
| 806 } | |
| 807 | |
| 808 /* | |
| 809 * Get the result of the '=' register expression. | |
| 810 * Returns a pointer to allocated memory, or NULL for failure. | |
| 811 */ | |
| 812 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
813 get_expr_line(void) |
| 7 | 814 { |
| 815 char_u *expr_copy; | |
| 816 char_u *rv; | |
| 994 | 817 static int nested = 0; |
| 7 | 818 |
| 819 if (expr_line == NULL) | |
| 820 return NULL; | |
| 821 | |
| 822 /* Make a copy of the expression, because evaluating it may cause it to be | |
| 823 * changed. */ | |
| 824 expr_copy = vim_strsave(expr_line); | |
| 825 if (expr_copy == NULL) | |
| 826 return NULL; | |
| 827 | |
| 994 | 828 /* When we are invoked recursively limit the evaluation to 10 levels. |
| 829 * Then return the string as-is. */ | |
| 830 if (nested >= 10) | |
| 831 return expr_copy; | |
| 832 | |
| 833 ++nested; | |
| 714 | 834 rv = eval_to_string(expr_copy, NULL, TRUE); |
| 994 | 835 --nested; |
| 7 | 836 vim_free(expr_copy); |
| 837 return rv; | |
| 838 } | |
| 283 | 839 |
| 840 /* | |
| 841 * Get the '=' register expression itself, without evaluating it. | |
| 842 */ | |
| 843 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
844 get_expr_line_src(void) |
| 283 | 845 { |
| 846 if (expr_line == NULL) | |
| 847 return NULL; | |
| 848 return vim_strsave(expr_line); | |
| 849 } | |
| 7 | 850 #endif /* FEAT_EVAL */ |
| 851 | |
| 852 /* | |
| 853 * Check if 'regname' is a valid name of a yank register. | |
| 854 * Note: There is no check for 0 (default register), caller should do this | |
| 855 */ | |
| 856 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
857 valid_yank_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
858 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
859 int writing) /* if TRUE check for writable registers */ |
| 7 | 860 { |
| 861 if ( (regname > 0 && ASCII_ISALNUM(regname)) | |
| 862 || (!writing && vim_strchr((char_u *) | |
| 863 #ifdef FEAT_EVAL | |
| 6557 | 864 "/.%:=" |
| 7 | 865 #else |
| 6557 | 866 "/.%:" |
| 7 | 867 #endif |
| 868 , regname) != NULL) | |
| 6557 | 869 || regname == '#' |
| 7 | 870 || regname == '"' |
| 871 || regname == '-' | |
| 872 || regname == '_' | |
| 873 #ifdef FEAT_CLIPBOARD | |
| 874 || regname == '*' | |
| 875 || regname == '+' | |
| 876 #endif | |
| 877 #ifdef FEAT_DND | |
| 878 || (!writing && regname == '~') | |
| 879 #endif | |
| 880 ) | |
| 881 return TRUE; | |
| 882 return FALSE; | |
| 883 } | |
| 884 | |
| 885 /* | |
| 886 * Set y_current and y_append, according to the value of "regname". | |
| 887 * Cannot handle the '_' register. | |
| 140 | 888 * Must only be called with a valid register name! |
| 7 | 889 * |
| 890 * If regname is 0 and writing, use register 0 | |
| 891 * If regname is 0 and reading, use previous register | |
| 892 */ | |
| 15 | 893 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
894 get_yank_register(int regname, int writing) |
| 7 | 895 { |
| 896 int i; | |
| 897 | |
| 898 y_append = FALSE; | |
| 899 if ((regname == 0 || regname == '"') && !writing && y_previous != NULL) | |
| 900 { | |
| 901 y_current = y_previous; | |
| 902 return; | |
| 903 } | |
| 904 i = regname; | |
| 905 if (VIM_ISDIGIT(i)) | |
| 906 i -= '0'; | |
| 907 else if (ASCII_ISLOWER(i)) | |
| 908 i = CharOrdLow(i) + 10; | |
| 909 else if (ASCII_ISUPPER(i)) | |
| 910 { | |
| 911 i = CharOrdUp(i) + 10; | |
| 912 y_append = TRUE; | |
| 913 } | |
| 914 else if (regname == '-') | |
| 915 i = DELETION_REGISTER; | |
| 916 #ifdef FEAT_CLIPBOARD | |
| 917 /* When selection is not available, use register 0 instead of '*' */ | |
| 918 else if (clip_star.available && regname == '*') | |
| 919 i = STAR_REGISTER; | |
| 920 /* When clipboard is not available, use register 0 instead of '+' */ | |
| 921 else if (clip_plus.available && regname == '+') | |
| 922 i = PLUS_REGISTER; | |
| 923 #endif | |
| 924 #ifdef FEAT_DND | |
| 925 else if (!writing && regname == '~') | |
| 926 i = TILDE_REGISTER; | |
| 927 #endif | |
| 928 else /* not 0-9, a-z, A-Z or '-': use register 0 */ | |
| 929 i = 0; | |
| 930 y_current = &(y_regs[i]); | |
| 931 if (writing) /* remember the register we write into for do_put() */ | |
| 932 y_previous = y_current; | |
| 933 } | |
| 934 | |
| 15 | 935 #if defined(FEAT_CLIPBOARD) || defined(PROTO) |
| 7 | 936 /* |
| 937 * When "regname" is a clipboard register, obtain the selection. If it's not | |
| 938 * available return zero, otherwise return "regname". | |
| 939 */ | |
| 15 | 940 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
941 may_get_selection(int regname) |
| 7 | 942 { |
| 943 if (regname == '*') | |
| 944 { | |
| 945 if (!clip_star.available) | |
| 946 regname = 0; | |
| 947 else | |
| 948 clip_get_selection(&clip_star); | |
| 949 } | |
| 950 else if (regname == '+') | |
| 951 { | |
| 952 if (!clip_plus.available) | |
| 953 regname = 0; | |
| 954 else | |
| 955 clip_get_selection(&clip_plus); | |
| 956 } | |
| 957 return regname; | |
| 958 } | |
| 959 #endif | |
| 960 | |
| 961 /* | |
| 962 * Obtain the contents of a "normal" register. The register is made empty. | |
| 963 * The returned pointer has allocated memory, use put_register() later. | |
| 964 */ | |
| 965 void * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
966 get_register( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
967 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
968 int copy) /* make a copy, if FALSE make register empty. */ |
| 7 | 969 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
970 yankreg_T *reg; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
971 int i; |
| 7 | 972 |
| 973 #ifdef FEAT_CLIPBOARD | |
| 974 /* When Visual area changed, may have to update selection. Obtain the | |
| 975 * selection too. */ | |
| 1435 | 976 if (name == '*' && clip_star.available) |
| 7 | 977 { |
| 3674 | 978 if (clip_isautosel_star()) |
| 979 clip_update_selection(&clip_star); | |
| 980 may_get_selection(name); | |
| 981 } | |
| 982 if (name == '+' && clip_plus.available) | |
| 983 { | |
| 984 if (clip_isautosel_plus()) | |
| 985 clip_update_selection(&clip_plus); | |
| 7 | 986 may_get_selection(name); |
| 987 } | |
| 988 #endif | |
| 989 | |
| 990 get_yank_register(name, 0); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
991 reg = (yankreg_T *)alloc((unsigned)sizeof(yankreg_T)); |
| 7 | 992 if (reg != NULL) |
| 993 { | |
| 994 *reg = *y_current; | |
| 995 if (copy) | |
| 996 { | |
| 997 /* If we run out of memory some or all of the lines are empty. */ | |
| 998 if (reg->y_size == 0) | |
| 999 reg->y_array = NULL; | |
| 1000 else | |
| 1001 reg->y_array = (char_u **)alloc((unsigned)(sizeof(char_u *) | |
| 1002 * reg->y_size)); | |
| 1003 if (reg->y_array != NULL) | |
| 1004 { | |
| 1005 for (i = 0; i < reg->y_size; ++i) | |
| 1006 reg->y_array[i] = vim_strsave(y_current->y_array[i]); | |
| 1007 } | |
| 1008 } | |
| 1009 else | |
| 1010 y_current->y_array = NULL; | |
| 1011 } | |
| 1012 return (void *)reg; | |
| 1013 } | |
| 1014 | |
| 1015 /* | |
| 1451 | 1016 * Put "reg" into register "name". Free any previous contents and "reg". |
| 7 | 1017 */ |
| 1018 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1019 put_register(int name, void *reg) |
| 7 | 1020 { |
| 1021 get_yank_register(name, 0); | |
| 1022 free_yank_all(); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1023 *y_current = *(yankreg_T *)reg; |
| 1451 | 1024 vim_free(reg); |
| 7 | 1025 |
| 5735 | 1026 #ifdef FEAT_CLIPBOARD |
| 7 | 1027 /* Send text written to clipboard register to the clipboard. */ |
| 1028 may_set_selection(); | |
| 5735 | 1029 #endif |
| 7 | 1030 } |
| 4209 | 1031 |
| 1032 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1033 free_register(void *reg) |
| 4209 | 1034 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1035 yankreg_T tmp; |
| 4209 | 1036 |
| 1037 tmp = *y_current; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1038 *y_current = *(yankreg_T *)reg; |
| 4209 | 1039 free_yank_all(); |
| 1040 vim_free(reg); | |
| 1041 *y_current = tmp; | |
| 1042 } | |
| 7 | 1043 |
| 1044 #if defined(FEAT_MOUSE) || defined(PROTO) | |
| 1045 /* | |
| 1046 * return TRUE if the current yank register has type MLINE | |
| 1047 */ | |
| 1048 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1049 yank_register_mline(int regname) |
| 7 | 1050 { |
| 1051 if (regname != 0 && !valid_yank_reg(regname, FALSE)) | |
| 1052 return FALSE; | |
| 1053 if (regname == '_') /* black hole is always empty */ | |
| 1054 return FALSE; | |
| 1055 get_yank_register(regname, FALSE); | |
| 1056 return (y_current->y_type == MLINE); | |
| 1057 } | |
| 1058 #endif | |
| 1059 | |
| 1060 /* | |
| 1157 | 1061 * Start or stop recording into a yank register. |
| 7 | 1062 * |
| 1157 | 1063 * Return FAIL for failure, OK otherwise. |
| 7 | 1064 */ |
| 1065 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1066 do_record(int c) |
| 7 | 1067 { |
| 1157 | 1068 char_u *p; |
| 1069 static int regname; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1070 yankreg_T *old_y_previous, *old_y_current; |
| 1157 | 1071 int retval; |
| 7 | 1072 |
| 1073 if (Recording == FALSE) /* start recording */ | |
| 1074 { | |
| 1075 /* registers 0-9, a-z and " are allowed */ | |
| 1076 if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) | |
| 1077 retval = FAIL; | |
| 1078 else | |
| 1079 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7011
diff
changeset
|
1080 Recording = c; |
| 7 | 1081 showmode(); |
| 1082 regname = c; | |
| 1083 retval = OK; | |
| 1084 } | |
| 1085 } | |
| 1086 else /* stop recording */ | |
| 1087 { | |
| 1088 /* | |
| 1157 | 1089 * Get the recorded key hits. K_SPECIAL and CSI will be escaped, this |
| 1090 * needs to be removed again to put it in a register. exec_reg then | |
| 1091 * adds the escaping back later. | |
| 7 | 1092 */ |
| 1093 Recording = FALSE; | |
| 1094 MSG(""); | |
| 1095 p = get_recorded(); | |
| 1096 if (p == NULL) | |
| 1097 retval = FAIL; | |
| 1098 else | |
| 1099 { | |
| 1081 | 1100 /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ |
| 1101 vim_unescape_csi(p); | |
| 1102 | |
| 7 | 1103 /* |
| 1104 * We don't want to change the default register here, so save and | |
| 1105 * restore the current register name. | |
| 1106 */ | |
| 1107 old_y_previous = y_previous; | |
| 1108 old_y_current = y_current; | |
| 1109 | |
| 1110 retval = stuff_yank(regname, p); | |
| 1111 | |
| 1112 y_previous = old_y_previous; | |
| 1113 y_current = old_y_current; | |
| 1114 } | |
| 1115 } | |
| 1116 return retval; | |
| 1117 } | |
| 1118 | |
| 1119 /* | |
| 1120 * Stuff string "p" into yank register "regname" as a single line (append if | |
| 1121 * uppercase). "p" must have been alloced. | |
| 1122 * | |
| 1123 * return FAIL for failure, OK otherwise | |
| 1124 */ | |
| 1125 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1126 stuff_yank(int regname, char_u *p) |
| 7 | 1127 { |
| 1128 char_u *lp; | |
| 1129 char_u **pp; | |
| 1130 | |
| 1131 /* check for read-only register */ | |
| 1132 if (regname != 0 && !valid_yank_reg(regname, TRUE)) | |
| 1133 { | |
| 1134 vim_free(p); | |
| 1135 return FAIL; | |
| 1136 } | |
| 1137 if (regname == '_') /* black hole: don't do anything */ | |
| 1138 { | |
| 1139 vim_free(p); | |
| 1140 return OK; | |
| 1141 } | |
| 1142 get_yank_register(regname, TRUE); | |
| 1143 if (y_append && y_current->y_array != NULL) | |
| 1144 { | |
| 1145 pp = &(y_current->y_array[y_current->y_size - 1]); | |
| 1146 lp = lalloc((long_u)(STRLEN(*pp) + STRLEN(p) + 1), TRUE); | |
| 1147 if (lp == NULL) | |
| 1148 { | |
| 1149 vim_free(p); | |
| 1150 return FAIL; | |
| 1151 } | |
| 1152 STRCPY(lp, *pp); | |
| 1153 STRCAT(lp, p); | |
| 1154 vim_free(p); | |
| 1155 vim_free(*pp); | |
| 1156 *pp = lp; | |
| 1157 } | |
| 1158 else | |
| 1159 { | |
| 1160 free_yank_all(); | |
| 1161 if ((y_current->y_array = | |
| 1162 (char_u **)alloc((unsigned)sizeof(char_u *))) == NULL) | |
| 1163 { | |
| 1164 vim_free(p); | |
| 1165 return FAIL; | |
| 1166 } | |
| 1167 y_current->y_array[0] = p; | |
| 1168 y_current->y_size = 1; | |
| 1169 y_current->y_type = MCHAR; /* used to be MLINE, why? */ | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1170 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1171 y_current->y_time_set = vim_time(); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1172 #endif |
| 7 | 1173 } |
| 1174 return OK; | |
| 1175 } | |
| 1176 | |
| 1893 | 1177 static int execreg_lastc = NUL; |
| 1178 | |
| 7 | 1179 /* |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1180 * Execute a yank register: copy it into the stuff buffer. |
| 7 | 1181 * |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1182 * Return FAIL for failure, OK otherwise. |
| 7 | 1183 */ |
| 1184 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1185 do_execreg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1186 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1187 int colon, /* insert ':' before each line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1188 int addcr, /* always add '\n' to end of line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1189 int silent) /* set "silent" flag in typeahead buffer */ |
| 7 | 1190 { |
| 1191 long i; | |
| 1192 char_u *p; | |
| 1193 int retval = OK; | |
| 1194 int remap; | |
| 1195 | |
| 1196 if (regname == '@') /* repeat previous one */ | |
| 168 | 1197 { |
| 1893 | 1198 if (execreg_lastc == NUL) |
| 168 | 1199 { |
| 1200 EMSG(_("E748: No previously used register")); | |
| 1201 return FAIL; | |
| 1202 } | |
| 1893 | 1203 regname = execreg_lastc; |
| 168 | 1204 } |
| 7 | 1205 /* check for valid regname */ |
| 1206 if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) | |
| 168 | 1207 { |
| 1208 emsg_invreg(regname); | |
| 7 | 1209 return FAIL; |
| 168 | 1210 } |
| 1893 | 1211 execreg_lastc = regname; |
| 7 | 1212 |
| 1213 #ifdef FEAT_CLIPBOARD | |
| 1214 regname = may_get_selection(regname); | |
| 1215 #endif | |
| 1216 | |
| 1217 if (regname == '_') /* black hole: don't stuff anything */ | |
| 1218 return OK; | |
| 1219 | |
| 1220 #ifdef FEAT_CMDHIST | |
| 1221 if (regname == ':') /* use last command line */ | |
| 1222 { | |
| 1223 if (last_cmdline == NULL) | |
| 1224 { | |
| 1225 EMSG(_(e_nolastcmd)); | |
| 1226 return FAIL; | |
| 1227 } | |
| 1228 vim_free(new_last_cmdline); /* don't keep the cmdline containing @: */ | |
| 1229 new_last_cmdline = NULL; | |
| 16 | 1230 /* Escape all control characters with a CTRL-V */ |
| 1231 p = vim_strsave_escaped_ext(last_cmdline, | |
| 20 | 1232 (char_u *)"\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037", Ctrl_V, FALSE); |
| 16 | 1233 if (p != NULL) |
| 480 | 1234 { |
| 1235 /* When in Visual mode "'<,'>" will be prepended to the command. | |
| 1236 * Remove it when it's already there. */ | |
| 1237 if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) | |
| 1077 | 1238 retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); |
| 480 | 1239 else |
| 1077 | 1240 retval = put_in_typebuf(p, TRUE, TRUE, silent); |
| 480 | 1241 } |
| 16 | 1242 vim_free(p); |
| 7 | 1243 } |
| 1244 #endif | |
| 1245 #ifdef FEAT_EVAL | |
| 1246 else if (regname == '=') | |
| 1247 { | |
| 1248 p = get_expr_line(); | |
| 1249 if (p == NULL) | |
| 1250 return FAIL; | |
| 1077 | 1251 retval = put_in_typebuf(p, TRUE, colon, silent); |
| 7 | 1252 vim_free(p); |
| 1253 } | |
| 1254 #endif | |
| 1255 else if (regname == '.') /* use last inserted text */ | |
| 1256 { | |
| 1257 p = get_last_insert_save(); | |
| 1258 if (p == NULL) | |
| 1259 { | |
| 1260 EMSG(_(e_noinstext)); | |
| 1261 return FAIL; | |
| 1262 } | |
| 1077 | 1263 retval = put_in_typebuf(p, FALSE, colon, silent); |
| 7 | 1264 vim_free(p); |
| 1265 } | |
| 1266 else | |
| 1267 { | |
| 1268 get_yank_register(regname, FALSE); | |
| 1269 if (y_current->y_array == NULL) | |
| 1270 return FAIL; | |
| 1271 | |
| 1272 /* Disallow remaping for ":@r". */ | |
| 1273 remap = colon ? REMAP_NONE : REMAP_YES; | |
| 1274 | |
| 1275 /* | |
| 1276 * Insert lines into typeahead buffer, from last one to first one. | |
| 1277 */ | |
| 1034 | 1278 put_reedit_in_typebuf(silent); |
| 7 | 1279 for (i = y_current->y_size; --i >= 0; ) |
| 1280 { | |
| 1077 | 1281 char_u *escaped; |
| 1282 | |
| 7 | 1283 /* insert NL between lines and after last line if type is MLINE */ |
| 1284 if (y_current->y_type == MLINE || i < y_current->y_size - 1 | |
| 1285 || addcr) | |
| 1286 { | |
| 1034 | 1287 if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) |
| 7 | 1288 return FAIL; |
| 1289 } | |
| 1077 | 1290 escaped = vim_strsave_escape_csi(y_current->y_array[i]); |
| 1291 if (escaped == NULL) | |
| 1292 return FAIL; | |
| 1293 retval = ins_typebuf(escaped, remap, 0, TRUE, silent); | |
| 1294 vim_free(escaped); | |
| 1295 if (retval == FAIL) | |
| 7 | 1296 return FAIL; |
| 1034 | 1297 if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) |
| 7 | 1298 == FAIL) |
| 1299 return FAIL; | |
| 1300 } | |
| 1301 Exec_reg = TRUE; /* disable the 'q' command */ | |
| 1302 } | |
| 1303 return retval; | |
| 1304 } | |
| 1305 | |
| 1306 /* | |
| 1307 * If "restart_edit" is not zero, put it in the typeahead buffer, so that it's | |
| 1308 * used only after other typeahead has been processed. | |
| 1309 */ | |
| 1310 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1311 put_reedit_in_typebuf(int silent) |
| 7 | 1312 { |
| 1313 char_u buf[3]; | |
| 1314 | |
| 1315 if (restart_edit != NUL) | |
| 1316 { | |
| 1317 if (restart_edit == 'V') | |
| 1318 { | |
| 1319 buf[0] = 'g'; | |
| 1320 buf[1] = 'R'; | |
| 1321 buf[2] = NUL; | |
| 1322 } | |
| 1323 else | |
| 1324 { | |
| 1325 buf[0] = restart_edit == 'I' ? 'i' : restart_edit; | |
| 1326 buf[1] = NUL; | |
| 1327 } | |
| 1034 | 1328 if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK) |
| 7 | 1329 restart_edit = NUL; |
| 1330 } | |
| 1331 } | |
| 1332 | |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1333 /* |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1334 * Insert register contents "s" into the typeahead buffer, so that it will be |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1335 * executed again. |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1336 * When "esc" is TRUE it is to be taken literally: Escape CSI characters and |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1337 * no remapping. |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1338 */ |
| 7 | 1339 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1340 put_in_typebuf( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1341 char_u *s, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1342 int esc, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1343 int colon, /* add ':' before the line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1344 int silent) |
| 7 | 1345 { |
| 1346 int retval = OK; | |
| 1347 | |
| 1034 | 1348 put_reedit_in_typebuf(silent); |
| 7 | 1349 if (colon) |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1350 retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent); |
| 7 | 1351 if (retval == OK) |
| 1077 | 1352 { |
| 1353 char_u *p; | |
| 1354 | |
| 1355 if (esc) | |
| 1356 p = vim_strsave_escape_csi(s); | |
| 1357 else | |
| 1358 p = s; | |
| 1359 if (p == NULL) | |
| 1360 retval = FAIL; | |
| 1361 else | |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1362 retval = ins_typebuf(p, esc ? REMAP_NONE : REMAP_YES, |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1363 0, TRUE, silent); |
| 1077 | 1364 if (esc) |
| 1365 vim_free(p); | |
| 1366 } | |
| 7 | 1367 if (colon && retval == OK) |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1368 retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent); |
| 7 | 1369 return retval; |
| 1370 } | |
| 1371 | |
| 1372 /* | |
| 1373 * Insert a yank register: copy it into the Read buffer. | |
| 1374 * Used by CTRL-R command and middle mouse button in insert mode. | |
| 1375 * | |
| 1376 * return FAIL for failure, OK otherwise | |
| 1377 */ | |
| 1378 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1379 insert_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1380 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1381 int literally) /* insert literally, not as if typed */ |
| 7 | 1382 { |
| 1383 long i; | |
| 1384 int retval = OK; | |
| 1385 char_u *arg; | |
| 1386 int allocated; | |
| 1387 | |
| 1388 /* | |
| 1389 * It is possible to get into an endless loop by having CTRL-R a in | |
| 1390 * register a and then, in insert mode, doing CTRL-R a. | |
| 1391 * If you hit CTRL-C, the loop will be broken here. | |
| 1392 */ | |
| 1393 ui_breakcheck(); | |
| 1394 if (got_int) | |
| 1395 return FAIL; | |
| 1396 | |
| 1397 /* check for valid regname */ | |
| 1398 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
| 1399 return FAIL; | |
| 1400 | |
| 1401 #ifdef FEAT_CLIPBOARD | |
| 1402 regname = may_get_selection(regname); | |
| 1403 #endif | |
| 1404 | |
| 1405 if (regname == '.') /* insert last inserted text */ | |
| 1406 retval = stuff_inserted(NUL, 1L, TRUE); | |
| 1407 else if (get_spec_reg(regname, &arg, &allocated, TRUE)) | |
| 1408 { | |
| 1409 if (arg == NULL) | |
| 1410 return FAIL; | |
| 1411 stuffescaped(arg, literally); | |
| 1412 if (allocated) | |
| 1413 vim_free(arg); | |
| 1414 } | |
| 1415 else /* name or number register */ | |
| 1416 { | |
| 1417 get_yank_register(regname, FALSE); | |
| 1418 if (y_current->y_array == NULL) | |
| 1419 retval = FAIL; | |
| 1420 else | |
| 1421 { | |
| 1422 for (i = 0; i < y_current->y_size; ++i) | |
| 1423 { | |
| 1424 stuffescaped(y_current->y_array[i], literally); | |
| 1425 /* | |
| 1426 * Insert a newline between lines and after last line if | |
| 1427 * y_type is MLINE. | |
| 1428 */ | |
| 1429 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 1430 stuffcharReadbuff('\n'); | |
| 1431 } | |
| 1432 } | |
| 1433 } | |
| 1434 | |
| 1435 return retval; | |
| 1436 } | |
| 1437 | |
| 1438 /* | |
| 1439 * Stuff a string into the typeahead buffer, such that edit() will insert it | |
| 1440 * literally ("literally" TRUE) or interpret is as typed characters. | |
| 1441 */ | |
| 1442 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1443 stuffescaped(char_u *arg, int literally) |
| 7 | 1444 { |
| 1445 int c; | |
| 1446 char_u *start; | |
| 1447 | |
| 1448 while (*arg != NUL) | |
| 1449 { | |
| 1450 /* Stuff a sequence of normal ASCII characters, that's fast. Also | |
| 1451 * stuff K_SPECIAL to get the effect of a special key when "literally" | |
| 1452 * is TRUE. */ | |
| 1453 start = arg; | |
| 1454 while ((*arg >= ' ' | |
| 1455 #ifndef EBCDIC | |
| 1456 && *arg < DEL /* EBCDIC: chars above space are normal */ | |
| 1457 #endif | |
| 1458 ) | |
| 1459 || (*arg == K_SPECIAL && !literally)) | |
| 1460 ++arg; | |
| 1461 if (arg > start) | |
| 1462 stuffReadbuffLen(start, (long)(arg - start)); | |
| 1463 | |
| 1464 /* stuff a single special character */ | |
| 1465 if (*arg != NUL) | |
| 1466 { | |
| 1467 #ifdef FEAT_MBYTE | |
| 1468 if (has_mbyte) | |
|
2446
348f64c129df
Fixed: CTRL-R in Insert mode doesn't insert composing characters.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1469 c = mb_cptr2char_adv(&arg); |
| 7 | 1470 else |
| 1471 #endif | |
| 1472 c = *arg++; | |
| 1473 if (literally && ((c < ' ' && c != TAB) || c == DEL)) | |
| 1474 stuffcharReadbuff(Ctrl_V); | |
| 1475 stuffcharReadbuff(c); | |
| 1476 } | |
| 1477 } | |
| 1478 } | |
| 1479 | |
| 1480 /* | |
| 1157 | 1481 * If "regname" is a special register, return TRUE and store a pointer to its |
| 1482 * value in "argp". | |
| 7 | 1483 */ |
| 15 | 1484 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1485 get_spec_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1486 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1487 char_u **argp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1488 int *allocated, /* return: TRUE when value was allocated */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1489 int errmsg) /* give error message when failing */ |
| 7 | 1490 { |
| 1491 int cnt; | |
| 1492 | |
| 1493 *argp = NULL; | |
| 1494 *allocated = FALSE; | |
| 1495 switch (regname) | |
| 1496 { | |
| 1497 case '%': /* file name */ | |
| 1498 if (errmsg) | |
| 1499 check_fname(); /* will give emsg if not set */ | |
| 1500 *argp = curbuf->b_fname; | |
| 1501 return TRUE; | |
| 1502 | |
| 1503 case '#': /* alternate file name */ | |
| 1504 *argp = getaltfname(errmsg); /* may give emsg if not set */ | |
| 1505 return TRUE; | |
| 1506 | |
| 1507 #ifdef FEAT_EVAL | |
| 1508 case '=': /* result of expression */ | |
| 1509 *argp = get_expr_line(); | |
| 1510 *allocated = TRUE; | |
| 1511 return TRUE; | |
| 1512 #endif | |
| 1513 | |
| 1514 case ':': /* last command line */ | |
| 1515 if (last_cmdline == NULL && errmsg) | |
| 1516 EMSG(_(e_nolastcmd)); | |
| 1517 *argp = last_cmdline; | |
| 1518 return TRUE; | |
| 1519 | |
| 1520 case '/': /* last search-pattern */ | |
| 1521 if (last_search_pat() == NULL && errmsg) | |
| 1522 EMSG(_(e_noprevre)); | |
| 1523 *argp = last_search_pat(); | |
| 1524 return TRUE; | |
| 1525 | |
| 1526 case '.': /* last inserted text */ | |
| 1527 *argp = get_last_insert_save(); | |
| 1528 *allocated = TRUE; | |
| 1529 if (*argp == NULL && errmsg) | |
| 1530 EMSG(_(e_noinstext)); | |
| 1531 return TRUE; | |
| 1532 | |
| 1533 #ifdef FEAT_SEARCHPATH | |
| 1534 case Ctrl_F: /* Filename under cursor */ | |
| 1535 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
| 1536 if (!errmsg) | |
| 1537 return FALSE; | |
| 1538 *argp = file_name_at_cursor(FNAME_MESS | FNAME_HYP | |
| 681 | 1539 | (regname == Ctrl_P ? FNAME_EXP : 0), 1L, NULL); |
| 7 | 1540 *allocated = TRUE; |
| 1541 return TRUE; | |
| 1542 #endif | |
| 1543 | |
| 1544 case Ctrl_W: /* word under cursor */ | |
| 1545 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
| 1546 if (!errmsg) | |
| 1547 return FALSE; | |
| 1548 cnt = find_ident_under_cursor(argp, regname == Ctrl_W | |
| 1549 ? (FIND_IDENT|FIND_STRING) : FIND_STRING); | |
| 1550 *argp = cnt ? vim_strnsave(*argp, cnt) : NULL; | |
| 1551 *allocated = TRUE; | |
| 1552 return TRUE; | |
| 1553 | |
| 1554 case '_': /* black hole: always empty */ | |
| 1555 *argp = (char_u *)""; | |
| 1556 return TRUE; | |
| 1557 } | |
| 1558 | |
| 1559 return FALSE; | |
| 1560 } | |
| 1561 | |
| 1562 /* | |
| 15 | 1563 * Paste a yank register into the command line. |
| 1564 * Only for non-special registers. | |
| 1565 * Used by CTRL-R command in command-line mode | |
| 7 | 1566 * insert_reg() can't be used here, because special characters from the |
| 1567 * register contents will be interpreted as commands. | |
| 1568 * | |
| 1569 * return FAIL for failure, OK otherwise | |
| 1570 */ | |
| 1571 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1572 cmdline_paste_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1573 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1574 int literally, /* Insert text literally instead of "as typed" */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1575 int remcr) /* don't add CR characters */ |
| 7 | 1576 { |
| 1577 long i; | |
| 1578 | |
| 1579 get_yank_register(regname, FALSE); | |
| 1580 if (y_current->y_array == NULL) | |
| 1581 return FAIL; | |
| 1582 | |
| 1583 for (i = 0; i < y_current->y_size; ++i) | |
| 1584 { | |
| 1585 cmdline_paste_str(y_current->y_array[i], literally); | |
| 1586 | |
| 1015 | 1587 /* Insert ^M between lines and after last line if type is MLINE. |
|
7336
4c5f53a60543
commit https://github.com/vim/vim/commit/6f62fed349bf829da2adb02619dc9acba13c8ab6
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
1588 * Don't do this when "remcr" is TRUE. */ |
|
4c5f53a60543
commit https://github.com/vim/vim/commit/6f62fed349bf829da2adb02619dc9acba13c8ab6
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
1589 if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr) |
| 7 | 1590 cmdline_paste_str((char_u *)"\r", literally); |
| 1591 | |
| 1592 /* Check for CTRL-C, in case someone tries to paste a few thousand | |
| 1593 * lines and gets bored. */ | |
| 1594 ui_breakcheck(); | |
| 1595 if (got_int) | |
| 1596 return FAIL; | |
| 1597 } | |
| 1598 return OK; | |
| 1599 } | |
| 1600 | |
| 1601 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
| 1602 /* | |
| 1603 * Adjust the register name pointed to with "rp" for the clipboard being | |
| 1604 * used always and the clipboard being available. | |
| 1605 */ | |
| 1606 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1607 adjust_clip_reg(int *rp) |
| 7 | 1608 { |
| 2654 | 1609 /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', |
| 1610 * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ | |
| 6116 | 1611 if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0)) |
| 1612 { | |
| 1613 if (clip_unnamed != 0) | |
| 1614 *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
| 2654 | 1615 ? '+' : '*'; |
| 6116 | 1616 else |
| 1617 *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
| 1618 ? '+' : '*'; | |
| 1619 } | |
| 7 | 1620 if (!clip_star.available && *rp == '*') |
| 1621 *rp = 0; | |
| 1622 if (!clip_plus.available && *rp == '+') | |
| 1623 *rp = 0; | |
| 1624 } | |
| 1625 #endif | |
| 1626 | |
| 1627 /* | |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1628 * Shift the delete registers: "9 is cleared, "8 becomes "9, etc. |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1629 */ |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1630 void |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1631 shift_delete_registers() |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1632 { |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1633 int n; |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1634 |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1635 y_current = &y_regs[9]; |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1636 free_yank_all(); /* free register nine */ |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1637 for (n = 9; n > 1; --n) |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1638 y_regs[n] = y_regs[n - 1]; |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1639 y_previous = y_current = &y_regs[1]; |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1640 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
|
1641 } |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1642 |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1643 /* |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1644 * Handle a delete operation. |
| 7 | 1645 * |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1646 * Return FAIL if undo failed, OK otherwise. |
| 7 | 1647 */ |
| 1648 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1649 op_delete(oparg_T *oap) |
| 7 | 1650 { |
| 1651 int n; | |
| 1652 linenr_T lnum; | |
| 1653 char_u *ptr; | |
| 1654 char_u *newp, *oldp; | |
| 1655 struct block_def bd; | |
| 1656 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
| 1657 int did_yank = FALSE; | |
| 3782 | 1658 int orig_regname = oap->regname; |
| 7 | 1659 |
| 1660 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
| 1661 return OK; | |
| 1662 | |
| 1663 /* Nothing to delete, return here. Do prepare undo, for op_change(). */ | |
| 1664 if (oap->empty) | |
| 1665 return u_save_cursor(); | |
| 1666 | |
| 1667 if (!curbuf->b_p_ma) | |
| 1668 { | |
| 1669 EMSG(_(e_modifiable)); | |
| 1670 return FAIL; | |
| 1671 } | |
| 1672 | |
| 1673 #ifdef FEAT_CLIPBOARD | |
| 1674 adjust_clip_reg(&oap->regname); | |
| 1675 #endif | |
| 1676 | |
| 1677 #ifdef FEAT_MBYTE | |
| 1678 if (has_mbyte) | |
| 1679 mb_adjust_opend(oap); | |
| 1680 #endif | |
| 1681 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1682 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1683 * 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
|
1684 * 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
|
1685 * 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
|
1686 */ |
| 7 | 1687 if ( oap->motion_type == MCHAR |
| 1688 && !oap->is_VIsual | |
| 50 | 1689 && !oap->block_mode |
| 7 | 1690 && oap->line_count > 1 |
| 3254 | 1691 && oap->motion_force == NUL |
| 7 | 1692 && oap->op_type == OP_DELETE) |
| 1693 { | |
| 2957 | 1694 ptr = ml_get(oap->end.lnum) + oap->end.col; |
| 1695 if (*ptr != NUL) | |
| 1696 ptr += oap->inclusive; | |
| 7 | 1697 ptr = skipwhite(ptr); |
| 1698 if (*ptr == NUL && inindent(0)) | |
| 1699 oap->motion_type = MLINE; | |
| 1700 } | |
| 1701 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1702 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1703 * 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
|
1704 * 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
|
1705 */ |
| 7 | 1706 if ( oap->motion_type == MCHAR |
| 1707 && oap->line_count == 1 | |
| 1708 && oap->op_type == OP_DELETE | |
| 1709 && *ml_get(oap->start.lnum) == NUL) | |
| 1710 { | |
| 1711 /* | |
| 446 | 1712 * It's an error to operate on an empty region, when 'E' included in |
| 7 | 1713 * 'cpoptions' (Vi compatible). |
| 1714 */ | |
| 446 | 1715 #ifdef FEAT_VIRTUALEDIT |
| 1716 if (virtual_op) | |
| 1717 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
| 1718 * marks as if it happened. */ | |
| 1719 goto setmarks; | |
| 1720 #endif | |
| 7 | 1721 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
| 1722 beep_flush(); | |
| 1723 return OK; | |
| 1724 } | |
| 1725 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1726 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1727 * 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
|
1728 * 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
|
1729 * 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
|
1730 */ |
| 7 | 1731 if (oap->regname != '_') |
| 1732 { | |
| 1733 if (oap->regname != 0) | |
| 1734 { | |
| 1735 /* check for read-only register */ | |
| 1736 if (!valid_yank_reg(oap->regname, TRUE)) | |
| 1737 { | |
| 1738 beep_flush(); | |
| 1739 return OK; | |
| 1740 } | |
| 1741 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
| 1742 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
| 1743 did_yank = TRUE; | |
| 1744 } | |
| 1745 | |
| 1746 /* | |
| 1747 * Put deleted text into register 1 and shift number registers if the | |
| 1748 * delete contains a line break, or when a regname has been specified. | |
| 3782 | 1749 * Use the register name from before adjust_clip_reg() may have |
| 1750 * changed it. | |
| 7 | 1751 */ |
| 3782 | 1752 if (orig_regname != 0 || oap->motion_type == MLINE |
| 7 | 1753 || oap->line_count > 1 || oap->use_reg_one) |
| 1754 { | |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1755 shift_delete_registers(); |
| 7 | 1756 if (op_yank(oap, TRUE, FALSE) == OK) |
| 1757 did_yank = TRUE; | |
| 1758 } | |
| 1759 | |
| 3468 | 1760 /* Yank into small delete register when no named register specified |
| 1761 * and the delete is within one line. */ | |
| 1762 if (( | |
| 1763 #ifdef FEAT_CLIPBOARD | |
| 3584 | 1764 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
| 1765 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
| 3468 | 1766 #endif |
| 1767 oap->regname == 0) && oap->motion_type != MLINE | |
| 7 | 1768 && oap->line_count == 1) |
| 1769 { | |
| 1770 oap->regname = '-'; | |
| 1771 get_yank_register(oap->regname, TRUE); | |
| 1772 if (op_yank(oap, TRUE, FALSE) == OK) | |
| 1773 did_yank = TRUE; | |
| 1774 oap->regname = 0; | |
| 1775 } | |
| 1776 | |
| 1777 /* | |
| 1778 * If there's too much stuff to fit in the yank register, then get a | |
| 1779 * confirmation before doing the delete. This is crude, but simple. | |
| 1780 * And it avoids doing a delete of something we can't put back if we | |
| 1781 * want. | |
| 1782 */ | |
| 1783 if (!did_yank) | |
| 1784 { | |
| 1785 int msg_silent_save = msg_silent; | |
| 1786 | |
| 1787 msg_silent = 0; /* must display the prompt */ | |
| 1788 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
| 1789 msg_silent = msg_silent_save; | |
| 1790 if (n != 'y') | |
| 1791 { | |
| 1792 EMSG(_(e_abort)); | |
| 1793 return FAIL; | |
| 1794 } | |
| 1795 } | |
| 1796 } | |
| 1797 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1798 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1799 * 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
|
1800 */ |
| 7 | 1801 if (oap->block_mode) |
| 1802 { | |
| 1803 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 1804 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 1805 return FAIL; | |
| 1806 | |
| 1807 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
| 1808 { | |
| 1809 block_prep(oap, &bd, lnum, TRUE); | |
| 1810 if (bd.textlen == 0) /* nothing to delete */ | |
| 1811 continue; | |
| 1812 | |
| 1813 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
| 1814 if (lnum == curwin->w_cursor.lnum) | |
| 1815 { | |
| 1816 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
| 1817 # ifdef FEAT_VIRTUALEDIT | |
| 1818 curwin->w_cursor.coladd = 0; | |
| 1819 # endif | |
| 1820 } | |
| 1821 | |
| 1822 /* n == number of chars deleted | |
| 1823 * If we delete a TAB, it may be replaced by several characters. | |
| 1824 * Thus the number of characters may increase! | |
| 1825 */ | |
| 1826 n = bd.textlen - bd.startspaces - bd.endspaces; | |
| 1827 oldp = ml_get(lnum); | |
| 1828 newp = alloc_check((unsigned)STRLEN(oldp) + 1 - n); | |
| 1829 if (newp == NULL) | |
| 1830 continue; | |
| 1831 /* copy up to deleted part */ | |
| 1832 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 1833 /* insert spaces */ | |
| 6929 | 1834 vim_memset(newp + bd.textcol, ' ', |
| 7 | 1835 (size_t)(bd.startspaces + bd.endspaces)); |
| 1836 /* copy the part after the deleted part */ | |
| 1837 oldp += bd.textcol + bd.textlen; | |
| 1622 | 1838 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
| 7 | 1839 /* replace the line */ |
| 1840 ml_replace(lnum, newp, FALSE); | |
| 1841 } | |
| 1842 | |
| 1843 check_cursor_col(); | |
| 1844 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
| 1845 oap->end.lnum + 1, 0L); | |
| 1846 oap->line_count = 0; /* no lines deleted */ | |
| 1847 } | |
| 5735 | 1848 else if (oap->motion_type == MLINE) |
| 7 | 1849 { |
| 1850 if (oap->op_type == OP_CHANGE) | |
| 1851 { | |
| 1852 /* Delete the lines except the first one. Temporarily move the | |
| 1853 * cursor to the next line. Save the current line number, if the | |
| 1854 * last line is deleted it may be changed. | |
| 1855 */ | |
| 1856 if (oap->line_count > 1) | |
| 1857 { | |
| 1858 lnum = curwin->w_cursor.lnum; | |
| 1859 ++curwin->w_cursor.lnum; | |
| 1860 del_lines((long)(oap->line_count - 1), TRUE); | |
| 1861 curwin->w_cursor.lnum = lnum; | |
| 1862 } | |
| 1863 if (u_save_cursor() == FAIL) | |
| 1864 return FAIL; | |
| 1865 if (curbuf->b_p_ai) /* don't delete indent */ | |
| 1866 { | |
| 1867 beginline(BL_WHITE); /* cursor on first non-white */ | |
| 1868 did_ai = TRUE; /* delete the indent when ESC hit */ | |
| 1869 ai_col = curwin->w_cursor.col; | |
| 1870 } | |
| 1871 else | |
| 1872 beginline(0); /* cursor in column 0 */ | |
| 1873 truncate_line(FALSE); /* delete the rest of the line */ | |
| 1874 /* leave cursor past last char in line */ | |
| 1875 if (oap->line_count > 1) | |
| 1876 u_clearline(); /* "U" command not possible after "2cc" */ | |
| 1877 } | |
| 1878 else | |
| 1879 { | |
| 1880 del_lines(oap->line_count, TRUE); | |
| 1881 beginline(BL_WHITE | BL_FIX); | |
| 1882 u_clearline(); /* "U" command not possible after "dd" */ | |
| 1883 } | |
| 1884 } | |
| 1885 else | |
| 1886 { | |
| 1887 #ifdef FEAT_VIRTUALEDIT | |
| 1888 if (virtual_op) | |
| 1889 { | |
| 1890 int endcol = 0; | |
| 1891 | |
| 1892 /* For virtualedit: break the tabs that are partly included. */ | |
| 1893 if (gchar_pos(&oap->start) == '\t') | |
| 1894 { | |
| 1895 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
| 1896 return FAIL; | |
| 1897 if (oap->line_count == 1) | |
| 1898 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
| 1899 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
| 1900 oap->start = curwin->w_cursor; | |
| 1901 if (oap->line_count == 1) | |
| 1902 { | |
| 1903 coladvance(endcol); | |
| 1904 oap->end.col = curwin->w_cursor.col; | |
| 1905 oap->end.coladd = curwin->w_cursor.coladd; | |
| 1906 curwin->w_cursor = oap->start; | |
| 1907 } | |
| 1908 } | |
| 1909 | |
| 1910 /* Break a tab only when it's included in the area. */ | |
| 1911 if (gchar_pos(&oap->end) == '\t' | |
| 1912 && (int)oap->end.coladd < oap->inclusive) | |
| 1913 { | |
| 1914 /* save last line for undo */ | |
| 1915 if (u_save((linenr_T)(oap->end.lnum - 1), | |
| 1916 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 1917 return FAIL; | |
| 1918 curwin->w_cursor = oap->end; | |
| 1919 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
| 1920 oap->end = curwin->w_cursor; | |
| 1921 curwin->w_cursor = oap->start; | |
| 1922 } | |
| 1923 } | |
| 1924 #endif | |
| 1925 | |
| 1926 if (oap->line_count == 1) /* delete characters within one line */ | |
| 1927 { | |
| 1928 if (u_save_cursor() == FAIL) /* save line for undo */ | |
| 1929 return FAIL; | |
| 1930 | |
| 1931 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
| 5735 | 1932 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
| 7 | 1933 && oap->op_type == OP_CHANGE |
| 1934 && oap->end.lnum == curwin->w_cursor.lnum | |
| 5735 | 1935 && !oap->is_VIsual) |
| 7 | 1936 display_dollar(oap->end.col - !oap->inclusive); |
| 1937 | |
| 1938 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
| 1939 | |
| 1940 #ifdef FEAT_VIRTUALEDIT | |
| 1941 if (virtual_op) | |
| 1942 { | |
| 1943 /* fix up things for virtualedit-delete: | |
| 1944 * break the tabs which are going to get in our way | |
| 1945 */ | |
| 1946 char_u *curline = ml_get_curline(); | |
| 1947 int len = (int)STRLEN(curline); | |
| 1948 | |
| 1949 if (oap->end.coladd != 0 | |
| 1950 && (int)oap->end.col >= len - 1 | |
| 1951 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
| 1952 n++; | |
| 1953 /* Delete at least one char (e.g, when on a control char). */ | |
| 1954 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
| 1955 n = 1; | |
| 1956 | |
| 1957 /* When deleted a char in the line, reset coladd. */ | |
| 1958 if (gchar_cursor() != NUL) | |
| 1959 curwin->w_cursor.coladd = 0; | |
| 1960 } | |
| 1961 #endif | |
| 6826 | 1962 (void)del_bytes((long)n, !virtual_op, |
| 1963 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
| 7 | 1964 } |
| 1965 else /* delete characters between lines */ | |
| 1966 { | |
| 1967 pos_T curpos; | |
| 1968 | |
| 1969 /* save deleted and changed lines for undo */ | |
| 1970 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
| 1971 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
| 1972 return FAIL; | |
| 1973 | |
| 1974 truncate_line(TRUE); /* delete from cursor to end of line */ | |
| 1975 | |
| 1976 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
| 1977 ++curwin->w_cursor.lnum; | |
| 1978 del_lines((long)(oap->line_count - 2), FALSE); | |
| 1979 | |
| 6826 | 1980 /* delete from start of line until op_end */ |
| 2957 | 1981 n = (oap->end.col + 1 - !oap->inclusive); |
| 6826 | 1982 curwin->w_cursor.col = 0; |
| 1983 (void)del_bytes((long)n, !virtual_op, | |
| 1984 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
| 1985 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
| 1986 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
| 7 | 1987 } |
| 1988 } | |
| 1989 | |
| 1990 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
| 1991 | |
| 446 | 1992 #ifdef FEAT_VIRTUALEDIT |
| 1993 setmarks: | |
| 1994 #endif | |
| 7 | 1995 if (oap->block_mode) |
| 1996 { | |
| 1997 curbuf->b_op_end.lnum = oap->end.lnum; | |
| 1998 curbuf->b_op_end.col = oap->start.col; | |
| 1999 } | |
| 2000 else | |
| 2001 curbuf->b_op_end = oap->start; | |
| 2002 curbuf->b_op_start = oap->start; | |
| 2003 | |
| 2004 return OK; | |
| 2005 } | |
| 2006 | |
| 2007 #ifdef FEAT_MBYTE | |
| 2008 /* | |
| 2009 * Adjust end of operating area for ending on a multi-byte character. | |
| 2010 * Used for deletion. | |
| 2011 */ | |
| 2012 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2013 mb_adjust_opend(oparg_T *oap) |
| 7 | 2014 { |
| 2015 char_u *p; | |
| 2016 | |
| 2017 if (oap->inclusive) | |
| 2018 { | |
| 2019 p = ml_get(oap->end.lnum); | |
| 2020 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
| 2021 } | |
| 2022 } | |
| 2023 #endif | |
| 2024 | |
| 2025 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
| 2026 /* | |
| 2027 * Replace a whole area with one character. | |
| 2028 */ | |
| 2029 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2030 op_replace(oparg_T *oap, int c) |
| 7 | 2031 { |
| 2032 int n, numc; | |
| 2033 #ifdef FEAT_MBYTE | |
| 2034 int num_chars; | |
| 2035 #endif | |
| 2036 char_u *newp, *oldp; | |
| 2037 size_t oldlen; | |
| 2038 struct block_def bd; | |
| 5428 | 2039 char_u *after_p = NULL; |
| 2040 int had_ctrl_v_cr = (c == -1 || c == -2); | |
| 7 | 2041 |
| 2042 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
| 2043 return OK; /* nothing to do */ | |
| 2044 | |
| 5428 | 2045 if (had_ctrl_v_cr) |
| 2046 c = (c == -1 ? '\r' : '\n'); | |
| 2047 | |
| 7 | 2048 #ifdef FEAT_MBYTE |
| 2049 if (has_mbyte) | |
| 2050 mb_adjust_opend(oap); | |
| 2051 #endif | |
| 2052 | |
| 2053 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 2054 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 2055 return FAIL; | |
| 2056 | |
| 2057 /* | |
| 2058 * block mode replace | |
| 2059 */ | |
| 2060 if (oap->block_mode) | |
| 2061 { | |
| 2062 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
| 2063 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
| 2064 { | |
| 1982 | 2065 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
| 7 | 2066 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
| 2067 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
| 2068 continue; /* nothing to replace */ | |
| 2069 | |
| 2070 /* n == number of extra chars required | |
| 2071 * If we split a TAB, it may be replaced by several characters. | |
| 2072 * Thus the number of characters may increase! | |
| 2073 */ | |
| 2074 #ifdef FEAT_VIRTUALEDIT | |
| 2075 /* If the range starts in virtual space, count the initial | |
| 2076 * coladd offset as part of "startspaces" */ | |
| 2077 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
| 2078 { | |
| 2079 pos_T vpos; | |
| 2080 | |
| 1982 | 2081 vpos.lnum = curwin->w_cursor.lnum; |
| 7 | 2082 getvpos(&vpos, oap->start_vcol); |
| 2083 bd.startspaces += vpos.coladd; | |
| 2084 n = bd.startspaces; | |
| 2085 } | |
| 2086 else | |
| 2087 #endif | |
| 2088 /* allow for pre spaces */ | |
| 2089 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
| 2090 | |
| 2091 /* allow for post spp */ | |
| 2092 n += (bd.endspaces | |
| 2093 #ifdef FEAT_VIRTUALEDIT | |
| 2094 && !bd.is_oneChar | |
| 2095 #endif | |
| 2096 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
| 2097 /* Figure out how many characters to replace. */ | |
| 2098 numc = oap->end_vcol - oap->start_vcol + 1; | |
| 2099 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
| 2100 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
| 2101 | |
| 2102 #ifdef FEAT_MBYTE | |
| 2103 /* A double-wide character can be replaced only up to half the | |
| 2104 * times. */ | |
| 2105 if ((*mb_char2cells)(c) > 1) | |
| 2106 { | |
| 2107 if ((numc & 1) && !bd.is_short) | |
| 2108 { | |
| 2109 ++bd.endspaces; | |
| 2110 ++n; | |
| 2111 } | |
| 2112 numc = numc / 2; | |
| 2113 } | |
| 2114 | |
| 2115 /* Compute bytes needed, move character count to num_chars. */ | |
| 2116 num_chars = numc; | |
| 2117 numc *= (*mb_char2len)(c); | |
| 2118 #endif | |
| 2119 /* oldlen includes textlen, so don't double count */ | |
| 2120 n += numc - bd.textlen; | |
| 2121 | |
| 2122 oldp = ml_get_curline(); | |
| 2123 oldlen = STRLEN(oldp); | |
| 2124 newp = alloc_check((unsigned)oldlen + 1 + n); | |
| 2125 if (newp == NULL) | |
| 2126 continue; | |
| 2127 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
| 2128 /* copy up to deleted part */ | |
| 2129 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 2130 oldp += bd.textcol + bd.textlen; | |
| 2131 /* insert pre-spaces */ | |
| 6929 | 2132 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
| 7 | 2133 /* insert replacement chars CHECK FOR ALLOCATED SPACE */ |
| 5428 | 2134 /* -1/-2 is used for entering CR literally. */ |
| 2135 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) | |
| 7 | 2136 { |
| 5428 | 2137 #ifdef FEAT_MBYTE |
| 2138 if (has_mbyte) | |
| 2139 { | |
| 2140 n = (int)STRLEN(newp); | |
| 2141 while (--num_chars >= 0) | |
| 2142 n += (*mb_char2bytes)(c, newp + n); | |
| 2143 } | |
| 2144 else | |
| 2145 #endif | |
| 6929 | 2146 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
| 5428 | 2147 if (!bd.is_short) |
| 2148 { | |
| 2149 /* insert post-spaces */ | |
| 6929 | 2150 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
| 5428 | 2151 /* copy the part after the changed part */ |
| 2152 STRMOVE(newp + STRLEN(newp), oldp); | |
| 2153 } | |
| 7 | 2154 } |
| 2155 else | |
| 2156 { | |
| 5428 | 2157 /* Replacing with \r or \n means splitting the line. */ |
| 5475 | 2158 after_p = alloc_check( |
| 2159 (unsigned)(oldlen + 1 + n - STRLEN(newp))); | |
| 5428 | 2160 if (after_p != NULL) |
| 2161 STRMOVE(after_p, oldp); | |
| 7 | 2162 } |
| 2163 /* replace the line */ | |
| 2164 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 5428 | 2165 if (after_p != NULL) |
| 2166 { | |
| 2167 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
| 2168 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
| 2169 oap->end.lnum++; | |
| 2170 vim_free(after_p); | |
| 2171 } | |
| 7 | 2172 } |
| 2173 } | |
| 2174 else | |
| 2175 { | |
| 2176 /* | |
| 2177 * MCHAR and MLINE motion replace. | |
| 2178 */ | |
| 2179 if (oap->motion_type == MLINE) | |
| 2180 { | |
| 2181 oap->start.col = 0; | |
| 2182 curwin->w_cursor.col = 0; | |
| 2183 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
| 2184 if (oap->end.col) | |
| 2185 --oap->end.col; | |
| 2186 } | |
| 2187 else if (!oap->inclusive) | |
| 2188 dec(&(oap->end)); | |
| 2189 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2190 while (LTOREQ_POS(curwin->w_cursor, oap->end)) |
| 7 | 2191 { |
| 2192 n = gchar_cursor(); | |
| 2193 if (n != NUL) | |
| 2194 { | |
| 2195 #ifdef FEAT_MBYTE | |
| 2196 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
| 2197 { | |
| 2198 /* This is slow, but it handles replacing a single-byte | |
| 2199 * with a multi-byte and the other way around. */ | |
| 4203 | 2200 if (curwin->w_cursor.lnum == oap->end.lnum) |
| 2201 oap->end.col += (*mb_char2len)(c) - (*mb_char2len)(n); | |
| 7 | 2202 n = State; |
| 2203 State = REPLACE; | |
| 2204 ins_char(c); | |
| 2205 State = n; | |
| 2206 /* Backup to the replaced character. */ | |
| 2207 dec_cursor(); | |
| 2208 } | |
| 2209 else | |
| 2210 #endif | |
| 2211 { | |
| 2212 #ifdef FEAT_VIRTUALEDIT | |
| 2213 if (n == TAB) | |
| 2214 { | |
| 2215 int end_vcol = 0; | |
| 2216 | |
| 2217 if (curwin->w_cursor.lnum == oap->end.lnum) | |
| 2218 { | |
| 2219 /* oap->end has to be recalculated when | |
| 2220 * the tab breaks */ | |
| 2221 end_vcol = getviscol2(oap->end.col, | |
| 2222 oap->end.coladd); | |
| 2223 } | |
| 2224 coladvance_force(getviscol()); | |
| 2225 if (curwin->w_cursor.lnum == oap->end.lnum) | |
| 2226 getvpos(&oap->end, end_vcol); | |
| 2227 } | |
| 2228 #endif | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2229 PCHAR(curwin->w_cursor, c); |
| 7 | 2230 } |
| 2231 } | |
| 2232 #ifdef FEAT_VIRTUALEDIT | |
| 2233 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
| 2234 { | |
| 2235 int virtcols = oap->end.coladd; | |
| 2236 | |
| 2237 if (curwin->w_cursor.lnum == oap->start.lnum | |
| 2238 && oap->start.col == oap->end.col && oap->start.coladd) | |
| 2239 virtcols -= oap->start.coladd; | |
| 2240 | |
| 2241 /* oap->end has been trimmed so it's effectively inclusive; | |
| 2242 * as a result an extra +1 must be counted so we don't | |
| 2243 * trample the NUL byte. */ | |
| 2244 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
| 2245 curwin->w_cursor.col -= (virtcols + 1); | |
| 2246 for (; virtcols >= 0; virtcols--) | |
| 2247 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2248 PCHAR(curwin->w_cursor, c); |
| 7 | 2249 if (inc(&curwin->w_cursor) == -1) |
| 2250 break; | |
| 2251 } | |
| 2252 } | |
| 2253 #endif | |
| 2254 | |
| 2255 /* Advance to next character, stop at the end of the file. */ | |
| 2256 if (inc_cursor() == -1) | |
| 2257 break; | |
| 2258 } | |
| 2259 } | |
| 2260 | |
| 2261 curwin->w_cursor = oap->start; | |
| 2262 check_cursor(); | |
| 2263 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
| 2264 | |
| 2265 /* Set "'[" and "']" marks. */ | |
| 2266 curbuf->b_op_start = oap->start; | |
| 2267 curbuf->b_op_end = oap->end; | |
| 2268 | |
| 2269 return OK; | |
| 2270 } | |
| 2271 #endif | |
| 2272 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2273 static int swapchars(int op_type, pos_T *pos, int length); |
| 1525 | 2274 |
| 7 | 2275 /* |
| 2276 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
| 2277 */ | |
| 2278 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2279 op_tilde(oparg_T *oap) |
| 7 | 2280 { |
| 2281 pos_T pos; | |
| 2282 struct block_def bd; | |
| 1528 | 2283 int did_change = FALSE; |
| 7 | 2284 |
| 2285 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 2286 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 2287 return; | |
| 2288 | |
| 2289 pos = oap->start; | |
| 2290 if (oap->block_mode) /* Visual block mode */ | |
| 2291 { | |
| 2292 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
| 2293 { | |
| 1766 | 2294 int one_change; |
| 2295 | |
| 7 | 2296 block_prep(oap, &bd, pos.lnum, FALSE); |
| 2297 pos.col = bd.textcol; | |
| 1766 | 2298 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
| 2299 did_change |= one_change; | |
| 1525 | 2300 |
| 5735 | 2301 #ifdef FEAT_NETBEANS_INTG |
| 2210 | 2302 if (netbeans_active() && one_change) |
| 7 | 2303 { |
| 2304 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 2305 | |
| 33 | 2306 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
| 2307 (long)bd.textlen); | |
| 7 | 2308 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
| 2210 | 2309 &ptr[bd.textcol], bd.textlen); |
| 7 | 2310 } |
| 5735 | 2311 #endif |
| 7 | 2312 } |
| 2313 if (did_change) | |
| 2314 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
| 2315 } | |
| 2316 else /* not block mode */ | |
| 2317 { | |
| 2318 if (oap->motion_type == MLINE) | |
| 2319 { | |
| 2320 oap->start.col = 0; | |
| 2321 pos.col = 0; | |
| 2322 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
| 2323 if (oap->end.col) | |
| 2324 --oap->end.col; | |
| 2325 } | |
| 2326 else if (!oap->inclusive) | |
| 2327 dec(&(oap->end)); | |
| 2328 | |
| 1528 | 2329 if (pos.lnum == oap->end.lnum) |
| 2330 did_change = swapchars(oap->op_type, &pos, | |
| 2331 oap->end.col - pos.col + 1); | |
| 2332 else | |
| 2333 for (;;) | |
| 2334 { | |
| 2335 did_change |= swapchars(oap->op_type, &pos, | |
| 2336 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
| 2337 (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
|
2338 if (LTOREQ_POS(oap->end, pos) || inc(&pos) == -1) |
| 1528 | 2339 break; |
| 2340 } | |
| 7 | 2341 if (did_change) |
| 2342 { | |
| 2343 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
| 2344 0L); | |
| 2345 #ifdef FEAT_NETBEANS_INTG | |
| 2210 | 2346 if (netbeans_active() && did_change) |
| 7 | 2347 { |
| 2348 char_u *ptr; | |
| 2349 int count; | |
| 2350 | |
| 2351 pos = oap->start; | |
| 2352 while (pos.lnum < oap->end.lnum) | |
| 2353 { | |
| 2354 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 835 | 2355 count = (int)STRLEN(ptr) - pos.col; |
| 33 | 2356 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
| 7 | 2357 netbeans_inserted(curbuf, pos.lnum, pos.col, |
| 2210 | 2358 &ptr[pos.col], count); |
| 7 | 2359 pos.col = 0; |
| 2360 pos.lnum++; | |
| 2361 } | |
| 2362 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 2363 count = oap->end.col - pos.col + 1; | |
| 33 | 2364 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
| 7 | 2365 netbeans_inserted(curbuf, pos.lnum, pos.col, |
| 2210 | 2366 &ptr[pos.col], count); |
| 7 | 2367 } |
| 2368 #endif | |
| 2369 } | |
| 2370 } | |
| 2371 | |
| 2372 if (!did_change && oap->is_VIsual) | |
| 2373 /* No change: need to remove the Visual selection */ | |
| 2374 redraw_curbuf_later(INVERTED); | |
| 2375 | |
| 2376 /* | |
| 2377 * Set '[ and '] marks. | |
| 2378 */ | |
| 2379 curbuf->b_op_start = oap->start; | |
| 2380 curbuf->b_op_end = oap->end; | |
| 2381 | |
| 2382 if (oap->line_count > p_report) | |
| 2383 { | |
| 2384 if (oap->line_count == 1) | |
| 2385 MSG(_("1 line changed")); | |
| 2386 else | |
| 2387 smsg((char_u *)_("%ld lines changed"), oap->line_count); | |
| 2388 } | |
| 2389 } | |
| 2390 | |
| 2391 /* | |
| 1525 | 2392 * Invoke swapchar() on "length" bytes at position "pos". |
| 2393 * "pos" is advanced to just after the changed characters. | |
| 2394 * "length" is rounded up to include the whole last multi-byte character. | |
| 2395 * Also works correctly when the number of bytes changes. | |
| 2396 * Returns TRUE if some character was changed. | |
| 2397 */ | |
| 2398 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2399 swapchars(int op_type, pos_T *pos, int length) |
| 1525 | 2400 { |
| 2401 int todo; | |
| 2402 int did_change = 0; | |
| 2403 | |
| 2404 for (todo = length; todo > 0; --todo) | |
| 2405 { | |
| 2406 # ifdef FEAT_MBYTE | |
| 2407 if (has_mbyte) | |
|
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2408 { |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2409 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2410 |
| 1525 | 2411 /* we're counting bytes, not characters */ |
|
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2412 if (len > 0) |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2413 todo -= len - 1; |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2414 } |
| 1525 | 2415 # endif |
| 2416 did_change |= swapchar(op_type, pos); | |
| 2417 if (inc(pos) == -1) /* at end of file */ | |
| 2418 break; | |
| 2419 } | |
| 2420 return did_change; | |
| 2421 } | |
| 2422 | |
| 2423 /* | |
| 7 | 2424 * If op_type == OP_UPPER: make uppercase, |
| 2425 * if op_type == OP_LOWER: make lowercase, | |
| 2426 * if op_type == OP_ROT13: do rot13 encoding, | |
| 2427 * else swap case of character at 'pos' | |
| 2428 * returns TRUE when something actually changed. | |
| 2429 */ | |
| 2430 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2431 swapchar(int op_type, pos_T *pos) |
| 7 | 2432 { |
| 2433 int c; | |
| 2434 int nc; | |
| 2435 | |
| 2436 c = gchar_pos(pos); | |
| 2437 | |
| 2438 /* Only do rot13 encoding for ASCII characters. */ | |
| 2439 if (c >= 0x80 && op_type == OP_ROT13) | |
| 2440 return FALSE; | |
| 2441 | |
| 2442 #ifdef FEAT_MBYTE | |
| 1525 | 2443 if (op_type == OP_UPPER && c == 0xdf |
| 2444 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
| 493 | 2445 { |
| 2446 pos_T sp = curwin->w_cursor; | |
| 2447 | |
| 2448 /* Special handling of German sharp s: change to "SS". */ | |
| 2449 curwin->w_cursor = *pos; | |
| 2450 del_char(FALSE); | |
| 2451 ins_char('S'); | |
| 2452 ins_char('S'); | |
| 2453 curwin->w_cursor = sp; | |
| 2454 inc(pos); | |
| 2455 } | |
| 2456 | |
| 7 | 2457 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
| 2458 return FALSE; | |
| 2459 #endif | |
| 2460 nc = c; | |
| 2461 if (MB_ISLOWER(c)) | |
| 2462 { | |
| 2463 if (op_type == OP_ROT13) | |
| 2464 nc = ROT13(c, 'a'); | |
| 2465 else if (op_type != OP_LOWER) | |
| 2466 nc = MB_TOUPPER(c); | |
| 2467 } | |
| 2468 else if (MB_ISUPPER(c)) | |
| 2469 { | |
| 2470 if (op_type == OP_ROT13) | |
| 2471 nc = ROT13(c, 'A'); | |
| 2472 else if (op_type != OP_UPPER) | |
| 2473 nc = MB_TOLOWER(c); | |
| 2474 } | |
| 2475 if (nc != c) | |
| 2476 { | |
| 2477 #ifdef FEAT_MBYTE | |
| 2478 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
| 2479 { | |
| 2480 pos_T sp = curwin->w_cursor; | |
| 2481 | |
| 2482 curwin->w_cursor = *pos; | |
|
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2483 /* 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
|
2484 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
| 7 | 2485 ins_char(nc); |
| 2486 curwin->w_cursor = sp; | |
| 2487 } | |
| 2488 else | |
| 2489 #endif | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2490 PCHAR(*pos, nc); |
| 7 | 2491 return TRUE; |
| 2492 } | |
| 2493 return FALSE; | |
| 2494 } | |
| 2495 | |
| 2496 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
| 2497 /* | |
| 2498 * op_insert - Insert and append operators for Visual mode. | |
| 2499 */ | |
| 2500 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2501 op_insert(oparg_T *oap, long count1) |
| 7 | 2502 { |
| 2503 long ins_len, pre_textlen = 0; | |
| 2504 char_u *firstline, *ins_text; | |
| 2505 struct block_def bd; | |
| 2506 int i; | |
| 6579 | 2507 pos_T t1; |
| 7 | 2508 |
| 2509 /* edit() changes this - record it for OP_APPEND */ | |
| 2510 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
| 2511 | |
| 2512 /* vis block is still marked. Get rid of it now. */ | |
| 2513 curwin->w_cursor.lnum = oap->start.lnum; | |
| 2514 update_screen(INVERTED); | |
| 2515 | |
| 2516 if (oap->block_mode) | |
| 2517 { | |
| 2518 #ifdef FEAT_VIRTUALEDIT | |
| 2519 /* When 'virtualedit' is used, need to insert the extra spaces before | |
| 2520 * doing block_prep(). When only "block" is used, virtual edit is | |
| 2521 * already disabled, but still need it when calling | |
| 2522 * coladvance_force(). */ | |
| 2523 if (curwin->w_cursor.coladd > 0) | |
| 2524 { | |
| 2525 int old_ve_flags = ve_flags; | |
| 2526 | |
| 2527 ve_flags = VE_ALL; | |
| 2528 if (u_save_cursor() == FAIL) | |
| 2529 return; | |
| 2530 coladvance_force(oap->op_type == OP_APPEND | |
| 2531 ? oap->end_vcol + 1 : getviscol()); | |
| 2532 if (oap->op_type == OP_APPEND) | |
| 2533 --curwin->w_cursor.col; | |
| 2534 ve_flags = old_ve_flags; | |
| 2535 } | |
| 2536 #endif | |
| 2537 /* Get the info about the block before entering the text */ | |
| 2538 block_prep(oap, &bd, oap->start.lnum, TRUE); | |
| 2539 firstline = ml_get(oap->start.lnum) + bd.textcol; | |
| 2540 if (oap->op_type == OP_APPEND) | |
| 2541 firstline += bd.textlen; | |
| 2542 pre_textlen = (long)STRLEN(firstline); | |
| 2543 } | |
| 2544 | |
| 2545 if (oap->op_type == OP_APPEND) | |
| 2546 { | |
| 2547 if (oap->block_mode | |
| 2548 #ifdef FEAT_VIRTUALEDIT | |
| 2549 && curwin->w_cursor.coladd == 0 | |
| 2550 #endif | |
| 2551 ) | |
| 2552 { | |
| 2553 /* Move the cursor to the character right of the block. */ | |
| 2554 curwin->w_set_curswant = TRUE; | |
| 2555 while (*ml_get_cursor() != NUL | |
| 2556 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
| 2557 ++curwin->w_cursor.col; | |
| 2558 if (bd.is_short && !bd.is_MAX) | |
| 2559 { | |
| 2560 /* First line was too short, make it longer and adjust the | |
| 2561 * values in "bd". */ | |
| 2562 if (u_save_cursor() == FAIL) | |
| 2563 return; | |
| 2564 for (i = 0; i < bd.endspaces; ++i) | |
| 2565 ins_char(' '); | |
| 2566 bd.textlen += bd.endspaces; | |
| 2567 } | |
| 2568 } | |
| 2569 else | |
| 2570 { | |
| 2571 curwin->w_cursor = oap->end; | |
| 893 | 2572 check_cursor_col(); |
| 7 | 2573 |
| 2574 /* 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
|
2575 if (!LINEEMPTY(curwin->w_cursor.lnum) |
| 7 | 2576 && oap->start_vcol != oap->end_vcol) |
| 2577 inc_cursor(); | |
| 2578 } | |
| 2579 } | |
| 2580 | |
| 6579 | 2581 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
|
2582 (void)edit(NUL, FALSE, (linenr_T)count1); |
| 7 | 2583 |
| 6579 | 2584 /* When a tab was inserted, and the characters in front of the tab |
| 2585 * have been converted to a tab as well, the column of the cursor | |
| 2586 * might have actually been reduced, so need to adjust here. */ | |
| 2587 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
|
2588 && LT_POS(curbuf->b_op_start_orig, t1)) |
| 6579 | 2589 oap->start = curbuf->b_op_start_orig; |
| 2590 | |
| 1477 | 2591 /* If user has moved off this line, we don't know what to do, so do |
| 2592 * nothing. | |
| 2593 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
| 2594 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
| 7 | 2595 return; |
| 2596 | |
| 2597 if (oap->block_mode) | |
| 2598 { | |
| 2599 struct block_def bd2; | |
| 2600 | |
| 5471 | 2601 /* The user may have moved the cursor before inserting something, try |
| 2602 * to adjust the block for that. */ | |
| 5680 | 2603 if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX) |
| 5471 | 2604 { |
| 2605 if (oap->op_type == OP_INSERT | |
| 5730 | 2606 && oap->start.col |
| 2607 #ifdef FEAT_VIRTUALEDIT | |
| 2608 + oap->start.coladd | |
| 2609 #endif | |
| 2610 != curbuf->b_op_start_orig.col | |
| 2611 #ifdef FEAT_VIRTUALEDIT | |
| 2612 + curbuf->b_op_start_orig.coladd | |
| 2613 #endif | |
| 2614 ) | |
| 5471 | 2615 { |
| 6579 | 2616 int t = getviscol2(curbuf->b_op_start_orig.col, |
| 2617 curbuf->b_op_start_orig.coladd); | |
| 5680 | 2618 oap->start.col = curbuf->b_op_start_orig.col; |
| 6579 | 2619 pre_textlen -= t - oap->start_vcol; |
| 2620 oap->start_vcol = t; | |
| 5471 | 2621 } |
| 2622 else if (oap->op_type == OP_APPEND | |
| 5730 | 2623 && oap->end.col |
| 2624 #ifdef FEAT_VIRTUALEDIT | |
| 2625 + oap->end.coladd | |
| 2626 #endif | |
| 2627 >= curbuf->b_op_start_orig.col | |
| 2628 #ifdef FEAT_VIRTUALEDIT | |
| 2629 + curbuf->b_op_start_orig.coladd | |
| 2630 #endif | |
| 2631 ) | |
| 5471 | 2632 { |
| 6579 | 2633 int t = getviscol2(curbuf->b_op_start_orig.col, |
| 2634 curbuf->b_op_start_orig.coladd); | |
| 5680 | 2635 oap->start.col = curbuf->b_op_start_orig.col; |
| 5471 | 2636 /* reset pre_textlen to the value of OP_INSERT */ |
| 2637 pre_textlen += bd.textlen; | |
| 6579 | 2638 pre_textlen -= t - oap->start_vcol; |
| 2639 oap->start_vcol = t; | |
| 5471 | 2640 oap->op_type = OP_INSERT; |
| 2641 } | |
| 2642 } | |
| 2643 | |
| 7 | 2644 /* |
| 2645 * Spaces and tabs in the indent may have changed to other spaces and | |
| 1392 | 2646 * tabs. Get the starting column again and correct the length. |
| 7 | 2647 * Don't do this when "$" used, end-of-line will have changed. |
| 2648 */ | |
| 2649 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
| 2650 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
| 2651 { | |
| 2652 if (oap->op_type == OP_APPEND) | |
| 2653 { | |
| 2654 pre_textlen += bd2.textlen - bd.textlen; | |
| 2655 if (bd2.endspaces) | |
| 2656 --bd2.textlen; | |
| 2657 } | |
| 2658 bd.textcol = bd2.textcol; | |
| 2659 bd.textlen = bd2.textlen; | |
| 2660 } | |
| 2661 | |
| 2662 /* | |
| 2663 * Subsequent calls to ml_get() flush the firstline data - take a | |
| 2664 * copy of the required string. | |
| 2665 */ | |
| 2666 firstline = ml_get(oap->start.lnum) + bd.textcol; | |
| 2667 if (oap->op_type == OP_APPEND) | |
| 2668 firstline += bd.textlen; | |
| 3421 | 2669 if (pre_textlen >= 0 |
| 2670 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
| 7 | 2671 { |
| 2672 ins_text = vim_strnsave(firstline, (int)ins_len); | |
| 2673 if (ins_text != NULL) | |
| 2674 { | |
| 2675 /* block handled here */ | |
| 2676 if (u_save(oap->start.lnum, | |
| 2677 (linenr_T)(oap->end.lnum + 1)) == OK) | |
| 2678 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
| 2679 &bd); | |
| 2680 | |
| 2681 curwin->w_cursor.col = oap->start.col; | |
| 2682 check_cursor(); | |
| 2683 vim_free(ins_text); | |
| 2684 } | |
| 2685 } | |
| 2686 } | |
| 2687 } | |
| 2688 #endif | |
| 2689 | |
| 2690 /* | |
| 2691 * op_change - handle a change operation | |
| 2692 * | |
| 2693 * return TRUE if edit() returns because of a CTRL-O command | |
| 2694 */ | |
| 2695 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2696 op_change(oparg_T *oap) |
| 7 | 2697 { |
| 2698 colnr_T l; | |
| 2699 int retval; | |
| 2700 #ifdef FEAT_VISUALEXTRA | |
| 2701 long offset; | |
| 2702 linenr_T linenr; | |
| 1392 | 2703 long ins_len; |
| 2704 long pre_textlen = 0; | |
| 2705 long pre_indent = 0; | |
| 7 | 2706 char_u *firstline; |
| 2707 char_u *ins_text, *newp, *oldp; | |
| 2708 struct block_def bd; | |
| 2709 #endif | |
| 2710 | |
| 2711 l = oap->start.col; | |
| 2712 if (oap->motion_type == MLINE) | |
| 2713 { | |
| 2714 l = 0; | |
| 2715 #ifdef FEAT_SMARTINDENT | |
| 2716 if (!p_paste && curbuf->b_p_si | |
| 2717 # ifdef FEAT_CINDENT | |
| 2718 && !curbuf->b_p_cin | |
| 2719 # endif | |
| 2720 ) | |
| 2721 can_si = TRUE; /* It's like opening a new line, do si */ | |
| 2722 #endif | |
| 2723 } | |
| 2724 | |
| 2725 /* First delete the text in the region. In an empty buffer only need to | |
| 2726 * save for undo */ | |
| 2727 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
| 2728 { | |
| 2729 if (u_save_cursor() == FAIL) | |
| 2730 return FALSE; | |
| 2731 } | |
| 2732 else if (op_delete(oap) == FAIL) | |
| 2733 return FALSE; | |
| 2734 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2735 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum) |
| 7 | 2736 && !virtual_op) |
| 2737 inc_cursor(); | |
| 2738 | |
| 2739 #ifdef FEAT_VISUALEXTRA | |
| 2740 /* check for still on same line (<CR> in inserted text meaningless) */ | |
| 2741 /* skip blank lines too */ | |
| 2742 if (oap->block_mode) | |
| 2743 { | |
| 2744 # ifdef FEAT_VIRTUALEDIT | |
| 2745 /* Add spaces before getting the current line length. */ | |
| 2746 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
| 2747 || gchar_cursor() == NUL)) | |
| 2748 coladvance_force(getviscol()); | |
| 2749 # endif | |
| 1392 | 2750 firstline = ml_get(oap->start.lnum); |
| 2751 pre_textlen = (long)STRLEN(firstline); | |
| 2752 pre_indent = (long)(skipwhite(firstline) - firstline); | |
| 7 | 2753 bd.textcol = curwin->w_cursor.col; |
| 2754 } | |
| 2755 #endif | |
| 2756 | |
| 2757 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
| 2758 if (oap->motion_type == MLINE) | |
| 2759 fix_indent(); | |
| 2760 #endif | |
| 2761 | |
| 2762 retval = edit(NUL, FALSE, (linenr_T)1); | |
| 2763 | |
| 2764 #ifdef FEAT_VISUALEXTRA | |
| 2765 /* | |
| 39 | 2766 * In Visual block mode, handle copying the new text to all lines of the |
| 7 | 2767 * block. |
| 1477 | 2768 * Don't repeat the insert when Insert mode ended with CTRL-C. |
| 7 | 2769 */ |
| 1477 | 2770 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
| 7 | 2771 { |
| 1392 | 2772 /* Auto-indenting may have changed the indent. If the cursor was past |
| 2773 * the indent, exclude that indent change from the inserted text. */ | |
| 7 | 2774 firstline = ml_get(oap->start.lnum); |
| 1403 | 2775 if (bd.textcol > (colnr_T)pre_indent) |
| 7 | 2776 { |
| 1392 | 2777 long new_indent = (long)(skipwhite(firstline) - firstline); |
| 2778 | |
| 2779 pre_textlen += new_indent - pre_indent; | |
| 2780 bd.textcol += new_indent - pre_indent; | |
| 2781 } | |
| 2782 | |
| 2783 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
| 2784 if (ins_len > 0) | |
| 2785 { | |
| 2786 /* Subsequent calls to ml_get() flush the firstline data - take a | |
| 2787 * copy of the inserted text. */ | |
| 7 | 2788 if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL) |
| 2789 { | |
| 419 | 2790 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
| 7 | 2791 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
| 2792 linenr++) | |
| 2793 { | |
| 2794 block_prep(oap, &bd, linenr, TRUE); | |
| 2795 if (!bd.is_short || virtual_op) | |
| 2796 { | |
| 2797 # ifdef FEAT_VIRTUALEDIT | |
| 2798 pos_T vpos; | |
| 2799 | |
| 2800 /* If the block starts in virtual space, count the | |
| 2801 * initial coladd offset as part of "startspaces" */ | |
| 2802 if (bd.is_short) | |
| 2803 { | |
| 1982 | 2804 vpos.lnum = linenr; |
| 7 | 2805 (void)getvpos(&vpos, oap->start_vcol); |
| 2806 } | |
| 2807 else | |
| 2808 vpos.coladd = 0; | |
| 2809 # endif | |
| 2810 oldp = ml_get(linenr); | |
| 2811 newp = alloc_check((unsigned)(STRLEN(oldp) | |
| 2812 # ifdef FEAT_VIRTUALEDIT | |
| 2813 + vpos.coladd | |
| 2814 # endif | |
| 2815 + ins_len + 1)); | |
| 2816 if (newp == NULL) | |
| 2817 continue; | |
| 2818 /* copy up to block start */ | |
| 2819 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 2820 offset = bd.textcol; | |
| 2821 # ifdef FEAT_VIRTUALEDIT | |
| 6929 | 2822 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
| 7 | 2823 offset += vpos.coladd; |
| 2824 # endif | |
| 2825 mch_memmove(newp + offset, ins_text, (size_t)ins_len); | |
| 2826 offset += ins_len; | |
| 2827 oldp += bd.textcol; | |
| 1622 | 2828 STRMOVE(newp + offset, oldp); |
| 7 | 2829 ml_replace(linenr, newp, FALSE); |
| 2830 } | |
| 2831 } | |
| 2832 check_cursor(); | |
| 2833 | |
| 2834 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
| 2835 } | |
| 2836 vim_free(ins_text); | |
| 2837 } | |
| 2838 } | |
| 2839 #endif | |
| 2840 | |
| 2841 return retval; | |
| 2842 } | |
| 2843 | |
| 2844 /* | |
| 2845 * set all the yank registers to empty (called from main()) | |
| 2846 */ | |
| 2847 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2848 init_yank(void) |
| 7 | 2849 { |
| 2850 int i; | |
| 2851 | |
| 2852 for (i = 0; i < NUM_REGISTERS; ++i) | |
| 2853 y_regs[i].y_array = NULL; | |
| 2854 } | |
| 2855 | |
| 356 | 2856 #if defined(EXITFREE) || defined(PROTO) |
| 2857 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2858 clear_registers(void) |
| 356 | 2859 { |
| 2860 int i; | |
| 2861 | |
| 2862 for (i = 0; i < NUM_REGISTERS; ++i) | |
| 2863 { | |
| 2864 y_current = &y_regs[i]; | |
| 2865 if (y_current->y_array != NULL) | |
| 2866 free_yank_all(); | |
| 2867 } | |
| 2868 } | |
| 2869 #endif | |
| 2870 | |
| 7 | 2871 /* |
| 2872 * Free "n" lines from the current yank register. | |
| 2873 * Called for normal freeing and in case of error. | |
| 2874 */ | |
| 2875 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2876 free_yank(long n) |
| 7 | 2877 { |
| 2878 if (y_current->y_array != NULL) | |
| 2879 { | |
| 2880 long i; | |
| 2881 | |
| 2882 for (i = n; --i >= 0; ) | |
| 2883 { | |
| 2884 #ifdef AMIGA /* only for very slow machines */ | |
| 2885 if ((i & 1023) == 1023) /* this may take a while */ | |
| 2886 { | |
| 2887 /* | |
| 2888 * This message should never cause a hit-return message. | |
| 2889 * Overwrite this message with any next message. | |
| 2890 */ | |
| 2891 ++no_wait_return; | |
| 2892 smsg((char_u *)_("freeing %ld lines"), i + 1); | |
| 2893 --no_wait_return; | |
| 2894 msg_didout = FALSE; | |
| 2895 msg_col = 0; | |
| 2896 } | |
| 2897 #endif | |
| 2898 vim_free(y_current->y_array[i]); | |
| 2899 } | |
| 2900 vim_free(y_current->y_array); | |
| 2901 y_current->y_array = NULL; | |
| 2902 #ifdef AMIGA | |
| 2903 if (n >= 1000) | |
| 2904 MSG(""); | |
| 2905 #endif | |
| 2906 } | |
| 2907 } | |
| 2908 | |
| 2909 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2910 free_yank_all(void) |
| 7 | 2911 { |
| 2912 free_yank(y_current->y_size); | |
| 2913 } | |
| 2914 | |
| 2915 /* | |
| 2916 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
| 2917 * If we are to append (uppercase register), we first yank into a new yank | |
| 2918 * register and then concatenate the old and the new one (so we keep the old | |
| 2919 * one in case of out-of-memory). | |
| 2920 * | |
|
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
2921 * Return FAIL for failure, OK otherwise. |
| 7 | 2922 */ |
| 2923 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2924 op_yank(oparg_T *oap, int deleting, int mess) |
| 7 | 2925 { |
| 2926 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
|
2927 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
|
2928 yankreg_T newreg; /* new yank register when appending */ |
| 7 | 2929 char_u **new_ptr; |
| 2930 linenr_T lnum; /* current line number */ | |
| 2931 long j; | |
| 2932 int yanktype = oap->motion_type; | |
| 2933 long yanklines = oap->line_count; | |
| 2934 linenr_T yankendlnum = oap->end.lnum; | |
| 2935 char_u *p; | |
| 2936 char_u *pnew; | |
| 2937 struct block_def bd; | |
| 2658 | 2938 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
| 2654 | 2939 int did_star = FALSE; |
| 2658 | 2940 #endif |
| 7 | 2941 |
| 2942 /* check for read-only register */ | |
| 2943 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
| 2944 { | |
| 2945 beep_flush(); | |
| 2946 return FAIL; | |
| 2947 } | |
| 2948 if (oap->regname == '_') /* black hole: nothing to do */ | |
| 2949 return OK; | |
| 2950 | |
| 2951 #ifdef FEAT_CLIPBOARD | |
| 2952 if (!clip_star.available && oap->regname == '*') | |
| 2953 oap->regname = 0; | |
| 2954 else if (!clip_plus.available && oap->regname == '+') | |
| 2955 oap->regname = 0; | |
| 2956 #endif | |
| 2957 | |
| 2958 if (!deleting) /* op_delete() already set y_current */ | |
| 2959 get_yank_register(oap->regname, TRUE); | |
| 2960 | |
| 2961 curr = y_current; | |
| 2962 /* append to existing contents */ | |
| 2963 if (y_append && y_current->y_array != NULL) | |
| 2964 y_current = &newreg; | |
| 2965 else | |
| 2966 free_yank_all(); /* free previously yanked lines */ | |
| 2967 | |
| 593 | 2968 /* |
| 2969 * If the cursor was in column 1 before and after the movement, and the | |
| 2970 * operator is not inclusive, the yank is always linewise. | |
| 2971 */ | |
| 7 | 2972 if ( oap->motion_type == MCHAR |
| 2973 && oap->start.col == 0 | |
| 2974 && !oap->inclusive | |
| 2975 && (!oap->is_VIsual || *p_sel == 'o') | |
| 50 | 2976 && !oap->block_mode |
| 7 | 2977 && oap->end.col == 0 |
| 2978 && yanklines > 1) | |
| 2979 { | |
| 2980 yanktype = MLINE; | |
| 2981 --yankendlnum; | |
| 2982 --yanklines; | |
| 2983 } | |
| 2984 | |
| 2985 y_current->y_size = yanklines; | |
| 2986 y_current->y_type = yanktype; /* set the yank register type */ | |
| 2987 y_current->y_width = 0; | |
| 2988 y_current->y_array = (char_u **)lalloc_clear((long_u)(sizeof(char_u *) * | |
| 2989 yanklines), TRUE); | |
| 2990 if (y_current->y_array == NULL) | |
| 2991 { | |
| 2992 y_current = curr; | |
| 2993 return FAIL; | |
| 2994 } | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
2995 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
2996 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
|
2997 #endif |
| 7 | 2998 |
| 2999 y_idx = 0; | |
| 3000 lnum = oap->start.lnum; | |
| 3001 | |
| 3002 if (oap->block_mode) | |
| 3003 { | |
| 3004 /* Visual block mode */ | |
| 3005 y_current->y_type = MBLOCK; /* set the yank register type */ | |
| 3006 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
| 3007 | |
| 3008 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
| 3009 y_current->y_width--; | |
| 3010 } | |
| 3011 | |
| 3012 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
| 3013 { | |
| 3014 switch (y_current->y_type) | |
| 3015 { | |
| 3016 case MBLOCK: | |
| 3017 block_prep(oap, &bd, lnum, FALSE); | |
| 3018 if (yank_copy_line(&bd, y_idx) == FAIL) | |
| 3019 goto fail; | |
| 3020 break; | |
| 3021 | |
| 3022 case MLINE: | |
| 3023 if ((y_current->y_array[y_idx] = | |
| 3024 vim_strsave(ml_get(lnum))) == NULL) | |
| 3025 goto fail; | |
| 3026 break; | |
| 3027 | |
| 3028 case MCHAR: | |
| 3029 { | |
| 3030 colnr_T startcol = 0, endcol = MAXCOL; | |
| 3031 #ifdef FEAT_VIRTUALEDIT | |
| 3032 int is_oneChar = FALSE; | |
| 3033 colnr_T cs, ce; | |
| 3034 #endif | |
| 3035 p = ml_get(lnum); | |
| 3036 bd.startspaces = 0; | |
| 3037 bd.endspaces = 0; | |
| 3038 | |
| 3039 if (lnum == oap->start.lnum) | |
| 3040 { | |
| 3041 startcol = oap->start.col; | |
| 3042 #ifdef FEAT_VIRTUALEDIT | |
| 3043 if (virtual_op) | |
| 3044 { | |
| 3045 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
| 3046 if (ce != cs && oap->start.coladd > 0) | |
| 3047 { | |
| 3048 /* Part of a tab selected -- but don't | |
| 3049 * double-count it. */ | |
| 3050 bd.startspaces = (ce - cs + 1) | |
| 3051 - oap->start.coladd; | |
| 3052 startcol++; | |
| 3053 } | |
| 3054 } | |
| 3055 #endif | |
| 3056 } | |
| 3057 | |
| 3058 if (lnum == oap->end.lnum) | |
| 3059 { | |
| 3060 endcol = oap->end.col; | |
| 3061 #ifdef FEAT_VIRTUALEDIT | |
| 3062 if (virtual_op) | |
| 3063 { | |
| 3064 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
| 3065 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
| 3066 # ifdef FEAT_MBYTE | |
| 3067 /* Don't add space for double-wide | |
| 3068 * char; endcol will be on last byte | |
| 3069 * of multi-byte char. */ | |
| 3070 && (*mb_head_off)(p, p + endcol) == 0 | |
| 3071 # endif | |
| 3072 )) | |
| 3073 { | |
| 3074 if (oap->start.lnum == oap->end.lnum | |
| 3075 && oap->start.col == oap->end.col) | |
| 3076 { | |
| 3077 /* Special case: inside a single char */ | |
| 3078 is_oneChar = TRUE; | |
| 3079 bd.startspaces = oap->end.coladd | |
| 3080 - oap->start.coladd + oap->inclusive; | |
| 3081 endcol = startcol; | |
| 3082 } | |
| 3083 else | |
| 3084 { | |
| 3085 bd.endspaces = oap->end.coladd | |
| 3086 + oap->inclusive; | |
| 3087 endcol -= oap->inclusive; | |
| 3088 } | |
| 3089 } | |
| 3090 } | |
| 3091 #endif | |
| 3092 } | |
| 3510 | 3093 if (endcol == MAXCOL) |
| 3094 endcol = (colnr_T)STRLEN(p); | |
| 7 | 3095 if (startcol > endcol |
| 3096 #ifdef FEAT_VIRTUALEDIT | |
| 3097 || is_oneChar | |
| 3098 #endif | |
| 3099 ) | |
| 3100 bd.textlen = 0; | |
| 3101 else | |
| 3102 { | |
| 3103 bd.textlen = endcol - startcol + oap->inclusive; | |
| 3104 } | |
| 3105 bd.textstart = p + startcol; | |
| 3106 if (yank_copy_line(&bd, y_idx) == FAIL) | |
| 3107 goto fail; | |
| 3108 break; | |
| 3109 } | |
| 3110 /* NOTREACHED */ | |
| 3111 } | |
| 3112 } | |
| 3113 | |
| 3114 if (curr != y_current) /* append the new block to the old block */ | |
| 3115 { | |
| 3116 new_ptr = (char_u **)lalloc((long_u)(sizeof(char_u *) * | |
| 3117 (curr->y_size + y_current->y_size)), TRUE); | |
| 3118 if (new_ptr == NULL) | |
| 3119 goto fail; | |
| 3120 for (j = 0; j < curr->y_size; ++j) | |
| 3121 new_ptr[j] = curr->y_array[j]; | |
| 3122 vim_free(curr->y_array); | |
| 3123 curr->y_array = new_ptr; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3124 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3125 curr->y_time_set = vim_time(); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3126 #endif |
| 7 | 3127 |
| 3128 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
| 3129 curr->y_type = MLINE; | |
| 3130 | |
| 164 | 3131 /* Concatenate the last line of the old block with the first line of |
| 3132 * the new block, unless being Vi compatible. */ | |
| 3133 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
| 7 | 3134 { |
| 3135 pnew = lalloc((long_u)(STRLEN(curr->y_array[curr->y_size - 1]) | |
| 3136 + STRLEN(y_current->y_array[0]) + 1), TRUE); | |
| 3137 if (pnew == NULL) | |
| 3138 { | |
| 3139 y_idx = y_current->y_size - 1; | |
| 3140 goto fail; | |
| 3141 } | |
| 3142 STRCPY(pnew, curr->y_array[--j]); | |
| 3143 STRCAT(pnew, y_current->y_array[0]); | |
| 3144 vim_free(curr->y_array[j]); | |
| 3145 vim_free(y_current->y_array[0]); | |
| 3146 curr->y_array[j++] = pnew; | |
| 3147 y_idx = 1; | |
| 3148 } | |
| 3149 else | |
| 3150 y_idx = 0; | |
| 3151 while (y_idx < y_current->y_size) | |
| 3152 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
| 3153 curr->y_size = j; | |
| 3154 vim_free(y_current->y_array); | |
| 3155 y_current = curr; | |
| 3156 } | |
| 5981 | 3157 if (curwin->w_p_rnu) |
| 3158 redraw_later(SOME_VALID); /* cursor moved to start */ | |
| 7 | 3159 if (mess) /* Display message about yank? */ |
| 3160 { | |
| 3161 if (yanktype == MCHAR | |
| 3162 && !oap->block_mode | |
| 3163 && yanklines == 1) | |
| 3164 yanklines = 0; | |
| 3165 /* Some versions of Vi use ">=" here, some don't... */ | |
| 3166 if (yanklines > p_report) | |
| 3167 { | |
| 3168 /* redisplay now, so message is not deleted */ | |
| 3169 update_topline_redraw(); | |
| 3170 if (yanklines == 1) | |
| 205 | 3171 { |
| 3172 if (oap->block_mode) | |
| 3173 MSG(_("block of 1 line yanked")); | |
| 3174 else | |
| 3175 MSG(_("1 line yanked")); | |
| 3176 } | |
| 3177 else if (oap->block_mode) | |
| 3178 smsg((char_u *)_("block of %ld lines yanked"), yanklines); | |
| 7 | 3179 else |
| 3180 smsg((char_u *)_("%ld lines yanked"), yanklines); | |
| 3181 } | |
| 3182 } | |
| 3183 | |
| 3184 /* | |
| 3185 * Set "'[" and "']" marks. | |
| 3186 */ | |
| 3187 curbuf->b_op_start = oap->start; | |
| 3188 curbuf->b_op_end = oap->end; | |
| 5735 | 3189 if (yanktype == MLINE && !oap->block_mode) |
| 36 | 3190 { |
| 3191 curbuf->b_op_start.col = 0; | |
| 3192 curbuf->b_op_end.col = MAXCOL; | |
| 3193 } | |
| 7 | 3194 |
| 3195 #ifdef FEAT_CLIPBOARD | |
| 3196 /* | |
| 3197 * If we were yanking to the '*' register, send result to clipboard. | |
| 3198 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
| 3199 * to the '*' register. | |
| 3200 */ | |
| 3201 if (clip_star.available | |
| 3202 && (curr == &(y_regs[STAR_REGISTER]) | |
| 2654 | 3203 || (!deleting && oap->regname == 0 |
| 6116 | 3204 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
| 7 | 3205 { |
| 3206 if (curr != &(y_regs[STAR_REGISTER])) | |
| 3207 /* Copy the text from register 0 to the clipboard register. */ | |
| 3208 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
| 3209 | |
| 3210 clip_own_selection(&clip_star); | |
| 3211 clip_gen_set_selection(&clip_star); | |
| 2658 | 3212 # ifdef FEAT_X11 |
| 2654 | 3213 did_star = TRUE; |
| 2658 | 3214 # endif |
| 7 | 3215 } |
| 3216 | |
| 3217 # ifdef FEAT_X11 | |
| 3218 /* | |
| 3219 * If we were yanking to the '+' register, send result to selection. | |
| 3220 * Also copy to the '*' register, in case auto-select is off. | |
| 3221 */ | |
| 2654 | 3222 if (clip_plus.available |
| 3223 && (curr == &(y_regs[PLUS_REGISTER]) | |
| 3224 || (!deleting && oap->regname == 0 | |
| 6116 | 3225 && ((clip_unnamed | clip_unnamed_saved) & |
| 3226 CLIP_UNNAMED_PLUS)))) | |
| 7 | 3227 { |
| 2654 | 3228 if (curr != &(y_regs[PLUS_REGISTER])) |
| 3229 /* Copy the text from register 0 to the clipboard register. */ | |
| 3230 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
| 3231 | |
| 7 | 3232 clip_own_selection(&clip_plus); |
| 3233 clip_gen_set_selection(&clip_plus); | |
| 3674 | 3234 if (!clip_isautosel_star() && !did_star |
| 3235 && curr == &(y_regs[PLUS_REGISTER])) | |
| 7 | 3236 { |
| 3237 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
| 3238 clip_own_selection(&clip_star); | |
| 3239 clip_gen_set_selection(&clip_star); | |
| 3240 } | |
| 3241 } | |
| 3242 # endif | |
| 3243 #endif | |
| 3244 | |
| 3245 return OK; | |
| 3246 | |
| 3247 fail: /* free the allocated lines */ | |
| 3248 free_yank(y_idx + 1); | |
| 3249 y_current = curr; | |
| 3250 return FAIL; | |
| 3251 } | |
| 3252 | |
| 3253 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3254 yank_copy_line(struct block_def *bd, long y_idx) |
| 7 | 3255 { |
| 3256 char_u *pnew; | |
| 3257 | |
| 3258 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
| 3259 == NULL) | |
| 3260 return FAIL; | |
| 3261 y_current->y_array[y_idx] = pnew; | |
| 6929 | 3262 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
| 7 | 3263 pnew += bd->startspaces; |
| 3264 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
| 3265 pnew += bd->textlen; | |
| 6929 | 3266 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
| 7 | 3267 pnew += bd->endspaces; |
| 3268 *pnew = NUL; | |
| 3269 return OK; | |
| 3270 } | |
| 3271 | |
| 3272 #ifdef FEAT_CLIPBOARD | |
| 3273 /* | |
| 3274 * Make a copy of the y_current register to register "reg". | |
| 3275 */ | |
| 3276 static void | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3277 copy_yank_reg(yankreg_T *reg) |
| 7 | 3278 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3279 yankreg_T *curr = y_current; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3280 long j; |
| 7 | 3281 |
| 3282 y_current = reg; | |
| 3283 free_yank_all(); | |
| 3284 *y_current = *curr; | |
| 3285 y_current->y_array = (char_u **)lalloc_clear( | |
| 3286 (long_u)(sizeof(char_u *) * y_current->y_size), TRUE); | |
| 3287 if (y_current->y_array == NULL) | |
| 3288 y_current->y_size = 0; | |
| 3289 else | |
| 3290 for (j = 0; j < y_current->y_size; ++j) | |
| 3291 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
| 3292 { | |
| 3293 free_yank(j); | |
| 3294 y_current->y_size = 0; | |
| 3295 break; | |
| 3296 } | |
| 3297 y_current = curr; | |
| 3298 } | |
| 3299 #endif | |
| 3300 | |
| 3301 /* | |
| 140 | 3302 * Put contents of register "regname" into the text. |
| 3303 * Caller must check "regname" to be valid! | |
| 3304 * "flags": PUT_FIXINDENT make indent look nice | |
| 3305 * PUT_CURSEND leave cursor after end of new text | |
| 3306 * PUT_LINE force linewise put (":put") | |
| 7 | 3307 */ |
| 3308 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3309 do_put( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3310 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3311 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
|
3312 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3313 int flags) |
| 7 | 3314 { |
| 3315 char_u *ptr; | |
| 3316 char_u *newp, *oldp; | |
| 3317 int yanklen; | |
| 3318 int totlen = 0; /* init for gcc */ | |
| 3319 linenr_T lnum; | |
| 3320 colnr_T col; | |
| 3321 long i; /* index in y_array[] */ | |
| 3322 int y_type; | |
| 3323 long y_size; | |
| 3324 int oldlen; | |
| 3325 long y_width = 0; | |
| 3326 colnr_T vcol; | |
| 3327 int delcount; | |
| 3328 int incr = 0; | |
| 3329 long j; | |
| 3330 struct block_def bd; | |
| 3331 char_u **y_array = NULL; | |
| 3332 long nr_lines = 0; | |
| 3333 pos_T new_cursor; | |
| 3334 int indent; | |
| 3335 int orig_indent = 0; /* init for gcc */ | |
| 3336 int indent_diff = 0; /* init for gcc */ | |
| 3337 int first_indent = TRUE; | |
| 3338 int lendiff = 0; | |
| 3339 pos_T old_pos; | |
| 3340 char_u *insert_string = NULL; | |
| 3341 int allocated = FALSE; | |
| 3342 long cnt; | |
| 3343 | |
| 3344 #ifdef FEAT_CLIPBOARD | |
| 3345 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
| 3346 adjust_clip_reg(®name); | |
| 3347 (void)may_get_selection(regname); | |
| 3348 #endif | |
| 3349 | |
| 3350 if (flags & PUT_FIXINDENT) | |
| 3351 orig_indent = get_indent(); | |
| 3352 | |
| 3353 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
| 3354 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
| 3355 | |
| 3356 /* | |
| 3357 * Using inserted text works differently, because the register includes | |
| 3358 * special characters (newlines, etc.). | |
| 3359 */ | |
| 3360 if (regname == '.') | |
| 3361 { | |
|
10494
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3362 if (VIsual_active) |
|
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3363 stuffcharReadbuff(VIsual_mode); |
| 7 | 3364 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : |
| 3365 (count == -1 ? 'O' : 'i')), count, FALSE); | |
| 3366 /* Putting the text is done later, so can't really move the cursor to | |
| 3367 * the next character. Use "l" to simulate it. */ | |
| 3368 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
| 3369 stuffcharReadbuff('l'); | |
| 3370 return; | |
| 3371 } | |
| 3372 | |
| 3373 /* | |
| 3374 * For special registers '%' (file name), '#' (alternate file name) and | |
| 3375 * ':' (last command line), etc. we have to create a fake yank register. | |
| 3376 */ | |
| 3377 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
| 3378 { | |
| 3379 if (insert_string == NULL) | |
| 3380 return; | |
| 3381 } | |
| 3382 | |
| 4005 | 3383 #ifdef FEAT_AUTOCMD |
| 3384 /* Autocommands may be executed when saving lines for undo, which may make | |
| 3385 * y_array invalid. Start undo now to avoid that. */ | |
| 3386 u_save(curwin->w_cursor.lnum, curwin->w_cursor.lnum + 1); | |
| 3387 #endif | |
| 3388 | |
| 7 | 3389 if (insert_string != NULL) |
| 3390 { | |
| 3391 y_type = MCHAR; | |
| 3392 #ifdef FEAT_EVAL | |
| 3393 if (regname == '=') | |
| 3394 { | |
| 3395 /* For the = register we need to split the string at NL | |
| 3093 | 3396 * characters. |
| 3397 * Loop twice: count the number of lines and save them. */ | |
| 7 | 3398 for (;;) |
| 3399 { | |
| 3400 y_size = 0; | |
| 3401 ptr = insert_string; | |
| 3402 while (ptr != NULL) | |
| 3403 { | |
| 3404 if (y_array != NULL) | |
| 3405 y_array[y_size] = ptr; | |
| 3406 ++y_size; | |
| 3407 ptr = vim_strchr(ptr, '\n'); | |
| 3408 if (ptr != NULL) | |
| 3409 { | |
| 3410 if (y_array != NULL) | |
| 3411 *ptr = NUL; | |
| 3412 ++ptr; | |
| 3093 | 3413 /* A trailing '\n' makes the register linewise. */ |
| 7 | 3414 if (*ptr == NUL) |
| 3415 { | |
| 3416 y_type = MLINE; | |
| 3417 break; | |
| 3418 } | |
| 3419 } | |
| 3420 } | |
| 3421 if (y_array != NULL) | |
| 3422 break; | |
| 3423 y_array = (char_u **)alloc((unsigned) | |
| 3424 (y_size * sizeof(char_u *))); | |
| 3425 if (y_array == NULL) | |
| 3426 goto end; | |
| 3427 } | |
| 3428 } | |
| 3429 else | |
| 3430 #endif | |
| 3431 { | |
| 3432 y_size = 1; /* use fake one-line yank register */ | |
| 3433 y_array = &insert_string; | |
| 3434 } | |
| 3435 } | |
| 3436 else | |
| 3437 { | |
| 3438 get_yank_register(regname, FALSE); | |
| 3439 | |
| 3440 y_type = y_current->y_type; | |
| 3441 y_width = y_current->y_width; | |
| 3442 y_size = y_current->y_size; | |
| 3443 y_array = y_current->y_array; | |
| 3444 } | |
| 3445 | |
| 3446 if (y_type == MLINE) | |
| 3447 { | |
| 3448 if (flags & PUT_LINE_SPLIT) | |
| 3449 { | |
| 6845 | 3450 char_u *p; |
| 3451 | |
| 7 | 3452 /* "p" or "P" in Visual mode: split the lines to put the text in |
| 3453 * between. */ | |
| 3454 if (u_save_cursor() == FAIL) | |
| 3455 goto end; | |
| 6845 | 3456 p = ml_get_cursor(); |
| 3457 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
|
3458 MB_PTR_ADV(p); |
| 6845 | 3459 ptr = vim_strsave(p); |
| 7 | 3460 if (ptr == NULL) |
| 3461 goto end; | |
| 3462 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
| 3463 vim_free(ptr); | |
| 3464 | |
| 6845 | 3465 oldp = ml_get_curline(); |
| 3466 p = oldp + curwin->w_cursor.col; | |
| 3467 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
|
3468 MB_PTR_ADV(p); |
| 6845 | 3469 ptr = vim_strnsave(oldp, p - oldp); |
| 7 | 3470 if (ptr == NULL) |
| 3471 goto end; | |
| 3472 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
| 3473 ++nr_lines; | |
| 3474 dir = FORWARD; | |
| 3475 } | |
| 3476 if (flags & PUT_LINE_FORWARD) | |
| 3477 { | |
| 3478 /* Must be "p" for a Visual block, put lines below the block. */ | |
| 692 | 3479 curwin->w_cursor = curbuf->b_visual.vi_end; |
| 7 | 3480 dir = FORWARD; |
| 3481 } | |
| 3482 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
| 3483 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
| 3484 } | |
| 3485 | |
| 3486 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
| 3487 y_type = MLINE; | |
| 3488 | |
| 3489 if (y_size == 0 || y_array == NULL) | |
| 3490 { | |
| 3491 EMSG2(_("E353: Nothing in register %s"), | |
| 3492 regname == 0 ? (char_u *)"\"" : transchar(regname)); | |
| 3493 goto end; | |
| 3494 } | |
| 3495 | |
| 3496 if (y_type == MBLOCK) | |
| 3497 { | |
| 3498 lnum = curwin->w_cursor.lnum + y_size + 1; | |
| 3499 if (lnum > curbuf->b_ml.ml_line_count) | |
| 3500 lnum = curbuf->b_ml.ml_line_count + 1; | |
| 3501 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
| 3502 goto end; | |
| 3503 } | |
| 5735 | 3504 else if (y_type == MLINE) |
| 7 | 3505 { |
| 3506 lnum = curwin->w_cursor.lnum; | |
| 3507 #ifdef FEAT_FOLDING | |
| 3508 /* Correct line number for closed fold. Don't move the cursor yet, | |
| 3509 * u_save() uses it. */ | |
| 3510 if (dir == BACKWARD) | |
| 3511 (void)hasFolding(lnum, &lnum, NULL); | |
| 3512 else | |
| 3513 (void)hasFolding(lnum, NULL, &lnum); | |
| 3514 #endif | |
| 3515 if (dir == FORWARD) | |
| 3516 ++lnum; | |
|
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3517 /* 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
|
3518 * 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
|
3519 if ((BUFEMPTY() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
| 7 | 3520 goto end; |
| 3521 #ifdef FEAT_FOLDING | |
| 3522 if (dir == FORWARD) | |
| 3523 curwin->w_cursor.lnum = lnum - 1; | |
| 3524 else | |
| 3525 curwin->w_cursor.lnum = lnum; | |
| 3526 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
| 3527 #endif | |
| 3528 } | |
| 3529 else if (u_save_cursor() == FAIL) | |
| 3530 goto end; | |
| 3531 | |
| 3532 yanklen = (int)STRLEN(y_array[0]); | |
| 3533 | |
| 3534 #ifdef FEAT_VIRTUALEDIT | |
| 3535 if (ve_flags == VE_ALL && y_type == MCHAR) | |
| 3536 { | |
| 3537 if (gchar_cursor() == TAB) | |
| 3538 { | |
| 3539 /* Don't need to insert spaces when "p" on the last position of a | |
| 3540 * tab or "P" on the first position. */ | |
| 3541 if (dir == FORWARD | |
| 3542 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
| 3543 : curwin->w_cursor.coladd > 0) | |
| 3544 coladvance_force(getviscol()); | |
| 3545 else | |
| 3546 curwin->w_cursor.coladd = 0; | |
| 3547 } | |
| 3548 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
| 3549 coladvance_force(getviscol() + (dir == FORWARD)); | |
| 3550 } | |
| 3551 #endif | |
| 3552 | |
| 3553 lnum = curwin->w_cursor.lnum; | |
| 3554 col = curwin->w_cursor.col; | |
| 3555 | |
| 3556 /* | |
| 3557 * Block mode | |
| 3558 */ | |
| 3559 if (y_type == MBLOCK) | |
| 3560 { | |
|
10664
94db9c08e206
patch 8.0.0222: blockwise put on multi-byte character misplaced
Christian Brabandt <cb@256bit.org>
parents:
10494
diff
changeset
|
3561 int c = gchar_cursor(); |
| 7 | 3562 colnr_T endcol2 = 0; |
| 3563 | |
| 3564 if (dir == FORWARD && c != NUL) | |
| 3565 { | |
| 3566 #ifdef FEAT_VIRTUALEDIT | |
| 3567 if (ve_flags == VE_ALL) | |
| 3568 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
| 3569 else | |
| 3570 #endif | |
| 3571 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
| 3572 | |
| 3573 #ifdef FEAT_MBYTE | |
| 3574 if (has_mbyte) | |
| 3575 /* move to start of next multi-byte character */ | |
| 474 | 3576 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
| 7 | 3577 else |
| 3578 #endif | |
| 3579 #ifdef FEAT_VIRTUALEDIT | |
| 3580 if (c != TAB || ve_flags != VE_ALL) | |
| 3581 #endif | |
| 3582 ++curwin->w_cursor.col; | |
| 3583 ++col; | |
| 3584 } | |
| 3585 else | |
| 3586 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
| 3587 | |
| 3588 #ifdef FEAT_VIRTUALEDIT | |
| 3589 col += curwin->w_cursor.coladd; | |
| 1304 | 3590 if (ve_flags == VE_ALL |
| 3591 && (curwin->w_cursor.coladd > 0 | |
| 3592 || endcol2 == curwin->w_cursor.col)) | |
| 7 | 3593 { |
| 3594 if (dir == FORWARD && c == NUL) | |
| 3595 ++col; | |
| 3596 if (dir != FORWARD && c != NUL) | |
| 3597 ++curwin->w_cursor.col; | |
| 3598 if (c == TAB) | |
| 3599 { | |
| 3600 if (dir == BACKWARD && curwin->w_cursor.col) | |
| 3601 curwin->w_cursor.col--; | |
| 3602 if (dir == FORWARD && col - 1 == endcol2) | |
| 3603 curwin->w_cursor.col++; | |
| 3604 } | |
| 3605 } | |
| 3606 curwin->w_cursor.coladd = 0; | |
| 3607 #endif | |
| 699 | 3608 bd.textcol = 0; |
| 7 | 3609 for (i = 0; i < y_size; ++i) |
| 3610 { | |
| 3611 int spaces; | |
| 3612 char shortline; | |
| 3613 | |
| 3614 bd.startspaces = 0; | |
| 3615 bd.endspaces = 0; | |
| 3616 vcol = 0; | |
| 3617 delcount = 0; | |
| 3618 | |
| 3619 /* add a new line */ | |
| 3620 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
| 3621 { | |
| 3622 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
| 3623 (colnr_T)1, FALSE) == FAIL) | |
| 3624 break; | |
| 3625 ++nr_lines; | |
| 3626 } | |
| 3627 /* get the old line and advance to the position to insert at */ | |
| 3628 oldp = ml_get_curline(); | |
| 3629 oldlen = (int)STRLEN(oldp); | |
| 3630 for (ptr = oldp; vcol < col && *ptr; ) | |
| 3631 { | |
| 3632 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5995 | 3633 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
| 7 | 3634 vcol += incr; |
| 3635 } | |
| 3636 bd.textcol = (colnr_T)(ptr - oldp); | |
| 3637 | |
| 3638 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
| 3639 | |
| 3640 if (vcol < col) /* line too short, padd with spaces */ | |
| 3641 bd.startspaces = col - vcol; | |
| 3642 else if (vcol > col) | |
| 3643 { | |
| 3644 bd.endspaces = vcol - col; | |
| 3645 bd.startspaces = incr - bd.endspaces; | |
| 3646 --bd.textcol; | |
| 3647 delcount = 1; | |
| 3648 #ifdef FEAT_MBYTE | |
| 3649 if (has_mbyte) | |
| 3650 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
| 3651 #endif | |
| 3652 if (oldp[bd.textcol] != TAB) | |
| 3653 { | |
| 3654 /* Only a Tab can be split into spaces. Other | |
| 3655 * characters will have to be moved to after the | |
| 3656 * block, causing misalignment. */ | |
| 3657 delcount = 0; | |
| 3658 bd.endspaces = 0; | |
| 3659 } | |
| 3660 } | |
| 3661 | |
| 3662 yanklen = (int)STRLEN(y_array[i]); | |
| 3663 | |
| 3664 /* calculate number of spaces required to fill right side of block*/ | |
| 3665 spaces = y_width + 1; | |
| 3666 for (j = 0; j < yanklen; j++) | |
| 5995 | 3667 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
| 7 | 3668 if (spaces < 0) |
| 3669 spaces = 0; | |
| 3670 | |
| 3671 /* insert the new text */ | |
| 3672 totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces; | |
| 3673 newp = alloc_check((unsigned)totlen + oldlen + 1); | |
| 3674 if (newp == NULL) | |
| 3675 break; | |
| 3676 /* copy part up to cursor to new line */ | |
| 3677 ptr = newp; | |
| 3678 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
| 3679 ptr += bd.textcol; | |
| 3680 /* may insert some spaces before the new text */ | |
| 6929 | 3681 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
| 7 | 3682 ptr += bd.startspaces; |
| 3683 /* insert the new text */ | |
| 3684 for (j = 0; j < count; ++j) | |
| 3685 { | |
| 3686 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
| 3687 ptr += yanklen; | |
| 3688 | |
| 3689 /* insert block's trailing spaces only if there's text behind */ | |
| 3690 if ((j < count - 1 || !shortline) && spaces) | |
| 3691 { | |
| 6929 | 3692 vim_memset(ptr, ' ', (size_t)spaces); |
| 7 | 3693 ptr += spaces; |
| 3694 } | |
| 3695 } | |
| 3696 /* may insert some spaces after the new text */ | |
| 6929 | 3697 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
| 7 | 3698 ptr += bd.endspaces; |
| 3699 /* move the text after the cursor to the end of the line. */ | |
| 3700 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
| 3701 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
| 3702 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 3703 | |
| 3704 ++curwin->w_cursor.lnum; | |
| 3705 if (i == 0) | |
| 3706 curwin->w_cursor.col += bd.startspaces; | |
| 3707 } | |
| 3708 | |
| 3709 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
| 3710 | |
| 3711 /* Set '[ mark. */ | |
| 3712 curbuf->b_op_start = curwin->w_cursor; | |
| 3713 curbuf->b_op_start.lnum = lnum; | |
| 3714 | |
| 3715 /* adjust '] mark */ | |
| 3716 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
| 3717 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
| 237 | 3718 # ifdef FEAT_VIRTUALEDIT |
| 7 | 3719 curbuf->b_op_end.coladd = 0; |
| 237 | 3720 # endif |
| 7 | 3721 if (flags & PUT_CURSEND) |
| 3722 { | |
| 916 | 3723 colnr_T len; |
| 3724 | |
| 7 | 3725 curwin->w_cursor = curbuf->b_op_end; |
| 3726 curwin->w_cursor.col++; | |
| 916 | 3727 |
| 3728 /* in Insert mode we might be after the NUL, correct for that */ | |
| 3729 len = (colnr_T)STRLEN(ml_get_curline()); | |
| 3730 if (curwin->w_cursor.col > len) | |
| 3731 curwin->w_cursor.col = len; | |
| 7 | 3732 } |
| 3733 else | |
| 3734 curwin->w_cursor.lnum = lnum; | |
| 3735 } | |
| 3736 else | |
| 3737 { | |
| 3738 /* | |
| 3739 * Character or Line mode | |
| 3740 */ | |
| 3741 if (y_type == MCHAR) | |
| 3742 { | |
| 3743 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
| 3744 * char */ | |
| 3745 if (dir == FORWARD && gchar_cursor() != NUL) | |
| 3746 { | |
| 3747 #ifdef FEAT_MBYTE | |
| 3748 if (has_mbyte) | |
| 3749 { | |
| 474 | 3750 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
| 7 | 3751 |
| 3752 /* put it on the next of the multi-byte character. */ | |
| 3753 col += bytelen; | |
| 3754 if (yanklen) | |
| 3755 { | |
| 3756 curwin->w_cursor.col += bytelen; | |
| 3757 curbuf->b_op_end.col += bytelen; | |
| 3758 } | |
| 3759 } | |
| 3760 else | |
| 3761 #endif | |
| 3762 { | |
| 3763 ++col; | |
| 3764 if (yanklen) | |
| 3765 { | |
| 3766 ++curwin->w_cursor.col; | |
| 3767 ++curbuf->b_op_end.col; | |
| 3768 } | |
| 3769 } | |
| 3770 } | |
| 3771 curbuf->b_op_start = curwin->w_cursor; | |
| 3772 } | |
| 3773 /* | |
| 3774 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
| 3775 */ | |
| 3776 else if (dir == BACKWARD) | |
| 3777 --lnum; | |
| 699 | 3778 new_cursor = curwin->w_cursor; |
| 7 | 3779 |
| 3780 /* | |
| 3781 * simple case: insert into current line | |
| 3782 */ | |
| 3783 if (y_type == MCHAR && y_size == 1) | |
| 3784 { | |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3785 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
|
3786 |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3787 if (VIsual_active) |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3788 { |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3789 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
|
3790 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
|
3791 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
|
3792 } |
|
10670
bce3eccea39a
patch 8.0.0225: put in Visual block mode terminates early
Christian Brabandt <cb@256bit.org>
parents:
10664
diff
changeset
|
3793 |
| 5365 | 3794 do { |
| 3795 totlen = count * yanklen; | |
| 3796 if (totlen > 0) | |
| 7 | 3797 { |
| 5365 | 3798 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
|
3799 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
|
3800 { |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3801 lnum++; |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3802 continue; |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3803 } |
| 5365 | 3804 newp = alloc_check((unsigned)(STRLEN(oldp) + totlen + 1)); |
| 3805 if (newp == NULL) | |
| 3806 goto end; /* alloc() gave an error message */ | |
| 3807 mch_memmove(newp, oldp, (size_t)col); | |
| 3808 ptr = newp + col; | |
| 3809 for (i = 0; i < count; ++i) | |
| 3810 { | |
| 3811 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
| 3812 ptr += yanklen; | |
| 3813 } | |
| 3814 STRMOVE(ptr, oldp + col); | |
| 3815 ml_replace(lnum, newp, FALSE); | |
| 3816 /* Place cursor on last putted char. */ | |
| 3817 if (lnum == curwin->w_cursor.lnum) | |
| 5496 | 3818 { |
| 3819 /* make sure curwin->w_virtcol is updated */ | |
| 3820 changed_cline_bef_curs(); | |
| 5365 | 3821 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
| 5496 | 3822 } |
| 7 | 3823 } |
| 5365 | 3824 if (VIsual_active) |
| 3825 lnum++; | |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3826 } while (VIsual_active && lnum <= end_lnum); |
| 5365 | 3827 |
| 6379 | 3828 if (VIsual_active) /* reset lnum to the last visual line */ |
| 3829 lnum--; | |
| 3830 | |
| 7 | 3831 curbuf->b_op_end = curwin->w_cursor; |
| 3832 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
| 3833 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
| 3834 ++curwin->w_cursor.col; | |
| 3835 changed_bytes(lnum, col); | |
| 3836 } | |
| 3837 else | |
| 3838 { | |
| 3839 /* | |
| 3840 * Insert at least one line. When y_type is MCHAR, break the first | |
| 3841 * line in two. | |
| 3842 */ | |
| 3843 for (cnt = 1; cnt <= count; ++cnt) | |
| 3844 { | |
| 3845 i = 0; | |
| 3846 if (y_type == MCHAR) | |
| 3847 { | |
| 3848 /* | |
| 3849 * Split the current line in two at the insert position. | |
| 3850 * First insert y_array[size - 1] in front of second line. | |
| 3851 * Then append y_array[0] to first line. | |
| 3852 */ | |
| 3853 lnum = new_cursor.lnum; | |
| 3854 ptr = ml_get(lnum) + col; | |
| 3855 totlen = (int)STRLEN(y_array[y_size - 1]); | |
| 3856 newp = alloc_check((unsigned)(STRLEN(ptr) + totlen + 1)); | |
| 3857 if (newp == NULL) | |
| 3858 goto error; | |
| 3859 STRCPY(newp, y_array[y_size - 1]); | |
| 3860 STRCAT(newp, ptr); | |
| 3861 /* insert second line */ | |
| 3862 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
| 3863 vim_free(newp); | |
| 3864 | |
| 3865 oldp = ml_get(lnum); | |
| 3866 newp = alloc_check((unsigned)(col + yanklen + 1)); | |
| 3867 if (newp == NULL) | |
| 3868 goto error; | |
| 3869 /* copy first part of line */ | |
| 3870 mch_memmove(newp, oldp, (size_t)col); | |
| 3871 /* append to first line */ | |
| 3872 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
| 3873 ml_replace(lnum, newp, FALSE); | |
| 3874 | |
| 3875 curwin->w_cursor.lnum = lnum; | |
| 3876 i = 1; | |
| 3877 } | |
| 3878 | |
| 3879 for (; i < y_size; ++i) | |
| 3880 { | |
| 3881 if ((y_type != MCHAR || i < y_size - 1) | |
| 3882 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
| 3883 == FAIL) | |
| 3884 goto error; | |
| 3885 lnum++; | |
| 3886 ++nr_lines; | |
| 3887 if (flags & PUT_FIXINDENT) | |
| 3888 { | |
| 3889 old_pos = curwin->w_cursor; | |
| 3890 curwin->w_cursor.lnum = lnum; | |
| 3891 ptr = ml_get(lnum); | |
| 3892 if (cnt == count && i == y_size - 1) | |
| 3893 lendiff = (int)STRLEN(ptr); | |
| 3894 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
| 3895 if (*ptr == '#' && preprocs_left()) | |
| 3896 indent = 0; /* Leave # lines at start */ | |
| 3897 else | |
| 3898 #endif | |
| 3899 if (*ptr == NUL) | |
| 3900 indent = 0; /* Ignore empty lines */ | |
| 3901 else if (first_indent) | |
| 3902 { | |
| 3903 indent_diff = orig_indent - get_indent(); | |
| 3904 indent = orig_indent; | |
| 3905 first_indent = FALSE; | |
| 3906 } | |
| 3907 else if ((indent = get_indent() + indent_diff) < 0) | |
| 3908 indent = 0; | |
| 3909 (void)set_indent(indent, 0); | |
| 3910 curwin->w_cursor = old_pos; | |
| 3911 /* remember how many chars were removed */ | |
| 3912 if (cnt == count && i == y_size - 1) | |
| 3913 lendiff -= (int)STRLEN(ml_get(lnum)); | |
| 3914 } | |
| 3915 } | |
| 3916 } | |
| 3917 | |
| 3918 error: | |
| 3919 /* Adjust marks. */ | |
| 3920 if (y_type == MLINE) | |
| 3921 { | |
| 3922 curbuf->b_op_start.col = 0; | |
| 3923 if (dir == FORWARD) | |
| 3924 curbuf->b_op_start.lnum++; | |
| 3925 } | |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3926 /* 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
|
3927 * 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
|
3928 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
|
3929 < 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
|
3930 #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
|
3931 || 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
|
3932 #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
|
3933 ) |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3934 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
| 7 | 3935 (linenr_T)MAXLNUM, nr_lines, 0L); |
| 3936 | |
| 3937 /* note changed text for displaying and folding */ | |
| 3938 if (y_type == MCHAR) | |
| 3939 changed_lines(curwin->w_cursor.lnum, col, | |
| 3940 curwin->w_cursor.lnum + 1, nr_lines); | |
| 3941 else | |
| 3942 changed_lines(curbuf->b_op_start.lnum, 0, | |
| 3943 curbuf->b_op_start.lnum, nr_lines); | |
| 3944 | |
| 3945 /* put '] mark at last inserted character */ | |
| 3946 curbuf->b_op_end.lnum = lnum; | |
| 3947 /* correct length for change in indent */ | |
| 3948 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
| 3949 if (col > 1) | |
| 3950 curbuf->b_op_end.col = col - 1; | |
| 3951 else | |
| 3952 curbuf->b_op_end.col = 0; | |
| 3953 | |
| 168 | 3954 if (flags & PUT_CURSLINE) |
| 3955 { | |
| 237 | 3956 /* ":put": put cursor on last inserted line */ |
| 168 | 3957 curwin->w_cursor.lnum = lnum; |
| 3958 beginline(BL_WHITE | BL_FIX); | |
| 3959 } | |
| 3960 else if (flags & PUT_CURSEND) | |
| 7 | 3961 { |
| 3962 /* put cursor after inserted text */ | |
| 3963 if (y_type == MLINE) | |
| 3964 { | |
| 3965 if (lnum >= curbuf->b_ml.ml_line_count) | |
| 3966 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
| 3967 else | |
| 3968 curwin->w_cursor.lnum = lnum + 1; | |
| 3969 curwin->w_cursor.col = 0; | |
| 3970 } | |
| 3971 else | |
| 3972 { | |
| 3973 curwin->w_cursor.lnum = lnum; | |
| 3974 curwin->w_cursor.col = col; | |
| 3975 } | |
| 3976 } | |
| 3977 else if (y_type == MLINE) | |
| 3978 { | |
| 168 | 3979 /* put cursor on first non-blank in first inserted line */ |
| 7 | 3980 curwin->w_cursor.col = 0; |
| 3981 if (dir == FORWARD) | |
| 3982 ++curwin->w_cursor.lnum; | |
| 3983 beginline(BL_WHITE | BL_FIX); | |
| 3984 } | |
| 3985 else /* put cursor on first inserted character */ | |
| 3986 curwin->w_cursor = new_cursor; | |
| 3987 } | |
| 3988 } | |
| 3989 | |
| 3990 msgmore(nr_lines); | |
| 3991 curwin->w_set_curswant = TRUE; | |
| 3992 | |
| 3993 end: | |
| 3994 if (allocated) | |
| 3995 vim_free(insert_string); | |
| 840 | 3996 if (regname == '=') |
| 3997 vim_free(y_array); | |
| 3998 | |
| 5380 | 3999 VIsual_active = FALSE; |
| 4000 | |
| 140 | 4001 /* If the cursor is past the end of the line put it at the end. */ |
| 844 | 4002 adjust_cursor_eol(); |
| 4003 } | |
| 4004 | |
| 4005 /* | |
| 4006 * When the cursor is on the NUL past the end of the line and it should not be | |
| 4007 * there move it left. | |
| 4008 */ | |
| 4009 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4010 adjust_cursor_eol(void) |
| 844 | 4011 { |
| 4012 if (curwin->w_cursor.col > 0 | |
| 4013 && gchar_cursor() == NUL | |
| 773 | 4014 #ifdef FEAT_VIRTUALEDIT |
| 4015 && (ve_flags & VE_ONEMORE) == 0 | |
| 4016 #endif | |
| 7 | 4017 && !(restart_edit || (State & INSERT))) |
| 4018 { | |
| 557 | 4019 /* Put the cursor on the last character in the line. */ |
| 555 | 4020 dec_cursor(); |
| 844 | 4021 |
| 7 | 4022 #ifdef FEAT_VIRTUALEDIT |
| 4023 if (ve_flags == VE_ALL) | |
| 557 | 4024 { |
| 4025 colnr_T scol, ecol; | |
| 4026 | |
| 4027 /* Coladd is set to the width of the last character. */ | |
| 4028 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
| 4029 curwin->w_cursor.coladd = ecol - scol + 1; | |
| 4030 } | |
| 7 | 4031 #endif |
| 4032 } | |
| 4033 } | |
| 4034 | |
| 4035 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
| 4036 /* | |
| 4037 * Return TRUE if lines starting with '#' should be left aligned. | |
| 4038 */ | |
| 4039 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4040 preprocs_left(void) |
| 7 | 4041 { |
| 4042 return | |
| 4043 # ifdef FEAT_SMARTINDENT | |
| 4044 # ifdef FEAT_CINDENT | |
| 4045 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
| 4046 # else | |
| 4047 curbuf->b_p_si | |
| 4048 # endif | |
| 4049 # endif | |
| 4050 # ifdef FEAT_CINDENT | |
| 5438 | 4051 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
| 4052 && curbuf->b_ind_hash_comment == 0) | |
| 7 | 4053 # endif |
| 4054 ; | |
| 4055 } | |
| 4056 #endif | |
| 4057 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4058 /* |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4059 * 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
|
4060 */ |
| 7 | 4061 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4062 get_register_name(int num) |
| 7 | 4063 { |
| 4064 if (num == -1) | |
| 4065 return '"'; | |
| 4066 else if (num < 10) | |
| 4067 return num + '0'; | |
| 4068 else if (num == DELETION_REGISTER) | |
| 4069 return '-'; | |
| 4070 #ifdef FEAT_CLIPBOARD | |
| 4071 else if (num == STAR_REGISTER) | |
| 4072 return '*'; | |
| 4073 else if (num == PLUS_REGISTER) | |
| 4074 return '+'; | |
| 4075 #endif | |
| 4076 else | |
| 4077 { | |
| 4078 #ifdef EBCDIC | |
| 4079 int i; | |
| 4080 | |
| 4081 /* EBCDIC is really braindead ... */ | |
| 4082 i = 'a' + (num - 10); | |
| 4083 if (i > 'i') | |
| 4084 i += 7; | |
| 4085 if (i > 'r') | |
| 4086 i += 8; | |
| 4087 return i; | |
| 4088 #else | |
| 4089 return num + 'a' - 10; | |
| 4090 #endif | |
| 4091 } | |
| 4092 } | |
| 4093 | |
| 4094 /* | |
| 4095 * ":dis" and ":registers": Display the contents of the yank registers. | |
| 4096 */ | |
| 4097 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4098 ex_display(exarg_T *eap) |
| 7 | 4099 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4100 int i, n; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4101 long j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4102 char_u *p; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4103 yankreg_T *yb; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4104 int name; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4105 int attr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4106 char_u *arg = eap->arg; |
| 22 | 4107 #ifdef FEAT_MBYTE |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4108 int clen; |
| 22 | 4109 #else |
| 4110 # define clen 1 | |
| 4111 #endif | |
| 7 | 4112 |
| 4113 if (arg != NULL && *arg == NUL) | |
| 4114 arg = NULL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
4115 attr = HL_ATTR(HLF_8); |
| 7 | 4116 |
| 4117 /* Highlight title */ | |
| 4118 MSG_PUTS_TITLE(_("\n--- Registers ---")); | |
| 4119 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) | |
| 4120 { | |
| 4121 name = get_register_name(i); | |
| 2644 | 4122 if (arg != NULL && vim_strchr(arg, name) == NULL |
| 4123 #ifdef ONE_CLIPBOARD | |
| 4124 /* Star register and plus register contain the same thing. */ | |
| 4125 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
| 4126 #endif | |
| 4127 ) | |
| 7 | 4128 continue; /* did not ask for this register */ |
| 4129 | |
| 4130 #ifdef FEAT_CLIPBOARD | |
| 4131 /* Adjust register name for "unnamed" in 'clipboard'. | |
| 4132 * When it's a clipboard register, fill it with the current contents | |
| 4133 * of the clipboard. */ | |
| 4134 adjust_clip_reg(&name); | |
| 4135 (void)may_get_selection(name); | |
| 4136 #endif | |
| 4137 | |
| 4138 if (i == -1) | |
| 4139 { | |
| 4140 if (y_previous != NULL) | |
| 4141 yb = y_previous; | |
| 4142 else | |
| 4143 yb = &(y_regs[0]); | |
| 4144 } | |
| 4145 else | |
| 4146 yb = &(y_regs[i]); | |
| 2000 | 4147 |
| 4148 #ifdef FEAT_EVAL | |
| 4149 if (name == MB_TOLOWER(redir_reg) | |
| 4150 || (redir_reg == '"' && yb == y_previous)) | |
| 4151 continue; /* do not list register being written to, the | |
| 4152 * pointer can be freed */ | |
| 4153 #endif | |
| 4154 | |
| 7 | 4155 if (yb->y_array != NULL) |
| 4156 { | |
| 4157 msg_putchar('\n'); | |
| 4158 msg_putchar('"'); | |
| 4159 msg_putchar(name); | |
| 4160 MSG_PUTS(" "); | |
| 4161 | |
| 4162 n = (int)Columns - 6; | |
| 4163 for (j = 0; j < yb->y_size && n > 1; ++j) | |
| 4164 { | |
| 4165 if (j) | |
| 4166 { | |
| 4167 MSG_PUTS_ATTR("^J", attr); | |
| 4168 n -= 2; | |
| 4169 } | |
| 4170 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
| 4171 { | |
| 4172 #ifdef FEAT_MBYTE | |
| 474 | 4173 clen = (*mb_ptr2len)(p); |
| 22 | 4174 #endif |
| 4175 msg_outtrans_len(p, clen); | |
| 4176 #ifdef FEAT_MBYTE | |
| 4177 p += clen - 1; | |
| 7 | 4178 #endif |
| 4179 } | |
| 4180 } | |
| 4181 if (n > 1 && yb->y_type == MLINE) | |
| 4182 MSG_PUTS_ATTR("^J", attr); | |
| 4183 out_flush(); /* show one line at a time */ | |
| 4184 } | |
| 4185 ui_breakcheck(); | |
| 4186 } | |
| 4187 | |
| 4188 /* | |
| 4189 * display last inserted text | |
| 4190 */ | |
| 4191 if ((p = get_last_insert()) != NULL | |
| 4192 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
| 4193 { | |
| 4194 MSG_PUTS("\n\". "); | |
| 4195 dis_msg(p, TRUE); | |
| 4196 } | |
| 4197 | |
| 4198 /* | |
| 4199 * display last command line | |
| 4200 */ | |
| 4201 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
| 4202 && !got_int) | |
| 4203 { | |
| 4204 MSG_PUTS("\n\": "); | |
| 4205 dis_msg(last_cmdline, FALSE); | |
| 4206 } | |
| 4207 | |
| 4208 /* | |
| 4209 * display current file name | |
| 4210 */ | |
| 4211 if (curbuf->b_fname != NULL | |
| 4212 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
| 4213 { | |
| 4214 MSG_PUTS("\n\"% "); | |
| 4215 dis_msg(curbuf->b_fname, FALSE); | |
| 4216 } | |
| 4217 | |
| 4218 /* | |
| 4219 * display alternate file name | |
| 4220 */ | |
| 4221 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
| 4222 { | |
| 4223 char_u *fname; | |
| 4224 linenr_T dummy; | |
| 4225 | |
| 4226 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
| 4227 { | |
| 4228 MSG_PUTS("\n\"# "); | |
| 4229 dis_msg(fname, FALSE); | |
| 4230 } | |
| 4231 } | |
| 4232 | |
| 4233 /* | |
| 4234 * display last search pattern | |
| 4235 */ | |
| 4236 if (last_search_pat() != NULL | |
| 4237 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
| 4238 { | |
| 4239 MSG_PUTS("\n\"/ "); | |
| 4240 dis_msg(last_search_pat(), FALSE); | |
| 4241 } | |
| 4242 | |
| 4243 #ifdef FEAT_EVAL | |
| 4244 /* | |
| 4245 * display last used expression | |
| 4246 */ | |
| 4247 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
| 4248 && !got_int) | |
| 4249 { | |
| 4250 MSG_PUTS("\n\"= "); | |
| 4251 dis_msg(expr_line, FALSE); | |
| 4252 } | |
| 4253 #endif | |
| 4254 } | |
| 4255 | |
| 4256 /* | |
| 4257 * display a string for do_dis() | |
| 4258 * truncate at end of screen line | |
| 4259 */ | |
| 4260 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4261 dis_msg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4262 char_u *p, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4263 int skip_esc) /* if TRUE, ignore trailing ESC */ |
| 7 | 4264 { |
| 4265 int n; | |
| 4266 #ifdef FEAT_MBYTE | |
| 4267 int l; | |
| 4268 #endif | |
| 4269 | |
| 4270 n = (int)Columns - 6; | |
| 4271 while (*p != NUL | |
| 4272 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
| 4273 && (n -= ptr2cells(p)) >= 0) | |
| 4274 { | |
| 4275 #ifdef FEAT_MBYTE | |
| 474 | 4276 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
| 7 | 4277 { |
| 4278 msg_outtrans_len(p, l); | |
| 4279 p += l; | |
| 4280 } | |
| 4281 else | |
| 4282 #endif | |
| 4283 msg_outtrans_len(p++, 1); | |
| 4284 } | |
| 4285 ui_breakcheck(); | |
| 4286 } | |
| 4287 | |
| 3562 | 4288 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4289 /* | |
| 4290 * If "process" is TRUE and the line begins with a comment leader (possibly | |
| 4291 * after some white space), return a pointer to the text after it. Put a boolean | |
| 4292 * value indicating whether the line ends with an unclosed comment in | |
| 4293 * "is_comment". | |
| 4294 * line - line to be processed, | |
| 4295 * process - if FALSE, will only check whether the line ends with an unclosed | |
| 3584 | 4296 * comment, |
| 3562 | 4297 * include_space - whether to also skip space following the comment leader, |
| 4298 * is_comment - will indicate whether the current line ends with an unclosed | |
| 3584 | 4299 * comment. |
| 3562 | 4300 */ |
|
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4301 char_u * |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4302 skip_comment( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4303 char_u *line, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4304 int process, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4305 int include_space, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4306 int *is_comment) |
| 3562 | 4307 { |
| 4308 char_u *comment_flags = NULL; | |
| 4309 int lead_len; | |
| 4310 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
| 4311 | |
| 4312 *is_comment = FALSE; | |
| 4313 if (leader_offset != -1) | |
| 4314 { | |
| 4315 /* Let's check whether the line ends with an unclosed comment. | |
| 4316 * If the last comment leader has COM_END in flags, there's no comment. | |
| 4317 */ | |
| 4318 while (*comment_flags) | |
| 4319 { | |
| 4320 if (*comment_flags == COM_END | |
| 4321 || *comment_flags == ':') | |
| 4322 break; | |
| 4323 ++comment_flags; | |
| 4324 } | |
| 4325 if (*comment_flags != COM_END) | |
| 4326 *is_comment = TRUE; | |
| 4327 } | |
| 4328 | |
| 4329 if (process == FALSE) | |
| 4330 return line; | |
| 4331 | |
| 4332 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
| 4333 | |
| 4334 if (lead_len == 0) | |
| 4335 return line; | |
| 4336 | |
| 4337 /* Find: | |
| 4338 * - COM_END, | |
| 4339 * - colon, | |
| 4340 * whichever comes first. | |
| 4341 */ | |
| 4342 while (*comment_flags) | |
| 4343 { | |
| 3580 | 4344 if (*comment_flags == COM_END |
| 3562 | 4345 || *comment_flags == ':') |
| 4346 { | |
| 4347 break; | |
| 4348 } | |
| 4349 ++comment_flags; | |
| 4350 } | |
| 4351 | |
| 4352 /* If we found a colon, it means that we are not processing a line | |
| 3580 | 4353 * starting with a closing part of a three-part comment. That's good, |
| 4354 * because we don't want to remove those as this would be annoying. | |
| 3562 | 4355 */ |
| 4356 if (*comment_flags == ':' || *comment_flags == NUL) | |
| 4357 line += lead_len; | |
| 4358 | |
| 4359 return line; | |
| 4360 } | |
| 4361 #endif | |
| 4362 | |
| 7 | 4363 /* |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4364 * 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
|
4365 * When "save_undo" is TRUE save lines for undo first. |
| 5848 | 4366 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
| 4367 * leaders should not be removed. | |
| 4368 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
| 4369 * to set those marks. | |
| 7 | 4370 * |
| 1217 | 4371 * return FAIL for failure, OK otherwise |
| 7 | 4372 */ |
| 4373 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4374 do_join( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4375 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4376 int insert_space, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4377 int save_undo, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4378 int use_formatoptions UNUSED, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4379 int setmark) |
| 7 | 4380 { |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4381 char_u *curr = NULL; |
| 2597 | 4382 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
|
4383 char_u *cend; |
| 7 | 4384 char_u *newp; |
| 2597 | 4385 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
|
4386 int endcurr1 = NUL; |
|
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4387 int endcurr2 = NUL; |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4388 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
|
4389 int sumsize = 0; /* size of the long new line */ |
| 7 | 4390 linenr_T t; |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4391 colnr_T col = 0; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4392 int ret = OK; |
| 3562 | 4393 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 3574 | 4394 int *comments = NULL; |
| 3562 | 4395 int remove_comments = (use_formatoptions == TRUE) |
| 4396 && has_format_option(FO_REMOVE_COMS); | |
| 4397 int prev_was_comment; | |
| 4398 #endif | |
| 4399 | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4400 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4401 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
|
4402 (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
|
4403 return FAIL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4404 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4405 /* 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
|
4406 * 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
|
4407 * 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
|
4408 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
|
4409 if (spaces == NULL) |
| 7 | 4410 return FAIL; |
| 3562 | 4411 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4412 if (remove_comments) | |
| 4413 { | |
| 4414 comments = (int *)lalloc_clear((long_u)count * sizeof(int), TRUE); | |
| 4415 if (comments == NULL) | |
| 4416 { | |
| 4417 vim_free(spaces); | |
| 4418 return FAIL; | |
| 4419 } | |
| 4420 } | |
| 4421 #endif | |
| 7 | 4422 |
| 4423 /* | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4424 * 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
|
4425 * and setup the array of space strings lengths |
| 7 | 4426 */ |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4427 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
|
4428 { |
| 2597 | 4429 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
| 5848 | 4430 if (t == 0 && setmark) |
| 5664 | 4431 { |
| 4432 /* Set the '[ mark. */ | |
| 4433 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
| 4434 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
| 4435 } | |
| 3562 | 4436 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4437 if (remove_comments) | |
| 4438 { | |
| 4439 /* We don't want to remove the comment leader if the | |
| 4440 * previous line is not a comment. */ | |
| 4441 if (t > 0 && prev_was_comment) | |
| 4442 { | |
| 4443 | |
| 4444 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
| 4445 &prev_was_comment); | |
| 3576 | 4446 comments[t] = (int)(new_curr - curr); |
| 3562 | 4447 curr = new_curr; |
| 4448 } | |
| 4449 else | |
| 4450 curr = skip_comment(curr, FALSE, insert_space, | |
| 4451 &prev_was_comment); | |
| 4452 } | |
| 4453 #endif | |
| 4454 | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4455 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
|
4456 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4457 curr = skipwhite(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4458 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
|
4459 #ifdef FEAT_MBYTE |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4460 && (!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
|
4461 || (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
|
4462 && (!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
|
4463 || mb_ptr2char(curr) < 0x100 || endcurr1 < 0x100) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4464 #endif |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4465 ) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4466 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4467 /* 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
|
4468 if (endcurr1 == ' ') |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4469 endcurr1 = endcurr2; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4470 else |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4471 ++spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4472 /* 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
|
4473 if ( p_js |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4474 && (endcurr1 == '.' |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4475 || (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
|
4476 && (endcurr1 == '?' || endcurr1 == '!')))) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4477 ++spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4478 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4479 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4480 currsize = (int)STRLEN(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4481 sumsize += currsize + spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4482 endcurr1 = endcurr2 = NUL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4483 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
|
4484 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4485 #ifdef FEAT_MBYTE |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4486 if (has_mbyte) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4487 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4488 cend = curr + currsize; |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4489 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
|
4490 endcurr1 = (*mb_ptr2char)(cend); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4491 if (cend > curr) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4492 { |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4493 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
|
4494 endcurr2 = (*mb_ptr2char)(cend); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4495 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4496 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4497 else |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4498 #endif |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4499 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4500 endcurr1 = *(curr + currsize - 1); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4501 if (currsize > 1) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4502 endcurr2 = *(curr + currsize - 2); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4503 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4504 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4505 line_breakcheck(); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4506 if (got_int) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4507 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4508 ret = FAIL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4509 goto theend; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4510 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4511 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4512 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4513 /* 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
|
4514 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
|
4515 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4516 /* 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
|
4517 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
|
4518 cend = newp + sumsize; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4519 *cend = 0; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4520 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4521 /* |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4522 * 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
|
4523 * |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4524 * 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
|
4525 * 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
|
4526 * 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
|
4527 */ |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4528 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
|
4529 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4530 cend -= currsize; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4531 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
|
4532 if (spaces[t] > 0) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4533 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4534 cend -= spaces[t]; |
| 6929 | 4535 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
|
4536 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4537 mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t, |
| 2597 | 4538 (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
|
4539 if (t == 0) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4540 break; |
| 2597 | 4541 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1)); |
| 3562 | 4542 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4543 if (remove_comments) | |
| 4544 curr += comments[t - 1]; | |
| 4545 #endif | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4546 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
|
4547 curr = skipwhite(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4548 currsize = (int)STRLEN(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4549 } |
| 7 | 4550 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
| 4551 | |
| 5848 | 4552 if (setmark) |
| 4553 { | |
| 4554 /* Set the '] mark. */ | |
| 4555 curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; | |
| 4556 curwin->w_buffer->b_op_end.col = (colnr_T)STRLEN(newp); | |
| 4557 } | |
| 5664 | 4558 |
| 7 | 4559 /* Only report the change in the first line here, del_lines() will report |
| 4560 * the deleted line. */ | |
| 4561 changed_lines(curwin->w_cursor.lnum, currsize, | |
| 4562 curwin->w_cursor.lnum + 1, 0L); | |
| 4563 | |
| 4564 /* | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4565 * Delete following lines. To do this we move the cursor there |
| 7 | 4566 * briefly, and then move it back. After del_lines() the cursor may |
| 4567 * have moved up (last line deleted), so the current lnum is kept in t. | |
| 4568 */ | |
| 4569 t = curwin->w_cursor.lnum; | |
| 4570 ++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
|
4571 del_lines(count - 1, FALSE); |
| 7 | 4572 curwin->w_cursor.lnum = t; |
| 4573 | |
| 4574 /* | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4575 * Set the cursor column: |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4576 * 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
|
4577 * vim: use the column of the last join |
| 7 | 4578 */ |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4579 curwin->w_cursor.col = |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4580 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
| 7 | 4581 check_cursor_col(); |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4582 |
| 7 | 4583 #ifdef FEAT_VIRTUALEDIT |
| 4584 curwin->w_cursor.coladd = 0; | |
| 4585 #endif | |
| 4586 curwin->w_set_curswant = TRUE; | |
| 4587 | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4588 theend: |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4589 vim_free(spaces); |
| 3562 | 4590 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4591 if (remove_comments) | |
| 4592 vim_free(comments); | |
| 4593 #endif | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4594 return ret; |
| 7 | 4595 } |
| 4596 | |
| 4597 #ifdef FEAT_COMMENTS | |
| 4598 /* | |
| 4599 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
| 4600 * the first line. White-space is ignored. Note that the whole of | |
| 4601 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
| 4602 */ | |
| 4603 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4604 same_leader( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4605 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4606 int leader1_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4607 char_u *leader1_flags, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4608 int leader2_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4609 char_u *leader2_flags) |
| 7 | 4610 { |
| 4611 int idx1 = 0, idx2 = 0; | |
| 4612 char_u *p; | |
| 4613 char_u *line1; | |
| 4614 char_u *line2; | |
| 4615 | |
| 4616 if (leader1_len == 0) | |
| 4617 return (leader2_len == 0); | |
| 4618 | |
| 4619 /* | |
| 4620 * If first leader has 'f' flag, the lines can be joined only if the | |
| 4621 * second line does not have a leader. | |
| 4622 * If first leader has 'e' flag, the lines can never be joined. | |
| 4623 * If fist leader has 's' flag, the lines can only be joined if there is | |
| 4624 * some text after it and the second line has the 'm' flag. | |
| 4625 */ | |
| 4626 if (leader1_flags != NULL) | |
| 4627 { | |
| 4628 for (p = leader1_flags; *p && *p != ':'; ++p) | |
| 4629 { | |
| 4630 if (*p == COM_FIRST) | |
| 4631 return (leader2_len == 0); | |
| 4632 if (*p == COM_END) | |
| 4633 return FALSE; | |
| 4634 if (*p == COM_START) | |
| 4635 { | |
| 4636 if (*(ml_get(lnum) + leader1_len) == NUL) | |
| 4637 return FALSE; | |
| 4638 if (leader2_flags == NULL || leader2_len == 0) | |
| 4639 return FALSE; | |
| 4640 for (p = leader2_flags; *p && *p != ':'; ++p) | |
| 4641 if (*p == COM_MIDDLE) | |
| 4642 return TRUE; | |
| 4643 return FALSE; | |
| 4644 } | |
| 4645 } | |
| 4646 } | |
| 4647 | |
| 4648 /* | |
| 4649 * Get current line and next line, compare the leaders. | |
| 4650 * The first line has to be saved, only one line can be locked at a time. | |
| 4651 */ | |
| 4652 line1 = vim_strsave(ml_get(lnum)); | |
| 4653 if (line1 != NULL) | |
| 4654 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4655 for (idx1 = 0; VIM_ISWHITE(line1[idx1]); ++idx1) |
| 7 | 4656 ; |
| 4657 line2 = ml_get(lnum + 1); | |
| 4658 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
| 4659 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4660 if (!VIM_ISWHITE(line2[idx2])) |
| 7 | 4661 { |
| 4662 if (line1[idx1++] != line2[idx2]) | |
| 4663 break; | |
| 4664 } | |
| 4665 else | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4666 while (VIM_ISWHITE(line1[idx1])) |
| 7 | 4667 ++idx1; |
| 4668 } | |
| 4669 vim_free(line1); | |
| 4670 } | |
| 4671 return (idx2 == leader2_len && idx1 == leader1_len); | |
| 4672 } | |
| 4673 #endif | |
| 4674 | |
| 4675 /* | |
| 3252 | 4676 * Implementation of the format operator 'gq'. |
| 7 | 4677 */ |
| 4678 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4679 op_format( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4680 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4681 int keep_cursor) /* keep cursor on same text char */ |
| 7 | 4682 { |
| 4683 long old_line_count = curbuf->b_ml.ml_line_count; | |
| 4684 | |
| 4685 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
| 4686 * can put it back there. */ | |
| 4687 curwin->w_cursor = oap->cursor_start; | |
| 4688 | |
| 4689 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 4690 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 4691 return; | |
| 4692 curwin->w_cursor = oap->start; | |
| 4693 | |
| 4694 if (oap->is_VIsual) | |
| 4695 /* When there is no change: need to remove the Visual selection */ | |
| 4696 redraw_curbuf_later(INVERTED); | |
| 4697 | |
| 4698 /* Set '[ mark at the start of the formatted area */ | |
| 4699 curbuf->b_op_start = oap->start; | |
| 4700 | |
| 4701 /* For "gw" remember the cursor position and put it back below (adjusted | |
| 4702 * for joined and split lines). */ | |
| 4703 if (keep_cursor) | |
| 4704 saved_cursor = oap->cursor_start; | |
| 4705 | |
| 1563 | 4706 format_lines(oap->line_count, keep_cursor); |
| 7 | 4707 |
| 4708 /* | |
| 4709 * Leave the cursor at the first non-blank of the last formatted line. | |
| 4710 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
| 4711 * line, so "." will do the next lines. | |
| 4712 */ | |
| 4713 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
| 4714 ++curwin->w_cursor.lnum; | |
| 4715 beginline(BL_WHITE | BL_FIX); | |
| 4716 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
| 4717 msgmore(old_line_count); | |
| 4718 | |
| 4719 /* put '] mark on the end of the formatted area */ | |
| 4720 curbuf->b_op_end = curwin->w_cursor; | |
| 4721 | |
| 4722 if (keep_cursor) | |
| 4723 { | |
| 4724 curwin->w_cursor = saved_cursor; | |
| 4725 saved_cursor.lnum = 0; | |
| 4726 } | |
| 4727 | |
| 4728 if (oap->is_VIsual) | |
| 4729 { | |
| 4730 win_T *wp; | |
| 4731 | |
| 4732 FOR_ALL_WINDOWS(wp) | |
| 4733 { | |
| 4734 if (wp->w_old_cursor_lnum != 0) | |
| 4735 { | |
| 4736 /* When lines have been inserted or deleted, adjust the end of | |
| 4737 * the Visual area to be redrawn. */ | |
| 4738 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
| 4739 wp->w_old_cursor_lnum += old_line_count; | |
| 4740 else | |
| 4741 wp->w_old_visual_lnum += old_line_count; | |
| 4742 } | |
| 4743 } | |
| 4744 } | |
| 4745 } | |
| 4746 | |
| 667 | 4747 #if defined(FEAT_EVAL) || defined(PROTO) |
| 4748 /* | |
| 4749 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
| 4750 */ | |
| 4751 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4752 op_formatexpr(oparg_T *oap) |
| 667 | 4753 { |
| 4754 if (oap->is_VIsual) | |
| 4755 /* When there is no change: need to remove the Visual selection */ | |
| 4756 redraw_curbuf_later(INVERTED); | |
| 4757 | |
|
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4758 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
|
4759 /* 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
|
4760 * internal formatting. */ |
|
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4761 op_format(oap, FALSE); |
| 667 | 4762 } |
| 4763 | |
| 4764 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4765 fex_format( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4766 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4767 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4768 int c) /* character to be inserted */ |
| 667 | 4769 { |
| 681 | 4770 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
| 4771 OPT_LOCAL); | |
| 667 | 4772 int r; |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4773 char_u *fex; |
| 667 | 4774 |
| 4775 /* | |
| 4776 * Set v:lnum to the first line number and v:count to the number of lines. | |
| 844 | 4777 * Set v:char to the character to be inserted (can be NUL). |
| 667 | 4778 */ |
| 4779 set_vim_var_nr(VV_LNUM, lnum); | |
| 4780 set_vim_var_nr(VV_COUNT, count); | |
| 1969 | 4781 set_vim_var_char(c); |
| 844 | 4782 |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4783 /* 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
|
4784 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
|
4785 if (fex == NULL) |
|
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4786 return 0; |
|
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4787 |
| 667 | 4788 /* |
| 4789 * Evaluate the function. | |
| 4790 */ | |
| 4791 if (use_sandbox) | |
| 4792 ++sandbox; | |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4793 r = (int)eval_to_number(fex); |
| 667 | 4794 if (use_sandbox) |
| 4795 --sandbox; | |
| 844 | 4796 |
| 4797 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
|
4798 vim_free(fex); |
| 844 | 4799 |
| 667 | 4800 return r; |
| 4801 } | |
| 4802 #endif | |
| 4803 | |
| 7 | 4804 /* |
| 4805 * Format "line_count" lines, starting at the cursor position. | |
| 4806 * When "line_count" is negative, format until the end of the paragraph. | |
| 4807 * Lines after the cursor line are saved for undo, caller must have saved the | |
| 4808 * first line. | |
| 4809 */ | |
| 4810 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4811 format_lines( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4812 linenr_T line_count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4813 int avoid_fex) /* don't use 'formatexpr' */ |
| 7 | 4814 { |
| 4815 int max_len; | |
| 4816 int is_not_par; /* current line not part of parag. */ | |
| 4817 int next_is_not_par; /* next line not part of paragraph */ | |
| 4818 int is_end_par; /* at end of paragraph */ | |
| 4819 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
| 4820 int next_is_start_par = FALSE; | |
| 4821 #ifdef FEAT_COMMENTS | |
| 4822 int leader_len = 0; /* leader len of current line */ | |
| 4823 int next_leader_len; /* leader len of next line */ | |
| 4824 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
| 4825 char_u *next_leader_flags; /* flags for leader of next line */ | |
| 4826 int do_comments; /* format comments */ | |
| 3584 | 4827 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
| 7 | 4828 #endif |
| 4829 int advance = TRUE; | |
| 3584 | 4830 int second_indent = -1; /* indent for second line (comment |
| 4831 * aware) */ | |
| 7 | 4832 int do_second_indent; |
| 4833 int do_number_indent; | |
| 4834 int do_trail_white; | |
| 4835 int first_par_line = TRUE; | |
| 4836 int smd_save; | |
| 4837 long count; | |
| 4838 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
| 4839 int force_format = FALSE; | |
| 4840 int old_State = State; | |
| 4841 | |
| 4842 /* length of a line to force formatting: 3 * 'tw' */ | |
| 4843 max_len = comp_textwidth(TRUE) * 3; | |
| 4844 | |
| 4845 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
| 4846 #ifdef FEAT_COMMENTS | |
| 4847 do_comments = has_format_option(FO_Q_COMS); | |
| 4848 #endif | |
| 4849 do_second_indent = has_format_option(FO_Q_SECOND); | |
| 4850 do_number_indent = has_format_option(FO_Q_NUMBER); | |
| 4851 do_trail_white = has_format_option(FO_WHITE_PAR); | |
| 4852 | |
| 4853 /* | |
| 4854 * Get info about the previous and current line. | |
| 4855 */ | |
| 4856 if (curwin->w_cursor.lnum > 1) | |
| 4857 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
| 4858 #ifdef FEAT_COMMENTS | |
| 4859 , &leader_len, &leader_flags, do_comments | |
| 4860 #endif | |
| 4861 ); | |
| 4862 else | |
| 4863 is_not_par = TRUE; | |
| 4864 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
| 4865 #ifdef FEAT_COMMENTS | |
| 4866 , &next_leader_len, &next_leader_flags, do_comments | |
| 4867 #endif | |
| 4868 ); | |
| 4869 is_end_par = (is_not_par || next_is_not_par); | |
| 4870 if (!is_end_par && do_trail_white) | |
| 4871 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
| 4872 | |
| 4873 curwin->w_cursor.lnum--; | |
| 4874 for (count = line_count; count != 0 && !got_int; --count) | |
| 4875 { | |
| 4876 /* | |
| 4877 * Advance to next paragraph. | |
| 4878 */ | |
| 4879 if (advance) | |
| 4880 { | |
| 4881 curwin->w_cursor.lnum++; | |
| 4882 prev_is_end_par = is_end_par; | |
| 4883 is_not_par = next_is_not_par; | |
| 4884 #ifdef FEAT_COMMENTS | |
| 4885 leader_len = next_leader_len; | |
| 4886 leader_flags = next_leader_flags; | |
| 4887 #endif | |
| 4888 } | |
| 4889 | |
| 4890 /* | |
| 4891 * The last line to be formatted. | |
| 4892 */ | |
| 4893 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
| 4894 { | |
| 4895 next_is_not_par = TRUE; | |
| 4896 #ifdef FEAT_COMMENTS | |
| 4897 next_leader_len = 0; | |
| 4898 next_leader_flags = NULL; | |
| 4899 #endif | |
| 4900 } | |
| 4901 else | |
| 4902 { | |
| 4903 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
| 4904 #ifdef FEAT_COMMENTS | |
| 4905 , &next_leader_len, &next_leader_flags, do_comments | |
| 4906 #endif | |
| 4907 ); | |
| 4908 if (do_number_indent) | |
| 4909 next_is_start_par = | |
| 4910 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
| 4911 } | |
| 4912 advance = TRUE; | |
| 4913 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
| 4914 if (!is_end_par && do_trail_white) | |
| 4915 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
| 4916 | |
| 4917 /* | |
| 4918 * Skip lines that are not in a paragraph. | |
| 4919 */ | |
| 4920 if (is_not_par) | |
| 4921 { | |
| 4922 if (line_count < 0) | |
| 4923 break; | |
| 4924 } | |
| 4925 else | |
| 4926 { | |
| 4927 /* | |
| 4928 * For the first line of a paragraph, check indent of second line. | |
| 4929 * Don't do this for comments and empty lines. | |
| 4930 */ | |
| 4931 if (first_par_line | |
| 4932 && (do_second_indent || do_number_indent) | |
| 4933 && prev_is_end_par | |
| 3584 | 4934 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
| 4935 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
4936 if (do_second_indent && !LINEEMPTY(curwin->w_cursor.lnum + 1)) |
| 3584 | 4937 { |
| 4938 #ifdef FEAT_COMMENTS | |
| 4939 if (leader_len == 0 && next_leader_len == 0) | |
| 4940 { | |
| 4941 /* no comment found */ | |
| 4942 #endif | |
| 4943 second_indent = | |
| 4944 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
| 7 | 4945 #ifdef FEAT_COMMENTS |
| 3584 | 4946 } |
| 4947 else | |
| 4948 { | |
| 4949 second_indent = next_leader_len; | |
| 4950 do_comments_list = 1; | |
| 4951 } | |
| 4952 #endif | |
| 4953 } | |
| 7 | 4954 else if (do_number_indent) |
| 3584 | 4955 { |
| 4956 #ifdef FEAT_COMMENTS | |
| 4957 if (leader_len == 0 && next_leader_len == 0) | |
| 4958 { | |
| 4959 /* no comment found */ | |
| 4960 #endif | |
| 4961 second_indent = | |
| 4962 get_number_indent(curwin->w_cursor.lnum); | |
| 4963 #ifdef FEAT_COMMENTS | |
| 4964 } | |
| 4965 else | |
| 4966 { | |
| 4967 /* get_number_indent() is now "comment aware"... */ | |
| 4968 second_indent = | |
| 4969 get_number_indent(curwin->w_cursor.lnum); | |
| 4970 do_comments_list = 1; | |
| 4971 } | |
| 4972 #endif | |
| 4973 } | |
| 7 | 4974 } |
| 4975 | |
| 4976 /* | |
| 4977 * When the comment leader changes, it's the end of the paragraph. | |
| 4978 */ | |
| 4979 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
| 4980 #ifdef FEAT_COMMENTS | |
| 4981 || !same_leader(curwin->w_cursor.lnum, | |
| 4982 leader_len, leader_flags, | |
| 4983 next_leader_len, next_leader_flags) | |
| 4984 #endif | |
| 4985 ) | |
| 4986 is_end_par = TRUE; | |
| 4987 | |
| 4988 /* | |
| 4989 * If we have got to the end of a paragraph, or the line is | |
| 4990 * getting long, format it. | |
| 4991 */ | |
| 4992 if (is_end_par || force_format) | |
| 4993 { | |
| 4994 if (need_set_indent) | |
| 4995 /* replace indent in first line with minimal number of | |
| 4996 * tabs and spaces, according to current options */ | |
| 4997 (void)set_indent(get_indent(), SIN_CHANGED); | |
| 4998 | |
| 4999 /* put cursor on last non-space */ | |
| 5000 State = NORMAL; /* don't go past end-of-line */ | |
| 5001 coladvance((colnr_T)MAXCOL); | |
| 5002 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
| 5003 dec_cursor(); | |
| 5004 | |
| 5005 /* do the formatting, without 'showmode' */ | |
| 5006 State = INSERT; /* for open_line() */ | |
| 5007 smd_save = p_smd; | |
| 5008 p_smd = FALSE; | |
| 5009 insertchar(NUL, INSCHAR_FORMAT | |
| 5010 #ifdef FEAT_COMMENTS | |
| 5011 + (do_comments ? INSCHAR_DO_COM : 0) | |
| 3584 | 5012 + (do_comments && do_comments_list |
| 5013 ? INSCHAR_COM_LIST : 0) | |
| 7 | 5014 #endif |
| 1563 | 5015 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
| 7 | 5016 State = old_State; |
| 5017 p_smd = smd_save; | |
| 5018 second_indent = -1; | |
| 5019 /* at end of par.: need to set indent of next par. */ | |
| 5020 need_set_indent = is_end_par; | |
| 5021 if (is_end_par) | |
| 5022 { | |
| 5023 /* When called with a negative line count, break at the | |
| 5024 * end of the paragraph. */ | |
| 5025 if (line_count < 0) | |
| 5026 break; | |
| 5027 first_par_line = TRUE; | |
| 5028 } | |
| 5029 force_format = FALSE; | |
| 5030 } | |
| 5031 | |
| 5032 /* | |
| 5033 * When still in same paragraph, join the lines together. But | |
| 5403 | 5034 * first delete the leader from the second line. |
| 7 | 5035 */ |
| 5036 if (!is_end_par) | |
| 5037 { | |
| 5038 advance = FALSE; | |
| 5039 curwin->w_cursor.lnum++; | |
| 5040 curwin->w_cursor.col = 0; | |
| 5041 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
|
5042 break; |
| 7 | 5043 #ifdef FEAT_COMMENTS |
| 5044 if (next_leader_len > 0) | |
| 5403 | 5045 { |
| 5046 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
| 7 | 5047 mark_col_adjust(curwin->w_cursor.lnum, (colnr_T)0, 0L, |
| 5048 (long)-next_leader_len); | |
| 5403 | 5049 } else |
| 5050 #endif | |
| 5051 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
| 5052 { | |
| 5053 char_u *p = ml_get_curline(); | |
| 5415 | 5054 int indent = (int)(skipwhite(p) - p); |
| 5403 | 5055 |
| 5056 if (indent > 0) | |
| 5057 { | |
| 5058 (void)del_bytes(indent, FALSE, FALSE); | |
| 5059 mark_col_adjust(curwin->w_cursor.lnum, | |
| 5060 (colnr_T)0, 0L, (long)-indent); | |
| 5415 | 5061 } |
| 5403 | 5062 } |
| 7 | 5063 curwin->w_cursor.lnum--; |
| 5848 | 5064 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
| 7 | 5065 { |
| 5066 beep_flush(); | |
| 5067 break; | |
| 5068 } | |
| 5069 first_par_line = FALSE; | |
| 5070 /* If the line is getting long, format it next time */ | |
| 5071 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
| 5072 force_format = TRUE; | |
| 5073 else | |
| 5074 force_format = FALSE; | |
| 5075 } | |
| 5076 } | |
| 5077 line_breakcheck(); | |
| 5078 } | |
| 5079 } | |
| 5080 | |
| 5081 /* | |
| 5082 * Return TRUE if line "lnum" ends in a white character. | |
| 5083 */ | |
| 5084 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5085 ends_in_white(linenr_T lnum) |
| 7 | 5086 { |
| 5087 char_u *s = ml_get(lnum); | |
| 5088 size_t l; | |
| 5089 | |
| 5090 if (*s == NUL) | |
| 5091 return FALSE; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5092 /* Don't use STRLEN() inside VIM_ISWHITE(), SAS/C complains: "macro |
| 7 | 5093 * invocation may call function multiple times". */ |
| 5094 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
|
5095 return VIM_ISWHITE(s[l]); |
| 7 | 5096 } |
| 5097 | |
| 5098 /* | |
| 5099 * Blank lines, and lines containing only the comment leader, are left | |
| 5100 * untouched by the formatting. The function returns TRUE in this | |
| 5101 * case. It also returns TRUE when a line starts with the end of a comment | |
| 5102 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
| 5103 * previous line. A new paragraph starts after a blank line, or when the | |
| 5104 * comment leader changes -- webb. | |
| 5105 */ | |
| 5106 #ifdef FEAT_COMMENTS | |
| 5107 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5108 fmt_check_par( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5109 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5110 int *leader_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5111 char_u **leader_flags, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5112 int do_comments) |
| 7 | 5113 { |
| 5114 char_u *flags = NULL; /* init for GCC */ | |
| 5115 char_u *ptr; | |
| 5116 | |
| 5117 ptr = ml_get(lnum); | |
| 5118 if (do_comments) | |
| 3562 | 5119 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
| 7 | 5120 else |
| 5121 *leader_len = 0; | |
| 5122 | |
| 5123 if (*leader_len > 0) | |
| 5124 { | |
| 5125 /* | |
| 5126 * Search for 'e' flag in comment leader flags. | |
| 5127 */ | |
| 5128 flags = *leader_flags; | |
| 5129 while (*flags && *flags != ':' && *flags != COM_END) | |
| 5130 ++flags; | |
| 5131 } | |
| 5132 | |
| 5133 return (*skipwhite(ptr + *leader_len) == NUL | |
| 5134 || (*leader_len > 0 && *flags == COM_END) | |
| 5135 || startPS(lnum, NUL, FALSE)); | |
| 5136 } | |
| 5137 #else | |
| 5138 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5139 fmt_check_par(linenr_T lnum) |
| 7 | 5140 { |
| 5141 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
| 5142 } | |
| 5143 #endif | |
| 5144 | |
| 5145 /* | |
| 5146 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
| 5147 * previous line is in the same paragraph. Used for auto-formatting. | |
| 5148 */ | |
| 5149 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5150 paragraph_start(linenr_T lnum) |
| 7 | 5151 { |
| 5152 char_u *p; | |
| 5153 #ifdef FEAT_COMMENTS | |
| 5154 int leader_len = 0; /* leader len of current line */ | |
| 5155 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
| 5156 int next_leader_len; /* leader len of next line */ | |
| 5157 char_u *next_leader_flags; /* flags for leader of next line */ | |
| 5158 int do_comments; /* format comments */ | |
| 5159 #endif | |
| 5160 | |
| 5161 if (lnum <= 1) | |
| 5162 return TRUE; /* start of the file */ | |
| 5163 | |
| 5164 p = ml_get(lnum - 1); | |
| 5165 if (*p == NUL) | |
| 5166 return TRUE; /* after empty line */ | |
| 5167 | |
| 5168 #ifdef FEAT_COMMENTS | |
| 5169 do_comments = has_format_option(FO_Q_COMS); | |
| 5170 #endif | |
| 5171 if (fmt_check_par(lnum - 1 | |
| 5172 #ifdef FEAT_COMMENTS | |
| 5173 , &leader_len, &leader_flags, do_comments | |
| 5174 #endif | |
| 5175 )) | |
| 5176 return TRUE; /* after non-paragraph line */ | |
| 5177 | |
| 5178 if (fmt_check_par(lnum | |
| 5179 #ifdef FEAT_COMMENTS | |
| 5180 , &next_leader_len, &next_leader_flags, do_comments | |
| 5181 #endif | |
| 5182 )) | |
| 5183 return TRUE; /* "lnum" is not a paragraph line */ | |
| 5184 | |
| 5185 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
| 5186 return TRUE; /* missing trailing space in previous line. */ | |
| 5187 | |
| 5188 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
| 5189 return TRUE; /* numbered item starts in "lnum". */ | |
| 5190 | |
| 5191 #ifdef FEAT_COMMENTS | |
| 5192 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
| 5193 next_leader_len, next_leader_flags)) | |
| 5194 return TRUE; /* change of comment leader. */ | |
| 5195 #endif | |
| 5196 | |
| 5197 return FALSE; | |
| 5198 } | |
| 5199 | |
| 5200 /* | |
| 5201 * prepare a few things for block mode yank/delete/tilde | |
| 5202 * | |
| 5203 * for delete: | |
| 5204 * - textlen includes the first/last char to be (partly) deleted | |
| 5205 * - start/endspaces is the number of columns that are taken by the | |
| 5206 * first/last deleted char minus the number of columns that have to be | |
| 1839 | 5207 * deleted. |
| 5208 * for yank and tilde: | |
| 7 | 5209 * - textlen includes the first/last char to be wholly yanked |
| 5210 * - start/endspaces is the number of columns of the first/last yanked char | |
| 5211 * that are to be yanked. | |
| 5212 */ | |
| 5213 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5214 block_prep( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5215 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5216 struct block_def *bdp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5217 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5218 int is_del) |
| 7 | 5219 { |
| 5220 int incr = 0; | |
| 5221 char_u *pend; | |
| 5222 char_u *pstart; | |
| 5223 char_u *line; | |
| 5224 char_u *prev_pstart; | |
| 5225 char_u *prev_pend; | |
| 5226 | |
| 5227 bdp->startspaces = 0; | |
| 5228 bdp->endspaces = 0; | |
| 5229 bdp->textlen = 0; | |
| 5230 bdp->start_vcol = 0; | |
| 5231 bdp->end_vcol = 0; | |
| 5232 #ifdef FEAT_VISUALEXTRA | |
| 5233 bdp->is_short = FALSE; | |
| 5234 bdp->is_oneChar = FALSE; | |
| 5235 bdp->pre_whitesp = 0; | |
| 5236 bdp->pre_whitesp_c = 0; | |
| 5237 bdp->end_char_vcols = 0; | |
| 5238 #endif | |
| 5239 bdp->start_char_vcols = 0; | |
| 5240 | |
| 5241 line = ml_get(lnum); | |
| 5242 pstart = line; | |
| 5243 prev_pstart = line; | |
| 5244 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
| 5245 { | |
| 5246 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5995 | 5247 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
| 7 | 5248 bdp->start_vcol += incr; |
| 5249 #ifdef FEAT_VISUALEXTRA | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5250 if (VIM_ISWHITE(*pstart)) |
| 7 | 5251 { |
| 5252 bdp->pre_whitesp += incr; | |
| 5253 bdp->pre_whitesp_c++; | |
| 5254 } | |
| 5255 else | |
| 5256 { | |
| 5257 bdp->pre_whitesp = 0; | |
| 5258 bdp->pre_whitesp_c = 0; | |
| 5259 } | |
| 5260 #endif | |
| 5261 prev_pstart = pstart; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
5262 MB_PTR_ADV(pstart); |
| 7 | 5263 } |
| 5264 bdp->start_char_vcols = incr; | |
| 5265 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
| 5266 { | |
| 5267 bdp->end_vcol = bdp->start_vcol; | |
| 5268 #ifdef FEAT_VISUALEXTRA | |
| 5269 bdp->is_short = TRUE; | |
| 5270 #endif | |
| 5271 if (!is_del || oap->op_type == OP_APPEND) | |
| 5272 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
| 5273 } | |
| 5274 else | |
| 5275 { | |
| 5276 /* notice: this converts partly selected Multibyte characters to | |
| 5277 * spaces, too. */ | |
| 5278 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
| 5279 if (is_del && bdp->startspaces) | |
| 5280 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5281 pend = pstart; | |
| 5282 bdp->end_vcol = bdp->start_vcol; | |
| 5283 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
| 5284 { | |
| 5285 #ifdef FEAT_VISUALEXTRA | |
| 5286 bdp->is_oneChar = TRUE; | |
| 5287 #endif | |
| 5288 if (oap->op_type == OP_INSERT) | |
| 5289 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5290 else if (oap->op_type == OP_APPEND) | |
| 5291 { | |
| 5292 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
| 5293 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5294 } | |
| 5295 else | |
| 5296 { | |
| 5297 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
| 5298 if (is_del && oap->op_type != OP_LSHIFT) | |
| 5299 { | |
| 5300 /* just putting the sum of those two into | |
| 5301 * bdp->startspaces doesn't work for Visual replace, | |
| 5302 * so we have to split the tab in two */ | |
| 5303 bdp->startspaces = bdp->start_char_vcols | |
| 5304 - (bdp->start_vcol - oap->start_vcol); | |
| 5305 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
| 5306 } | |
| 5307 } | |
| 5308 } | |
| 5309 else | |
| 5310 { | |
| 5311 prev_pend = pend; | |
| 5312 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
| 5313 { | |
| 5314 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5315 prev_pend = pend; | |
| 6535 | 5316 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
| 7 | 5317 bdp->end_vcol += incr; |
| 5318 } | |
| 5319 if (bdp->end_vcol <= oap->end_vcol | |
| 5320 && (!is_del | |
| 5321 || oap->op_type == OP_APPEND | |
| 5322 || oap->op_type == OP_REPLACE)) /* line too short */ | |
| 5323 { | |
| 5324 #ifdef FEAT_VISUALEXTRA | |
| 5325 bdp->is_short = TRUE; | |
| 5326 #endif | |
| 5327 /* Alternative: include spaces to fill up the block. | |
| 5328 * Disadvantage: can lead to trailing spaces when the line is | |
| 5329 * short where the text is put */ | |
| 5330 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
| 5331 if (oap->op_type == OP_APPEND || virtual_op) | |
| 5332 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
| 593 | 5333 + oap->inclusive; |
| 7 | 5334 else |
| 5335 bdp->endspaces = 0; /* replace doesn't add characters */ | |
| 5336 } | |
| 5337 else if (bdp->end_vcol > oap->end_vcol) | |
| 5338 { | |
| 5339 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
| 5340 if (!is_del && bdp->endspaces) | |
| 5341 { | |
| 5342 bdp->endspaces = incr - bdp->endspaces; | |
| 5343 if (pend != pstart) | |
| 5344 pend = prev_pend; | |
| 5345 } | |
| 5346 } | |
| 5347 } | |
| 5348 #ifdef FEAT_VISUALEXTRA | |
| 5349 bdp->end_char_vcols = incr; | |
| 5350 #endif | |
| 5351 if (is_del && bdp->startspaces) | |
| 5352 pstart = prev_pstart; | |
| 5353 bdp->textlen = (int)(pend - pstart); | |
| 5354 } | |
| 5355 bdp->textcol = (colnr_T) (pstart - line); | |
| 5356 bdp->textstart = pstart; | |
| 5357 } | |
| 5358 | |
| 5359 /* | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5360 * Handle the add/subtract operator. |
| 7 | 5361 */ |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5362 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5363 op_addsub( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5364 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5365 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
|
5366 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
|
5367 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5368 pos_T pos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5369 struct block_def bd; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5370 int change_cnt = 0; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5371 linenr_T amount = Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5372 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5373 if (!VIsual_active) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5374 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5375 pos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5376 if (u_save_cursor() == FAIL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5377 return; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5378 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
|
5379 if (change_cnt) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5380 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
|
5381 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5382 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5383 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5384 int one_change; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5385 int length; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5386 pos_T startpos; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5387 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5388 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
|
5389 (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
|
5390 return; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5391 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5392 pos = oap->start; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5393 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
|
5394 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5395 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
|
5396 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5397 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
|
5398 pos.col = bd.textcol; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5399 length = bd.textlen; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5400 } |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5401 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
|
5402 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5403 curwin->w_cursor.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5404 pos.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5405 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
|
5406 } |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5407 else /* oap->motion_type == MCHAR */ |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5408 { |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5409 if (!oap->inclusive) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5410 dec(&(oap->end)); |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5411 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
|
5412 pos.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5413 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
|
5414 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5415 pos.col += oap->start.col; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5416 length -= oap->start.col; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5417 } |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5418 if (pos.lnum == oap->end.lnum) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5419 { |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5420 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
|
5421 if (oap->end.col >= length) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5422 oap->end.col = length - 1; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5423 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
|
5424 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5425 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5426 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
|
5427 if (one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5428 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5429 /* 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
|
5430 if (change_cnt == 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5431 startpos = curbuf->b_op_start; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5432 ++change_cnt; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5433 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5434 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5435 #ifdef FEAT_NETBEANS_INTG |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5436 if (netbeans_active() && one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5437 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5438 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
|
5439 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5440 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
|
5441 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
|
5442 &ptr[pos.col], length); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5443 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5444 #endif |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5445 if (g_cmd && one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5446 amount += Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5447 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5448 if (change_cnt) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5449 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
|
5450 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5451 if (!change_cnt && oap->is_VIsual) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5452 /* 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
|
5453 redraw_curbuf_later(INVERTED); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5454 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5455 /* 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
|
5456 * position from do_addsub(). */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5457 if (change_cnt > 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5458 curbuf->b_op_start = startpos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5459 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5460 if (change_cnt > p_report) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5461 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5462 if (change_cnt == 1) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5463 MSG(_("1 line changed")); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5464 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5465 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
|
5466 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5467 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5468 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5469 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5470 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5471 * 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
|
5472 * 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
|
5473 * |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5474 * 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
|
5475 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5476 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5477 do_addsub( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5478 int op_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5479 pos_T *pos, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5480 int length, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5481 linenr_T Prenum1) |
| 7 | 5482 { |
| 5483 int col; | |
| 5484 char_u *buf1; | |
| 5485 char_u buf2[NUMBUFLEN]; | |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5486 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
| 7 | 5487 static int hexupper = FALSE; /* 0xABC */ |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5488 uvarnumber_T n; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5489 uvarnumber_T oldn; |
| 7 | 5490 char_u *ptr; |
| 5491 int c; | |
| 5492 int todel; | |
| 5493 int dohex; | |
| 5494 int dooct; | |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5495 int dobin; |
| 7 | 5496 int doalp; |
| 5497 int firstdigit; | |
| 5498 int subtract; | |
| 6868 | 5499 int negative = FALSE; |
| 6891 | 5500 int was_positive = TRUE; |
| 6868 | 5501 int visual = VIsual_active; |
| 6921 | 5502 int did_change = FALSE; |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5503 pos_T save_cursor = curwin->w_cursor; |
| 6927 | 5504 int maxlen = 0; |
|
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5505 pos_T startpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5506 pos_T endpos; |
| 7 | 5507 |
| 5508 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
| 5509 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
|
5510 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
| 7 | 5511 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
| 5512 | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5513 curwin->w_cursor = *pos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5514 ptr = ml_get(pos->lnum); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5515 col = pos->col; |
|
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 (*ptr == NUL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5518 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5519 |
| 7 | 5520 /* |
| 5521 * First check if we are on a hexadecimal number, after the "0x". | |
| 5522 */ | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5523 if (!VIsual_active) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5524 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5525 if (dobin) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5526 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
|
5527 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5528 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5529 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5530 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5531 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
|
5532 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5533 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5534 |
| 6868 | 5535 if (dohex) |
| 5536 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
|
5537 { |
| 6868 | 5538 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5539 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5540 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5541 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
|
5542 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5543 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5544 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5545 if ( dobin |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5546 && dohex |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5547 && ! ((col > 0 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5548 && (ptr[col] == 'X' |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5549 || ptr[col] == 'x') |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5550 && ptr[col - 1] == '0' |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5551 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5552 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5553 !(*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
|
5554 #endif |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5555 && vim_isxdigit(ptr[col + 1])))) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5556 { |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5557 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5558 /* 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
|
5559 |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5560 col = pos->col; |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5561 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5562 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
|
5563 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5564 col--; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5565 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5566 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5567 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
|
5568 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5569 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5570 } |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5571 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5572 if (( dohex |
| 6868 | 5573 && col > 0 |
| 5574 && (ptr[col] == 'X' | |
| 5575 || ptr[col] == 'x') | |
| 5576 && ptr[col - 1] == '0' | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5577 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5578 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5579 !(*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
|
5580 #endif |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5581 && vim_isxdigit(ptr[col + 1])) || |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5582 ( dobin |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5583 && col > 0 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5584 && (ptr[col] == 'B' |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5585 || ptr[col] == 'b') |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5586 && ptr[col - 1] == '0' |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5587 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5588 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5589 !(*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
|
5590 #endif |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5591 && vim_isbdigit(ptr[col + 1]))) |
| 6868 | 5592 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5593 /* Found hexadecimal or binary number, move to its start. */ |
| 7 | 5594 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5595 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5596 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5597 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
|
5598 #endif |
| 6868 | 5599 } |
| 5600 else | |
| 7 | 5601 { |
| 6868 | 5602 /* |
| 5603 * Search forward and then backward to find the start of number. | |
| 5604 */ | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5605 col = pos->col; |
| 6868 | 5606 |
| 5607 while (ptr[col] != NUL | |
| 5608 && !vim_isdigit(ptr[col]) | |
| 5609 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5610 col += MB_PTR2LEN(ptr + col); |
| 6868 | 5611 |
| 5612 while (col > 0 | |
| 5613 && vim_isdigit(ptr[col - 1]) | |
| 5614 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5615 { |
| 6868 | 5616 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5617 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5618 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5619 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
|
5620 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5621 } |
| 6868 | 5622 } |
| 5623 } | |
| 5624 | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5625 if (visual) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5626 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5627 while (ptr[col] != NUL && length > 0 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5628 && !vim_isdigit(ptr[col]) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5629 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5630 { |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5631 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
|
5632 |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5633 col += mb_len; |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5634 length -= mb_len; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5635 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5636 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5637 if (length == 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5638 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5639 |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5640 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
|
5641 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5642 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5643 !(*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
|
5644 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5645 ) |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5646 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5647 negative = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5648 was_positive = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5649 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5650 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5651 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5652 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5653 * 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
|
5654 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5655 firstdigit = ptr[col]; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5656 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
|
5657 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5658 beep_flush(); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5659 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5660 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5661 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5662 if (doalp && ASCII_ISALPHA(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5663 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5664 /* decrement or increment alphabetic character */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5665 if (op_type == OP_NR_SUB) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5666 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5667 if (CharOrd(firstdigit) < Prenum1) |
| 6927 | 5668 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5669 if (isupper(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5670 firstdigit = 'A'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5671 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5672 firstdigit = 'a'; |
| 6927 | 5673 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5674 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5675 #ifdef EBCDIC |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5676 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5677 #else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5678 firstdigit -= Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5679 #endif |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5680 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5681 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5682 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5683 if (26 - CharOrd(firstdigit) - 1 < Prenum1) |
| 6927 | 5684 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5685 if (isupper(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5686 firstdigit = 'Z'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5687 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5688 firstdigit = 'z'; |
| 6927 | 5689 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5690 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5691 #ifdef EBCDIC |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5692 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5693 #else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5694 firstdigit += Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5695 #endif |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5696 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5697 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5698 if (!did_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5699 startpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5700 did_change = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5701 (void)del_char(FALSE); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5702 ins_char(firstdigit); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5703 endpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5704 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5705 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5706 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5707 { |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5708 if (col > 0 && ptr[col - 1] == '-' |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5709 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5710 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5711 !(*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
|
5712 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5713 && !visual) |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5714 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5715 /* negative number */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5716 --col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5717 negative = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5718 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5719 /* get the number value (unsigned) */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5720 if (visual && VIsual_mode != 'V') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5721 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
|
5722 ? (int)STRLEN(ptr) - col |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5723 : length); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5724 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5725 vim_str2nr(ptr + col, &pre, &length, |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5726 0 + (dobin ? STR2NR_BIN : 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5727 + (dooct ? STR2NR_OCT : 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5728 + (dohex ? STR2NR_HEX : 0), |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5729 NULL, &n, maxlen); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5730 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5731 /* 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
|
5732 if (pre && negative) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5733 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5734 ++col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5735 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5736 negative = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5737 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5738 /* add or subtract */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5739 subtract = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5740 if (op_type == OP_NR_SUB) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5741 subtract ^= TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5742 if (negative) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5743 subtract ^= TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5744 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5745 oldn = n; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5746 if (subtract) |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5747 n -= (uvarnumber_T)Prenum1; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5748 else |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5749 n += (uvarnumber_T)Prenum1; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5750 /* handle wraparound for decimal numbers */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5751 if (!pre) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5752 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5753 if (subtract) |
| 6927 | 5754 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5755 if (n > oldn) |
| 6868 | 5756 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5757 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
|
5758 negative ^= TRUE; |
| 6868 | 5759 } |
| 7 | 5760 } |
| 5761 else | |
| 6868 | 5762 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5763 /* add */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5764 if (n < oldn) |
| 6868 | 5765 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5766 n = (n ^ (uvarnumber_T)-1); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5767 negative ^= TRUE; |
| 6868 | 5768 } |
| 6927 | 5769 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5770 if (n == 0) |
| 6868 | 5771 negative = FALSE; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5772 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5773 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5774 if (visual && !was_positive && !negative && col > 0) |
|
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 /* need to remove the '-' */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5777 col--; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5778 length++; |
|
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 * Delete the old 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 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5785 if (!did_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5786 startpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5787 did_change = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5788 todel = length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5789 c = gchar_cursor(); |
|
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 * 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
|
5792 * 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
|
5793 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5794 if (c == '-') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5795 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5796 while (todel-- > 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5797 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5798 if (c < 0x100 && isalpha(c)) |
| 6868 | 5799 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5800 if (isupper(c)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5801 hexupper = TRUE; |
| 6868 | 5802 else |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5803 hexupper = FALSE; |
| 6891 | 5804 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5805 /* 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
|
5806 (void)del_char(FALSE); |
| 6868 | 5807 c = gchar_cursor(); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5808 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5809 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5810 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5811 * Prepare the leading characters in buf1[]. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5812 * 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
|
5813 * Allocate a bit too much. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5814 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5815 buf1 = alloc((unsigned)length + NUMBUFLEN); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5816 if (buf1 == NULL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5817 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5818 ptr = buf1; |
|
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
5819 if (negative && (!visual || was_positive)) |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5820 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5821 *ptr++ = '-'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5822 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5823 if (pre) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5824 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5825 *ptr++ = '0'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5826 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5827 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5828 if (pre == 'b' || pre == 'B' || |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5829 pre == 'x' || pre == 'X') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5830 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5831 *ptr++ = pre; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5832 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5833 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5834 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5835 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5836 * Put the number characters in buf2[]. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5837 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5838 if (pre == 'b' || pre == 'B') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5839 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5840 int i; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5841 int bit = 0; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5842 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
|
5843 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5844 /* leading zeros */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5845 for (bit = bits; bit > 0; bit--) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5846 if ((n >> (bit - 1)) & 0x1) break; |
|
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 for (i = 0; bit > 0; bit--) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5849 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
|
5850 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5851 buf2[i] = '\0'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5852 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5853 else if (pre == 0) |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5854 vim_snprintf((char *)buf2, NUMBUFLEN, "%llu", n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5855 else if (pre == '0') |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5856 vim_snprintf((char *)buf2, NUMBUFLEN, "%llo", n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5857 else if (pre && hexupper) |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5858 vim_snprintf((char *)buf2, NUMBUFLEN, "%llX", n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5859 else |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5860 vim_snprintf((char *)buf2, NUMBUFLEN, "%llx", n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5861 length -= (int)STRLEN(buf2); |
|
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 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5864 * 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
|
5865 * 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
|
5866 * Don't do this when |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5867 * 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
|
5868 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5869 if (firstdigit == '0' && !(dooct && pre == 0)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5870 while (length-- > 0) |
| 6868 | 5871 *ptr++ = '0'; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5872 *ptr = NUL; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5873 STRCAT(buf1, buf2); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5874 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
|
5875 vim_free(buf1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5876 endpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5877 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
|
5878 --curwin->w_cursor.col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5879 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5880 |
|
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5881 if (did_change) |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5882 { |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5883 /* set the '[ and '] marks */ |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5884 curbuf->b_op_start = startpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5885 curbuf->b_op_end = endpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5886 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
|
5887 --curbuf->b_op_end.col; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5888 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5889 |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5890 theend: |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5891 if (visual) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5892 curwin->w_cursor = save_cursor; |
|
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5893 else if (did_change) |
|
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5894 curwin->w_set_curswant = TRUE; |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5895 |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5896 return did_change; |
| 7 | 5897 } |
| 5898 | |
| 5899 #ifdef FEAT_VIMINFO | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5900 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5901 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
|
5902 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5903 #define REG_PREVIOUS 1 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5904 #define REG_EXEC 2 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5905 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5906 /* |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5907 * 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
|
5908 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5909 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5910 prepare_viminfo_registers(void) |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5911 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5912 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
|
5913 * (int)sizeof(yankreg_T)); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5914 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5915 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5916 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5917 finish_viminfo_registers(void) |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5918 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5919 int i; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5920 int j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5921 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5922 if (y_read_regs != NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5923 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5924 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
|
5925 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
|
5926 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5927 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
|
5928 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
|
5929 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
|
5930 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5931 vim_free(y_read_regs); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5932 y_read_regs = NULL; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5933 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5934 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5935 |
| 7 | 5936 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5937 read_viminfo_register(vir_T *virp, int force) |
| 7 | 5938 { |
| 5939 int eof; | |
| 5940 int do_it = TRUE; | |
| 5941 int size; | |
| 5942 int limit; | |
| 5943 int i; | |
| 5944 int set_prev = FALSE; | |
| 5945 char_u *str; | |
| 5946 char_u **array = NULL; | |
| 6508 | 5947 int new_type = MCHAR; /* init to shut up compiler */ |
| 5948 colnr_T new_width = 0; /* init to shut up compiler */ | |
| 7 | 5949 |
| 5950 /* We only get here (hopefully) if line[0] == '"' */ | |
| 5951 str = virp->vir_line + 1; | |
| 1893 | 5952 |
| 5953 /* If the line starts with "" this is the y_previous register. */ | |
| 7 | 5954 if (*str == '"') |
| 5955 { | |
| 5956 set_prev = TRUE; | |
| 5957 str++; | |
| 5958 } | |
| 1893 | 5959 |
| 7 | 5960 if (!ASCII_ISALNUM(*str) && *str != '-') |
| 5961 { | |
| 5962 if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line)) | |
| 5963 return TRUE; /* too many errors, pretend end-of-file */ | |
| 5964 do_it = FALSE; | |
| 5965 } | |
| 5966 get_yank_register(*str++, FALSE); | |
| 5967 if (!force && y_current->y_array != NULL) | |
| 5968 do_it = FALSE; | |
| 1893 | 5969 |
| 5970 if (*str == '@') | |
| 5971 { | |
| 5972 /* "x@: register x used for @@ */ | |
| 5973 if (force || execreg_lastc == NUL) | |
| 5974 execreg_lastc = str[-1]; | |
| 5975 } | |
| 5976 | |
| 7 | 5977 size = 0; |
| 5978 limit = 100; /* Optimized for registers containing <= 100 lines */ | |
| 5979 if (do_it) | |
| 5980 { | |
| 6462 | 5981 /* |
| 5982 * Build the new register in array[]. | |
| 5983 * y_array is kept as-is until done. | |
| 5984 * The "do_it" flag is reset when something is wrong, in which case | |
| 5985 * array[] needs to be freed. | |
| 5986 */ | |
| 7 | 5987 if (set_prev) |
| 5988 y_previous = y_current; | |
| 6462 | 5989 array = (char_u **)alloc((unsigned)(limit * sizeof(char_u *))); |
| 1893 | 5990 str = skipwhite(skiptowhite(str)); |
| 7 | 5991 if (STRNCMP(str, "CHAR", 4) == 0) |
| 6462 | 5992 new_type = MCHAR; |
| 7 | 5993 else if (STRNCMP(str, "BLOCK", 5) == 0) |
| 6462 | 5994 new_type = MBLOCK; |
| 7 | 5995 else |
| 6462 | 5996 new_type = MLINE; |
| 7 | 5997 /* get the block width; if it's missing we get a zero, which is OK */ |
| 5998 str = skipwhite(skiptowhite(str)); | |
| 6462 | 5999 new_width = getdigits(&str); |
| 7 | 6000 } |
| 6001 | |
| 6002 while (!(eof = viminfo_readline(virp)) | |
| 6003 && (virp->vir_line[0] == TAB || virp->vir_line[0] == '<')) | |
| 6004 { | |
| 6005 if (do_it) | |
| 6006 { | |
| 6462 | 6007 if (size == limit) |
| 7 | 6008 { |
| 6462 | 6009 char_u **new_array = (char_u **) |
| 7 | 6010 alloc((unsigned)(limit * 2 * sizeof(char_u *))); |
| 6462 | 6011 |
| 6012 if (new_array == NULL) | |
| 6013 { | |
| 6014 do_it = FALSE; | |
| 6015 break; | |
| 6016 } | |
| 7 | 6017 for (i = 0; i < limit; i++) |
| 6462 | 6018 new_array[i] = array[i]; |
| 7 | 6019 vim_free(array); |
| 6462 | 6020 array = new_array; |
| 7 | 6021 limit *= 2; |
| 6022 } | |
| 6023 str = viminfo_readstring(virp, 1, TRUE); | |
| 6024 if (str != NULL) | |
| 6025 array[size++] = str; | |
| 6026 else | |
| 6462 | 6027 /* error, don't store the result */ |
| 7 | 6028 do_it = FALSE; |
| 6029 } | |
| 6030 } | |
| 6508 | 6031 |
| 7 | 6032 if (do_it) |
| 6033 { | |
| 6462 | 6034 /* free y_array[] */ |
| 6035 for (i = 0; i < y_current->y_size; i++) | |
| 6036 vim_free(y_current->y_array[i]); | |
| 6037 vim_free(y_current->y_array); | |
| 6038 | |
| 6039 y_current->y_type = new_type; | |
| 6040 y_current->y_width = new_width; | |
| 6041 y_current->y_size = size; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6042 y_current->y_time_set = 0; |
| 7 | 6043 if (size == 0) |
| 6044 { | |
| 6045 y_current->y_array = NULL; | |
| 6046 } | |
| 6462 | 6047 else |
| 7 | 6048 { |
| 6462 | 6049 /* Move the lines from array[] to y_array[]. */ |
| 7 | 6050 y_current->y_array = |
| 6051 (char_u **)alloc((unsigned)(size * sizeof(char_u *))); | |
| 6052 for (i = 0; i < size; i++) | |
| 6462 | 6053 { |
| 6054 if (y_current->y_array == NULL) | |
| 6055 vim_free(array[i]); | |
| 6056 else | |
| 6057 y_current->y_array[i] = array[i]; | |
| 6058 } | |
| 7 | 6059 } |
| 6462 | 6060 } |
| 6061 else | |
| 6062 { | |
| 6063 /* Free array[] if it was filled. */ | |
| 6064 for (i = 0; i < size; i++) | |
| 6065 vim_free(array[i]); | |
| 6066 } | |
| 6067 vim_free(array); | |
| 6068 | |
| 7 | 6069 return eof; |
| 6070 } | |
| 6071 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6072 /* |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6073 * 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
|
6074 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6075 void |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6076 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
|
6077 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6078 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
|
6079 int flags; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6080 int name; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6081 int type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6082 int linecount; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6083 int width; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6084 time_t timestamp; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6085 yankreg_T *y_ptr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6086 int i; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6087 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6088 /* Check the format: |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6089 * |{bartype},{flags},{name},{type}, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6090 * {linecount},{width},{timestamp},"line1","line2" |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6091 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6092 if (values->ga_len < 6 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6093 || vp[0].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6094 || vp[1].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6095 || vp[2].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6096 || vp[3].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6097 || vp[4].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6098 || vp[5].bv_type != BVAL_NR) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6099 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6100 flags = vp[0].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6101 name = vp[1].bv_nr; |
|
9307
eb52a2670c96
commit https://github.com/vim/vim/commit/67e3720a9ddd8a9d2e8344358c28fa1f4196db0d
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
6102 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
|
6103 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6104 type = vp[2].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6105 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
|
6106 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6107 linecount = vp[3].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6108 if (values->ga_len < 6 + linecount) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6109 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6110 width = vp[4].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6111 if (width < 0) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6112 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6113 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6114 if (y_read_regs != NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6115 /* 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
|
6116 * 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
|
6117 y_ptr = &y_read_regs[name]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6118 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6119 y_ptr = &y_regs[name]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6120 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6121 /* 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
|
6122 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
|
6123 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
|
6124 && (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
|
6125 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6126 |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6127 if (y_ptr->y_array != NULL) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6128 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
|
6129 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
|
6130 vim_free(y_ptr->y_array); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6131 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6132 if (y_read_regs == NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6133 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6134 if (flags & REG_PREVIOUS) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6135 y_previous = y_ptr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6136 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
|
6137 execreg_lastc = get_register_name(name); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6138 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6139 y_ptr->y_type = type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6140 y_ptr->y_width = width; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6141 y_ptr->y_size = linecount; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6142 y_ptr->y_time_set = timestamp; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6143 if (linecount == 0) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6144 y_ptr->y_array = NULL; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6145 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6146 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6147 y_ptr->y_array = |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6148 (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
|
6149 for (i = 0; i < linecount; i++) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6150 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6151 if (vp[i + 6].bv_allocated) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6152 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6153 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
|
6154 vp[i + 6].bv_string = NULL; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6155 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6156 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6157 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
|
6158 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6159 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6160 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6161 |
| 7 | 6162 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6163 write_viminfo_registers(FILE *fp) |
| 7 | 6164 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6165 int i, j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6166 char_u *type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6167 char_u c; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6168 int num_lines; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6169 int max_num_lines; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6170 int max_kbyte; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6171 long len; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6172 yankreg_T *y_ptr; |
| 7 | 6173 |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
6174 fputs(_("\n# Registers:\n"), fp); |
| 7 | 6175 |
| 6176 /* Get '<' value, use old '"' value if '<' is not found. */ | |
| 6177 max_num_lines = get_viminfo_parameter('<'); | |
| 6178 if (max_num_lines < 0) | |
| 6179 max_num_lines = get_viminfo_parameter('"'); | |
| 6180 if (max_num_lines == 0) | |
| 6181 return; | |
| 6182 max_kbyte = get_viminfo_parameter('s'); | |
| 6183 if (max_kbyte == 0) | |
| 6184 return; | |
| 1893 | 6185 |
| 7 | 6186 for (i = 0; i < NUM_REGISTERS; i++) |
| 6187 { | |
| 6188 #ifdef FEAT_CLIPBOARD | |
| 6189 /* Skip '*'/'+' register, we don't want them back next time */ | |
| 6190 if (i == STAR_REGISTER || i == PLUS_REGISTER) | |
| 6191 continue; | |
| 6192 #endif | |
| 6193 #ifdef FEAT_DND | |
| 6194 /* Neither do we want the '~' register */ | |
| 6195 if (i == TILDE_REGISTER) | |
| 6196 continue; | |
| 6197 #endif | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6198 /* 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
|
6199 * viminfo if it's newer. */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6200 if (y_read_regs != NULL |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6201 && 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
|
6202 && (y_regs[i].y_array == NULL || |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6203 y_read_regs[i].y_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
|
6204 y_ptr = &y_read_regs[i]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6205 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
|
6206 continue; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6207 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6208 y_ptr = &y_regs[i]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6209 |
| 55 | 6210 /* Skip empty registers. */ |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6211 num_lines = y_ptr->y_size; |
| 55 | 6212 if (num_lines == 0 |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6213 || (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
|
6214 && *y_ptr->y_array[0] == NUL)) |
| 55 | 6215 continue; |
| 6216 | |
| 7 | 6217 if (max_kbyte > 0) |
| 6218 { | |
| 6219 /* Skip register if there is more text than the maximum size. */ | |
| 6220 len = 0; | |
| 6221 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
|
6222 len += (long)STRLEN(y_ptr->y_array[j]) + 1L; |
| 7 | 6223 if (len > (long)max_kbyte * 1024L) |
| 6224 continue; | |
| 6225 } | |
| 6226 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6227 switch (y_ptr->y_type) |
| 7 | 6228 { |
| 6229 case MLINE: | |
| 6230 type = (char_u *)"LINE"; | |
| 6231 break; | |
| 6232 case MCHAR: | |
| 6233 type = (char_u *)"CHAR"; | |
| 6234 break; | |
| 6235 case MBLOCK: | |
| 6236 type = (char_u *)"BLOCK"; | |
| 6237 break; | |
| 6238 default: | |
| 6239 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
|
6240 y_ptr->y_type); |
| 7 | 6241 emsg(IObuff); |
| 6242 type = (char_u *)"LINE"; | |
| 6243 break; | |
| 6244 } | |
| 6245 if (y_previous == &y_regs[i]) | |
| 6246 fprintf(fp, "\""); | |
| 6247 c = get_register_name(i); | |
| 1893 | 6248 fprintf(fp, "\"%c", c); |
| 6249 if (c == execreg_lastc) | |
| 6250 fprintf(fp, "@"); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6251 fprintf(fp, "\t%s\t%d\n", type, (int)y_ptr->y_width); |
| 7 | 6252 |
| 6253 /* If max_num_lines < 0, then we save ALL the lines in the register */ | |
| 6254 if (max_num_lines > 0 && num_lines > max_num_lines) | |
| 6255 num_lines = max_num_lines; | |
| 6256 for (j = 0; j < num_lines; j++) | |
| 6257 { | |
| 6258 putc('\t', fp); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6259 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
|
6260 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6261 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6262 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6263 int flags = 0; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6264 int remaining; |
|
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 /* 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
|
6267 * |{bartype},{flags},{name},{type}, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6268 * {linecount},{width},{timestamp},"line1","line2" |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6269 * flags: REG_PREVIOUS - register is y_previous |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6270 * REG_EXEC - used for @@ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6271 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6272 if (y_previous == &y_regs[i]) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6273 flags |= REG_PREVIOUS; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6274 if (c == execreg_lastc) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6275 flags |= REG_EXEC; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6276 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
|
6277 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
|
6278 (long)y_ptr->y_time_set); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6279 /* 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
|
6280 remaining = LSIZE - 71; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6281 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
|
6282 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6283 putc(',', fp); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6284 --remaining; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6285 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
|
6286 remaining); |
|
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 putc('\n', fp); |
| 7 | 6289 } |
| 6290 } | |
| 6291 } | |
| 6292 #endif /* FEAT_VIMINFO */ | |
| 6293 | |
| 6294 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
| 6295 /* | |
| 6296 * SELECTION / PRIMARY ('*') | |
| 6297 * | |
| 6298 * Text selection stuff that uses the GUI selection register '*'. When using a | |
| 6299 * GUI this may be text from another window, otherwise it is the last text we | |
| 6300 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
| 6301 * button performs the paste, otherwise you will need to do <"*p>. " | |
| 6302 * If not under X, it is synonymous with the clipboard register '+'. | |
| 6303 * | |
| 6304 * X CLIPBOARD ('+') | |
| 6305 * | |
| 6306 * Text selection stuff that uses the GUI clipboard register '+'. | |
| 6307 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
| 6308 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
| 6309 * otherwise you will need to do <"+p>. " | |
| 6310 * If not under X, it is synonymous with the selection register '*'. | |
| 6311 */ | |
| 6312 | |
| 6313 /* | |
| 6314 * 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
|
6315 * so that the text is still available after Vim has exited. X selections |
| 7 | 6316 * only exist while the owning application exists, so we write to the |
| 6317 * permanent (while X runs) store CUT_BUFFER0. | |
| 6318 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
| 6319 * 'permanent' of the two), otherwise the PRIMARY one. | |
| 6320 * For now, use a hard-coded sanity limit of 1Mb of data. | |
| 6321 */ | |
|
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
6322 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
| 7 | 6323 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6324 x11_export_final_selection(void) |
| 7 | 6325 { |
| 6326 Display *dpy; | |
| 6327 char_u *str = NULL; | |
| 6328 long_u len = 0; | |
| 6329 int motion_type = -1; | |
| 6330 | |
| 6331 # ifdef FEAT_GUI | |
| 6332 if (gui.in_use) | |
| 6333 dpy = X_DISPLAY; | |
| 6334 else | |
| 6335 # endif | |
| 6336 # ifdef FEAT_XCLIPBOARD | |
| 6337 dpy = xterm_dpy; | |
| 6338 # else | |
| 6339 return; | |
| 6340 # endif | |
| 6341 | |
| 6342 /* Get selection to export */ | |
| 6343 if (clip_plus.owned) | |
| 6344 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
| 6345 else if (clip_star.owned) | |
| 6346 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
| 6347 | |
| 6348 /* Check it's OK */ | |
| 6349 if (dpy != NULL && str != NULL && motion_type >= 0 | |
| 6350 && len < 1024*1024 && len > 0) | |
| 6351 { | |
| 1924 | 6352 #ifdef FEAT_MBYTE |
| 4201 | 6353 int ok = TRUE; |
| 6354 | |
| 1924 | 6355 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
| 6356 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
| 6357 * encoding conversion usually doesn't work, so keep the text as-is. | |
| 6358 */ | |
| 6359 if (has_mbyte) | |
| 6360 { | |
| 6361 vimconv_T vc; | |
| 6362 | |
| 6363 vc.vc_type = CONV_NONE; | |
| 6364 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
| 6365 { | |
|
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6366 int intlen = len; |
|
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6367 char_u *conv_str; |
| 2007 | 6368 |
| 4201 | 6369 vc.vc_fail = TRUE; |
| 2007 | 6370 conv_str = string_convert(&vc, str, &intlen); |
| 6371 len = intlen; | |
| 1924 | 6372 if (conv_str != NULL) |
| 6373 { | |
| 6374 vim_free(str); | |
| 6375 str = conv_str; | |
| 6376 } | |
| 4201 | 6377 else |
| 6378 { | |
| 6379 ok = FALSE; | |
| 6380 } | |
| 1924 | 6381 convert_setup(&vc, NULL, NULL); |
| 6382 } | |
| 4201 | 6383 else |
| 6384 { | |
| 6385 ok = FALSE; | |
| 6386 } | |
| 1924 | 6387 } |
| 4201 | 6388 |
| 6389 /* Do not store the string if conversion failed. Better to use any | |
| 6390 * other selection than garbled text. */ | |
| 6391 if (ok) | |
| 6392 #endif | |
| 6393 { | |
| 6394 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
| 6395 XFlush(dpy); | |
| 6396 } | |
| 7 | 6397 } |
| 6398 | |
| 6399 vim_free(str); | |
| 6400 } | |
| 6401 #endif | |
| 6402 | |
| 6403 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6404 clip_free_selection(VimClipboard *cbd) |
| 7 | 6405 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6406 yankreg_T *y_ptr = y_current; |
| 7 | 6407 |
| 6408 if (cbd == &clip_plus) | |
| 6409 y_current = &y_regs[PLUS_REGISTER]; | |
| 6410 else | |
| 6411 y_current = &y_regs[STAR_REGISTER]; | |
| 6412 free_yank_all(); | |
| 6413 y_current->y_size = 0; | |
| 6414 y_current = y_ptr; | |
| 6415 } | |
| 6416 | |
| 6417 /* | |
| 6418 * Get the selected text and put it in the gui selection register '*' or '+'. | |
| 6419 */ | |
| 6420 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6421 clip_get_selection(VimClipboard *cbd) |
| 7 | 6422 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6423 yankreg_T *old_y_previous, *old_y_current; |
| 7 | 6424 pos_T old_cursor; |
| 6425 pos_T old_visual; | |
| 6426 int old_visual_mode; | |
| 6427 colnr_T old_curswant; | |
| 6428 int old_set_curswant; | |
| 6429 pos_T old_op_start, old_op_end; | |
| 6430 oparg_T oa; | |
| 6431 cmdarg_T ca; | |
| 6432 | |
| 6433 if (cbd->owned) | |
| 6434 { | |
| 6435 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
| 6436 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
| 6437 return; | |
| 6438 | |
| 6439 /* Get the text between clip_star.start & clip_star.end */ | |
| 6440 old_y_previous = y_previous; | |
| 6441 old_y_current = y_current; | |
| 6442 old_cursor = curwin->w_cursor; | |
| 6443 old_curswant = curwin->w_curswant; | |
| 6444 old_set_curswant = curwin->w_set_curswant; | |
| 6445 old_op_start = curbuf->b_op_start; | |
| 6446 old_op_end = curbuf->b_op_end; | |
| 6447 old_visual = VIsual; | |
| 6448 old_visual_mode = VIsual_mode; | |
| 6449 clear_oparg(&oa); | |
| 6450 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
| 6451 oa.op_type = OP_YANK; | |
| 6452 vim_memset(&ca, 0, sizeof(ca)); | |
| 6453 ca.oap = &oa; | |
| 6454 ca.cmdchar = 'y'; | |
| 6455 ca.count1 = 1; | |
| 6456 ca.retval = CA_NO_ADJ_OP_END; | |
| 6457 do_pending_operator(&ca, 0, TRUE); | |
| 6458 y_previous = old_y_previous; | |
| 6459 y_current = old_y_current; | |
| 6460 curwin->w_cursor = old_cursor; | |
| 688 | 6461 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
| 7 | 6462 curwin->w_curswant = old_curswant; |
| 6463 curwin->w_set_curswant = old_set_curswant; | |
| 6464 curbuf->b_op_start = old_op_start; | |
| 6465 curbuf->b_op_end = old_op_end; | |
| 6466 VIsual = old_visual; | |
| 6467 VIsual_mode = old_visual_mode; | |
| 6468 } | |
|
11273
96d83cd2904a
patch 8.0.0522: Win32: when 'clipboard' is "unnamed" yyp does not work
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
6469 else if (!is_clipboard_needs_update()) |
| 7 | 6470 { |
| 6471 clip_free_selection(cbd); | |
| 6472 | |
| 6473 /* Try to get selected text from another window */ | |
| 6474 clip_gen_request_selection(cbd); | |
| 6475 } | |
| 6476 } | |
| 6477 | |
| 2896 | 6478 /* |
| 6479 * Convert from the GUI selection string into the '*'/'+' register. | |
| 6480 */ | |
| 7 | 6481 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6482 clip_yank_selection( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6483 int type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6484 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6485 long len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6486 VimClipboard *cbd) |
| 7 | 6487 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6488 yankreg_T *y_ptr; |
| 7 | 6489 |
| 6490 if (cbd == &clip_plus) | |
| 6491 y_ptr = &y_regs[PLUS_REGISTER]; | |
| 6492 else | |
| 6493 y_ptr = &y_regs[STAR_REGISTER]; | |
| 6494 | |
| 6495 clip_free_selection(cbd); | |
| 6496 | |
| 5798 | 6497 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
| 7 | 6498 } |
| 6499 | |
| 6500 /* | |
| 6501 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
| 6502 * with length *len. | |
| 6503 * Returns the motion type, or -1 for failure. | |
| 6504 */ | |
| 6505 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6506 clip_convert_selection(char_u **str, long_u *len, VimClipboard *cbd) |
| 7 | 6507 { |
| 6508 char_u *p; | |
| 6509 int lnum; | |
| 6510 int i, j; | |
| 6511 int_u eolsize; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6512 yankreg_T *y_ptr; |
| 7 | 6513 |
| 6514 if (cbd == &clip_plus) | |
| 6515 y_ptr = &y_regs[PLUS_REGISTER]; | |
| 6516 else | |
| 6517 y_ptr = &y_regs[STAR_REGISTER]; | |
| 6518 | |
| 6519 #ifdef USE_CRNL | |
| 6520 eolsize = 2; | |
| 6521 #else | |
| 6522 eolsize = 1; | |
| 6523 #endif | |
| 6524 | |
| 6525 *str = NULL; | |
| 6526 *len = 0; | |
| 6527 if (y_ptr->y_array == NULL) | |
| 6528 return -1; | |
| 6529 | |
| 6530 for (i = 0; i < y_ptr->y_size; i++) | |
| 6531 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
| 6532 | |
| 6533 /* | |
| 6534 * Don't want newline character at end of last line if we're in MCHAR mode. | |
| 6535 */ | |
| 6536 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
| 6537 *len -= eolsize; | |
| 6538 | |
| 6539 p = *str = lalloc(*len + 1, TRUE); /* add one to avoid zero */ | |
| 6540 if (p == NULL) | |
| 6541 return -1; | |
| 6542 lnum = 0; | |
| 6543 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
| 6544 { | |
| 6545 if (y_ptr->y_array[lnum][j] == '\n') | |
| 6546 p[i] = NUL; | |
| 6547 else if (y_ptr->y_array[lnum][j] == NUL) | |
| 6548 { | |
| 6549 #ifdef USE_CRNL | |
| 6550 p[i++] = '\r'; | |
| 6551 #endif | |
| 6552 #ifdef USE_CR | |
| 6553 p[i] = '\r'; | |
| 6554 #else | |
| 6555 p[i] = '\n'; | |
| 6556 #endif | |
| 6557 lnum++; | |
| 6558 j = -1; | |
| 6559 } | |
| 6560 else | |
| 6561 p[i] = y_ptr->y_array[lnum][j]; | |
| 6562 } | |
| 6563 return y_ptr->y_type; | |
| 6564 } | |
| 6565 | |
| 6566 | |
| 6567 /* | |
| 6568 * If we have written to a clipboard register, send the text to the clipboard. | |
| 6569 */ | |
| 6570 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6571 may_set_selection(void) |
| 7 | 6572 { |
| 6573 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
| 6574 { | |
| 6575 clip_own_selection(&clip_star); | |
| 6576 clip_gen_set_selection(&clip_star); | |
| 6577 } | |
| 6578 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
| 6579 { | |
| 6580 clip_own_selection(&clip_plus); | |
| 6581 clip_gen_set_selection(&clip_plus); | |
| 6582 } | |
| 6583 } | |
| 6584 | |
| 6585 #endif /* FEAT_CLIPBOARD || PROTO */ | |
| 6586 | |
| 6587 | |
| 6588 #if defined(FEAT_DND) || defined(PROTO) | |
| 6589 /* | |
| 6590 * Replace the contents of the '~' register with str. | |
| 6591 */ | |
| 6592 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6593 dnd_yank_drag_data(char_u *str, long len) |
| 7 | 6594 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6595 yankreg_T *curr; |
| 7 | 6596 |
| 6597 curr = y_current; | |
| 6598 y_current = &y_regs[TILDE_REGISTER]; | |
| 6599 free_yank_all(); | |
| 5798 | 6600 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
| 7 | 6601 y_current = curr; |
| 6602 } | |
| 6603 #endif | |
| 6604 | |
| 6605 | |
| 6606 #if defined(FEAT_EVAL) || defined(PROTO) | |
| 6607 /* | |
| 6608 * Return the type of a register. | |
| 6609 * Used for getregtype() | |
| 6610 * Returns MAUTO for error. | |
| 6611 */ | |
| 6612 char_u | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6613 get_reg_type(int regname, long *reglen) |
| 7 | 6614 { |
| 6615 switch (regname) | |
| 6616 { | |
| 6617 case '%': /* file name */ | |
| 6618 case '#': /* alternate file name */ | |
| 6619 case '=': /* expression */ | |
| 6620 case ':': /* last command line */ | |
| 6621 case '/': /* last search-pattern */ | |
| 6622 case '.': /* last inserted text */ | |
| 6623 #ifdef FEAT_SEARCHPATH | |
| 6624 case Ctrl_F: /* Filename under cursor */ | |
| 6625 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
| 6626 #endif | |
| 6627 case Ctrl_W: /* word under cursor */ | |
| 6628 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
| 6629 case '_': /* black hole: always empty */ | |
| 6630 return MCHAR; | |
| 6631 } | |
| 6632 | |
| 6633 #ifdef FEAT_CLIPBOARD | |
| 6634 regname = may_get_selection(regname); | |
| 6635 #endif | |
| 6636 | |
| 5596 | 6637 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
|
6638 return MAUTO; |
| 5596 | 6639 |
| 7 | 6640 get_yank_register(regname, FALSE); |
| 6641 | |
| 6642 if (y_current->y_array != NULL) | |
| 6643 { | |
| 6644 if (reglen != NULL && y_current->y_type == MBLOCK) | |
| 6645 *reglen = y_current->y_width; | |
| 6646 return y_current->y_type; | |
| 6647 } | |
| 6648 return MAUTO; | |
| 6649 } | |
| 6650 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
6651 static char_u *getreg_wrap_one_line(char_u *s, int flags); |
| 5796 | 6652 |
| 6653 /* | |
| 6654 * When "flags" has GREG_LIST return a list with text "s". | |
| 6655 * Otherwise just return "s". | |
| 6656 */ | |
| 6657 static char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6658 getreg_wrap_one_line(char_u *s, int flags) |
| 5796 | 6659 { |
| 6660 if (flags & GREG_LIST) | |
| 6661 { | |
| 6662 list_T *list = list_alloc(); | |
| 6663 | |
| 6664 if (list != NULL) | |
| 6665 { | |
| 6666 if (list_append_string(list, NULL, -1) == FAIL) | |
| 6667 { | |
|
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6668 list_free(list); |
| 5796 | 6669 return NULL; |
| 6670 } | |
| 6671 list->lv_first->li_tv.vval.v_string = s; | |
| 6672 } | |
| 6673 return (char_u *)list; | |
| 6674 } | |
| 6675 return s; | |
| 6676 } | |
| 6677 | |
| 7 | 6678 /* |
| 6679 * Return the contents of a register as a single allocated string. | |
| 6680 * Used for "@r" in expressions and for getreg(). | |
| 6681 * Returns NULL for error. | |
| 5796 | 6682 * Flags: |
| 6683 * GREG_NO_EXPR Do not allow expression register | |
| 6684 * GREG_EXPR_SRC For the expression register: return expression itself, | |
| 6685 * not the result of its evaluation. | |
| 6686 * GREG_LIST Return a list of lines in place of a single string. | |
| 7 | 6687 */ |
| 6688 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6689 get_reg_contents(int regname, int flags) |
| 7 | 6690 { |
| 6691 long i; | |
| 6692 char_u *retval; | |
| 6693 int allocated; | |
| 6694 long len; | |
| 6695 | |
| 6696 /* Don't allow using an expression register inside an expression */ | |
| 6697 if (regname == '=') | |
| 6698 { | |
| 5796 | 6699 if (flags & GREG_NO_EXPR) |
| 6700 return NULL; | |
| 6701 if (flags & GREG_EXPR_SRC) | |
| 6702 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
| 6703 return getreg_wrap_one_line(get_expr_line(), flags); | |
| 7 | 6704 } |
| 6705 | |
| 6706 if (regname == '@') /* "@@" is used for unnamed register */ | |
| 6707 regname = '"'; | |
| 6708 | |
| 6709 /* check for valid regname */ | |
| 6710 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
| 6711 return NULL; | |
| 6712 | |
| 6713 #ifdef FEAT_CLIPBOARD | |
| 6714 regname = may_get_selection(regname); | |
| 6715 #endif | |
| 6716 | |
| 6717 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
| 6718 { | |
| 6719 if (retval == NULL) | |
| 6720 return NULL; | |
| 5796 | 6721 if (allocated) |
| 6722 return getreg_wrap_one_line(retval, flags); | |
| 6723 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
| 7 | 6724 } |
| 6725 | |
| 6726 get_yank_register(regname, FALSE); | |
| 6727 if (y_current->y_array == NULL) | |
| 6728 return NULL; | |
| 6729 | |
| 5796 | 6730 if (flags & GREG_LIST) |
| 6731 { | |
| 6732 list_T *list = list_alloc(); | |
| 6733 int error = FALSE; | |
| 6734 | |
| 6735 if (list == NULL) | |
| 6736 return NULL; | |
| 6737 for (i = 0; i < y_current->y_size; ++i) | |
| 6738 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
| 6739 error = TRUE; | |
| 6740 if (error) | |
| 6741 { | |
|
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6742 list_free(list); |
| 5796 | 6743 return NULL; |
| 6744 } | |
| 6745 return (char_u *)list; | |
| 6746 } | |
| 6747 | |
| 7 | 6748 /* |
| 6749 * Compute length of resulting string. | |
| 6750 */ | |
| 6751 len = 0; | |
| 6752 for (i = 0; i < y_current->y_size; ++i) | |
| 6753 { | |
| 6754 len += (long)STRLEN(y_current->y_array[i]); | |
| 6755 /* | |
| 6756 * Insert a newline between lines and after last line if | |
| 6757 * y_type is MLINE. | |
| 6758 */ | |
| 6759 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 6760 ++len; | |
| 6761 } | |
| 6762 | |
| 6763 retval = lalloc(len + 1, TRUE); | |
| 6764 | |
| 6765 /* | |
| 6766 * Copy the lines of the yank register into the string. | |
| 6767 */ | |
| 6768 if (retval != NULL) | |
| 6769 { | |
| 6770 len = 0; | |
| 6771 for (i = 0; i < y_current->y_size; ++i) | |
| 6772 { | |
| 6773 STRCPY(retval + len, y_current->y_array[i]); | |
| 6774 len += (long)STRLEN(retval + len); | |
| 6775 | |
| 6776 /* | |
| 6777 * Insert a NL between lines and after the last line if y_type is | |
| 6778 * MLINE. | |
| 6779 */ | |
| 6780 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 6781 retval[len++] = '\n'; | |
| 6782 } | |
| 6783 retval[len] = NUL; | |
| 6784 } | |
| 6785 | |
| 6786 return retval; | |
| 6787 } | |
| 6788 | |
| 5798 | 6789 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6790 init_write_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6791 int name, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6792 yankreg_T **old_y_previous, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6793 yankreg_T **old_y_current, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6794 int must_append, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6795 int *yank_type UNUSED) |
| 5798 | 6796 { |
| 6797 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
| 6798 { | |
| 6799 emsg_invreg(name); | |
| 6800 return FAIL; | |
| 6801 } | |
| 6802 | |
| 6803 /* Don't want to change the current (unnamed) register */ | |
| 6804 *old_y_previous = y_previous; | |
| 6805 *old_y_current = y_current; | |
| 6806 | |
| 6807 get_yank_register(name, TRUE); | |
| 6808 if (!y_append && !must_append) | |
| 6809 free_yank_all(); | |
| 6810 return OK; | |
| 6811 } | |
| 6812 | |
| 6813 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6814 finish_write_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6815 int name, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6816 yankreg_T *old_y_previous, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6817 yankreg_T *old_y_current) |
| 5798 | 6818 { |
| 6819 # ifdef FEAT_CLIPBOARD | |
| 6820 /* Send text of clipboard register to the clipboard. */ | |
| 6821 may_set_selection(); | |
| 6822 # endif | |
| 6823 | |
| 6824 /* ':let @" = "val"' should change the meaning of the "" register */ | |
| 6825 if (name != '"') | |
| 6826 y_previous = old_y_previous; | |
| 6827 y_current = old_y_current; | |
| 6828 } | |
| 6829 | |
| 7 | 6830 /* |
| 6831 * Store string "str" in register "name". | |
| 6832 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
| 6833 * If "must_append" is TRUE, always append to the register. Otherwise append | |
| 6834 * if "name" is an uppercase letter. | |
| 6835 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
| 6836 * Careful: 'str' is modified, you may have to use a copy! | |
| 6837 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
| 6838 */ | |
| 6839 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6840 write_reg_contents( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6841 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6842 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6843 int maxlen, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6844 int must_append) |
| 7 | 6845 { |
| 6846 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
| 6847 } | |
| 6848 | |
| 6849 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6850 write_reg_contents_lst( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6851 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6852 char_u **strings, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6853 int maxlen UNUSED, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6854 int must_append, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6855 int yank_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6856 long block_len) |
| 5798 | 6857 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6858 yankreg_T *old_y_previous, *old_y_current; |
| 5798 | 6859 |
| 6860 if (name == '/' | |
| 6861 #ifdef FEAT_EVAL | |
| 6862 || name == '=' | |
| 6863 #endif | |
| 6864 ) | |
| 6865 { | |
| 6866 char_u *s; | |
| 6867 | |
| 6868 if (strings[0] == NULL) | |
| 6869 s = (char_u *)""; | |
| 6870 else if (strings[1] != NULL) | |
| 6871 { | |
| 6872 EMSG(_("E883: search pattern and expression register may not " | |
| 6873 "contain two or more lines")); | |
| 6874 return; | |
| 6875 } | |
| 6876 else | |
| 6877 s = strings[0]; | |
| 6878 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
| 6879 return; | |
| 6880 } | |
| 6881 | |
| 6882 if (name == '_') /* black hole: nothing to do */ | |
| 6883 return; | |
| 6884 | |
| 6885 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
| 6886 &yank_type) == FAIL) | |
| 6887 return; | |
| 6888 | |
| 6889 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
| 6890 | |
| 6891 finish_write_reg(name, old_y_previous, old_y_current); | |
| 6892 } | |
| 6893 | |
| 6894 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6895 write_reg_contents_ex( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6896 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6897 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6898 int maxlen, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6899 int must_append, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6900 int yank_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6901 long block_len) |
| 7 | 6902 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6903 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
|
6904 long len; |
| 7 | 6905 |
| 336 | 6906 if (maxlen >= 0) |
| 6907 len = maxlen; | |
| 6908 else | |
| 6909 len = (long)STRLEN(str); | |
| 6910 | |
| 7 | 6911 /* Special case: '/' search pattern */ |
| 6912 if (name == '/') | |
| 6913 { | |
| 6914 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
| 6915 return; | |
| 6916 } | |
| 6917 | |
| 6557 | 6918 if (name == '#') |
| 6919 { | |
| 6920 buf_T *buf; | |
| 6921 | |
| 6922 if (VIM_ISDIGIT(*str)) | |
| 6923 { | |
| 6924 int num = atoi((char *)str); | |
| 6925 | |
| 6926 buf = buflist_findnr(num); | |
| 6927 if (buf == NULL) | |
| 6928 EMSGN(_(e_nobufnr), (long)num); | |
| 6929 } | |
| 6930 else | |
| 6931 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
| 6932 TRUE, FALSE, FALSE)); | |
| 6933 if (buf == NULL) | |
| 6934 return; | |
| 6935 curwin->w_alt_fnum = buf->b_fnum; | |
| 6936 return; | |
| 6937 } | |
| 6938 | |
| 336 | 6939 #ifdef FEAT_EVAL |
| 6940 if (name == '=') | |
| 6941 { | |
| 6942 char_u *p, *s; | |
| 6943 | |
| 6944 p = vim_strnsave(str, (int)len); | |
| 6945 if (p == NULL) | |
| 6946 return; | |
| 6947 if (must_append) | |
| 6948 { | |
| 6949 s = concat_str(get_expr_line_src(), p); | |
| 6950 vim_free(p); | |
| 6951 p = s; | |
| 6952 } | |
| 6953 set_expr_line(p); | |
| 6954 return; | |
| 6955 } | |
| 6956 #endif | |
| 6957 | |
| 7 | 6958 if (name == '_') /* black hole: nothing to do */ |
| 6959 return; | |
| 6960 | |
| 5798 | 6961 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
| 6962 &yank_type) == FAIL) | |
| 6963 return; | |
| 6964 | |
| 6965 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
| 6966 | |
| 6967 finish_write_reg(name, old_y_previous, old_y_current); | |
| 7 | 6968 } |
| 6969 #endif /* FEAT_EVAL */ | |
| 6970 | |
| 6971 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
| 6972 /* | |
| 6973 * Put a string into a register. When the register is not empty, the string | |
| 6974 * is appended. | |
| 6975 */ | |
| 6976 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6977 str_to_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6978 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
|
6979 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
|
6980 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
|
6981 long len, /* length of string */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6982 long blocklen, /* width of Visual block */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6983 int str_list) /* TRUE if str is char_u ** */ |
| 7 | 6984 { |
| 2896 | 6985 int type; /* MCHAR, MLINE or MBLOCK */ |
| 7 | 6986 int lnum; |
| 6987 long start; | |
| 6988 long i; | |
| 6989 int extra; | |
| 6990 int newlines; /* number of lines added */ | |
| 6991 int extraline = 0; /* extra line at the end */ | |
| 6992 int append = FALSE; /* append to last line in register */ | |
| 6993 char_u *s; | |
| 5798 | 6994 char_u **ss; |
| 7 | 6995 char_u **pp; |
| 6996 long maxlen; | |
| 6997 | |
| 2000 | 6998 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
| 7 | 6999 y_ptr->y_size = 0; |
| 7000 | |
| 2896 | 7001 if (yank_type == MAUTO) |
| 5798 | 7002 type = ((str_list || (len > 0 && (str[len - 1] == NL |
| 7003 || str[len - 1] == CAR))) | |
| 2896 | 7004 ? MLINE : MCHAR); |
| 7005 else | |
| 7006 type = yank_type; | |
| 7007 | |
| 7 | 7008 /* |
| 7009 * Count the number of lines within the string | |
| 7010 */ | |
| 7011 newlines = 0; | |
| 5798 | 7012 if (str_list) |
| 7013 { | |
| 7014 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
| 7 | 7015 ++newlines; |
| 5798 | 7016 } |
| 7017 else | |
| 7018 { | |
| 7019 for (i = 0; i < len; i++) | |
| 7020 if (str[i] == '\n') | |
| 7021 ++newlines; | |
| 7022 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
| 7023 { | |
| 7024 extraline = 1; | |
| 7025 ++newlines; /* count extra newline at the end */ | |
| 7026 } | |
| 7027 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
| 7028 { | |
| 7029 append = TRUE; | |
| 7030 --newlines; /* uncount newline when appending first line */ | |
| 7031 } | |
| 7 | 7032 } |
| 7033 | |
| 6807 | 7034 /* Without any lines make the register empty. */ |
| 7035 if (y_ptr->y_size + newlines == 0) | |
| 7036 { | |
| 7037 vim_free(y_ptr->y_array); | |
| 7038 y_ptr->y_array = NULL; | |
| 7039 return; | |
| 7040 } | |
| 7041 | |
| 7 | 7042 /* |
| 7043 * Allocate an array to hold the pointers to the new register lines. | |
| 7044 * If the register was not empty, move the existing lines to the new array. | |
| 7045 */ | |
| 7046 pp = (char_u **)lalloc_clear((y_ptr->y_size + newlines) | |
| 7047 * sizeof(char_u *), TRUE); | |
| 7048 if (pp == NULL) /* out of memory */ | |
| 7049 return; | |
| 7050 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
| 7051 pp[lnum] = y_ptr->y_array[lnum]; | |
| 7052 vim_free(y_ptr->y_array); | |
| 7053 y_ptr->y_array = pp; | |
| 7054 maxlen = 0; | |
| 7055 | |
| 7056 /* | |
| 7057 * Find the end of each line and save it into the array. | |
| 7058 */ | |
| 5798 | 7059 if (str_list) |
| 7060 { | |
| 7061 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
| 7 | 7062 { |
| 5856 | 7063 i = (long)STRLEN(*ss); |
| 5798 | 7064 pp[lnum] = vim_strnsave(*ss, i); |
| 7065 if (i > maxlen) | |
| 7066 maxlen = i; | |
| 7 | 7067 } |
| 5798 | 7068 } |
| 7069 else | |
| 7070 { | |
| 7071 for (start = 0; start < len + extraline; start += i + 1) | |
| 7 | 7072 { |
| 5798 | 7073 for (i = start; i < len; ++i) /* find the end of the line */ |
| 7074 if (str[i] == '\n') | |
| 7075 break; | |
| 7076 i -= start; /* i is now length of line */ | |
| 7077 if (i > maxlen) | |
| 7078 maxlen = i; | |
| 7079 if (append) | |
| 7080 { | |
| 7081 --lnum; | |
| 7082 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
| 7083 } | |
| 7084 else | |
| 7085 extra = 0; | |
| 7086 s = alloc((unsigned)(i + extra + 1)); | |
| 7087 if (s == NULL) | |
| 7088 break; | |
| 7089 if (extra) | |
| 7090 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
| 7091 if (append) | |
| 7092 vim_free(y_ptr->y_array[lnum]); | |
| 7093 if (i) | |
| 7094 mch_memmove(s + extra, str + start, (size_t)i); | |
| 7095 extra += i; | |
| 7096 s[extra] = NUL; | |
| 7097 y_ptr->y_array[lnum++] = s; | |
| 7098 while (--extra >= 0) | |
| 7099 { | |
| 7100 if (*s == NUL) | |
| 7101 *s = '\n'; /* replace NUL with newline */ | |
| 7102 ++s; | |
| 7103 } | |
| 7104 append = FALSE; /* only first line is appended */ | |
| 7 | 7105 } |
| 7106 } | |
| 7107 y_ptr->y_type = type; | |
| 7108 y_ptr->y_size = lnum; | |
| 7109 if (type == MBLOCK) | |
| 7110 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
| 7111 else | |
| 7112 y_ptr->y_width = 0; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7113 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7114 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
|
7115 #endif |
| 7 | 7116 } |
| 7117 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
| 7118 | |
| 7119 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7120 clear_oparg(oparg_T *oap) |
| 7 | 7121 { |
| 7122 vim_memset(oap, 0, sizeof(oparg_T)); | |
| 7123 } | |
| 7124 | |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7125 static varnumber_T line_count_info(char_u *line, varnumber_T *wc, varnumber_T *cc, varnumber_T limit, int eol_size); |
| 7 | 7126 |
| 7127 /* | |
| 161 | 7128 * Count the number of bytes, characters and "words" in a line. |
| 7 | 7129 * |
| 7130 * "Words" are counted by looking for boundaries between non-space and | |
| 7131 * space characters. (it seems to produce results that match 'wc'.) | |
| 7132 * | |
| 161 | 7133 * Return value is byte count; word count for the line is added to "*wc". |
| 7134 * Char count is added to "*cc". | |
| 7 | 7135 * |
| 7136 * The function will only examine the first "limit" characters in the | |
| 7137 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
| 7138 * case, eol_size will be added to the character count to account for | |
| 7139 * the size of the EOL character. | |
| 7140 */ | |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7141 static varnumber_T |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7142 line_count_info( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7143 char_u *line, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7144 varnumber_T *wc, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7145 varnumber_T *cc, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7146 varnumber_T limit, |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7147 int eol_size) |
| 7 | 7148 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7149 varnumber_T i; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7150 varnumber_T words = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7151 varnumber_T chars = 0; |
| 7 | 7152 int is_word = 0; |
| 7153 | |
| 3626 | 7154 for (i = 0; i < limit && line[i] != NUL; ) |
| 7 | 7155 { |
| 7156 if (is_word) | |
| 7157 { | |
| 7158 if (vim_isspace(line[i])) | |
| 7159 { | |
| 7160 words++; | |
| 7161 is_word = 0; | |
| 7162 } | |
| 7163 } | |
| 7164 else if (!vim_isspace(line[i])) | |
| 7165 is_word = 1; | |
| 161 | 7166 ++chars; |
| 7167 #ifdef FEAT_MBYTE | |
| 474 | 7168 i += (*mb_ptr2len)(line + i); |
| 161 | 7169 #else |
| 7170 ++i; | |
| 7171 #endif | |
| 7 | 7172 } |
| 7173 | |
| 7174 if (is_word) | |
| 7175 words++; | |
| 7176 *wc += words; | |
| 7177 | |
| 7178 /* Add eol_size if the end of line was reached before hitting limit. */ | |
| 2996 | 7179 if (i < limit && line[i] == NUL) |
| 161 | 7180 { |
| 7 | 7181 i += eol_size; |
| 161 | 7182 chars += eol_size; |
| 7183 } | |
| 7184 *cc += chars; | |
| 7 | 7185 return i; |
| 7186 } | |
| 7187 | |
| 7188 /* | |
| 7189 * Give some info about the position of the cursor (for "g CTRL-G"). | |
| 7190 * In Visual mode, give some info about the selected region. (In this case, | |
| 7191 * 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
|
7192 * When "dict" is not NULL store the info there instead of showing it. |
| 7 | 7193 */ |
| 7194 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7195 cursor_pos_info(dict_T *dict) |
| 7 | 7196 { |
| 7197 char_u *p; | |
| 274 | 7198 char_u buf1[50]; |
| 7199 char_u buf2[40]; | |
| 7 | 7200 linenr_T lnum; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7201 varnumber_T byte_count = 0; |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7202 #ifdef FEAT_MBYTE |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7203 varnumber_T bom_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7204 #endif |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7205 varnumber_T byte_count_cursor = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7206 varnumber_T char_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7207 varnumber_T char_count_cursor = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7208 varnumber_T word_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7209 varnumber_T word_count_cursor = 0; |
| 7 | 7210 int eol_size; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7211 varnumber_T last_check = 100000L; |
| 7 | 7212 long line_count_selected = 0; |
| 7213 pos_T min_pos, max_pos; | |
| 7214 oparg_T oparg; | |
| 7215 struct block_def bd; | |
| 7216 | |
| 7217 /* | |
| 7218 * Compute the length of the file in characters. | |
| 7219 */ | |
| 7220 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
| 7221 { | |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7222 if (dict == NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7223 { |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7224 MSG(_(no_lines_msg)); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7225 return; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7226 } |
| 7 | 7227 } |
| 7228 else | |
| 7229 { | |
| 7230 if (get_fileformat(curbuf) == EOL_DOS) | |
| 7231 eol_size = 2; | |
| 7232 else | |
| 7233 eol_size = 1; | |
| 7234 | |
| 7235 if (VIsual_active) | |
| 7236 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
7237 if (LT_POS(VIsual, curwin->w_cursor)) |
| 7 | 7238 { |
| 7239 min_pos = VIsual; | |
| 7240 max_pos = curwin->w_cursor; | |
| 7241 } | |
| 7242 else | |
| 7243 { | |
| 7244 min_pos = curwin->w_cursor; | |
| 7245 max_pos = VIsual; | |
| 7246 } | |
| 7247 if (*p_sel == 'e' && max_pos.col > 0) | |
| 7248 --max_pos.col; | |
| 7249 | |
| 7250 if (VIsual_mode == Ctrl_V) | |
| 7251 { | |
| 1866 | 7252 #ifdef FEAT_LINEBREAK |
| 7253 char_u * saved_sbr = p_sbr; | |
| 7254 | |
| 7255 /* Make 'sbr' empty for a moment to get the correct size. */ | |
| 7256 p_sbr = empty_option; | |
| 7257 #endif | |
| 7 | 7258 oparg.is_VIsual = 1; |
| 7259 oparg.block_mode = TRUE; | |
| 7260 oparg.op_type = OP_NOP; | |
| 7261 getvcols(curwin, &min_pos, &max_pos, | |
| 688 | 7262 &oparg.start_vcol, &oparg.end_vcol); |
| 1866 | 7263 #ifdef FEAT_LINEBREAK |
| 7264 p_sbr = saved_sbr; | |
| 7265 #endif | |
| 688 | 7266 if (curwin->w_curswant == MAXCOL) |
| 7267 oparg.end_vcol = MAXCOL; | |
| 7 | 7268 /* Swap the start, end vcol if needed */ |
| 7269 if (oparg.end_vcol < oparg.start_vcol) | |
| 7270 { | |
| 7271 oparg.end_vcol += oparg.start_vcol; | |
| 7272 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
| 7273 oparg.end_vcol -= oparg.start_vcol; | |
| 7274 } | |
| 7275 } | |
| 7276 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
| 7277 } | |
| 7278 | |
| 7279 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
| 7280 { | |
| 7281 /* Check for a CTRL-C every 100000 characters. */ | |
| 161 | 7282 if (byte_count > last_check) |
| 7 | 7283 { |
| 7284 ui_breakcheck(); | |
| 7285 if (got_int) | |
| 7286 return; | |
| 161 | 7287 last_check = byte_count + 100000L; |
| 7 | 7288 } |
| 7289 | |
| 7290 /* Do extra processing for VIsual mode. */ | |
| 7291 if (VIsual_active | |
| 7292 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
| 7293 { | |
| 45 | 7294 char_u *s = NULL; |
| 7295 long len = 0L; | |
| 7296 | |
| 7 | 7297 switch (VIsual_mode) |
| 7298 { | |
| 7299 case Ctrl_V: | |
| 5735 | 7300 #ifdef FEAT_VIRTUALEDIT |
| 7 | 7301 virtual_op = virtual_active(); |
| 5735 | 7302 #endif |
| 7 | 7303 block_prep(&oparg, &bd, lnum, 0); |
| 5735 | 7304 #ifdef FEAT_VIRTUALEDIT |
| 7 | 7305 virtual_op = MAYBE; |
| 5735 | 7306 #endif |
| 45 | 7307 s = bd.textstart; |
| 7308 len = (long)bd.textlen; | |
| 7 | 7309 break; |
| 7310 case 'V': | |
| 45 | 7311 s = ml_get(lnum); |
| 7312 len = MAXCOL; | |
| 7 | 7313 break; |
| 7314 case 'v': | |
| 7315 { | |
| 7316 colnr_T start_col = (lnum == min_pos.lnum) | |
| 7317 ? min_pos.col : 0; | |
| 7318 colnr_T end_col = (lnum == max_pos.lnum) | |
| 7319 ? max_pos.col - start_col + 1 : MAXCOL; | |
| 7320 | |
| 45 | 7321 s = ml_get(lnum) + start_col; |
| 7322 len = end_col; | |
| 7 | 7323 } |
| 7324 break; | |
| 7325 } | |
| 45 | 7326 if (s != NULL) |
| 7327 { | |
| 161 | 7328 byte_count_cursor += line_count_info(s, &word_count_cursor, |
| 7329 &char_count_cursor, len, eol_size); | |
| 45 | 7330 if (lnum == curbuf->b_ml.ml_line_count |
| 7331 && !curbuf->b_p_eol | |
| 6933 | 7332 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
| 50 | 7333 && (long)STRLEN(s) < len) |
| 161 | 7334 byte_count_cursor -= eol_size; |
| 45 | 7335 } |
| 7 | 7336 } |
| 7337 else | |
| 7338 { | |
| 7339 /* In non-visual mode, check for the line the cursor is on */ | |
| 7340 if (lnum == curwin->w_cursor.lnum) | |
| 7341 { | |
| 7342 word_count_cursor += word_count; | |
| 161 | 7343 char_count_cursor += char_count; |
| 7344 byte_count_cursor = byte_count + | |
| 7345 line_count_info(ml_get(lnum), | |
| 7346 &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
|
7347 (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
|
7348 eol_size); |
| 7 | 7349 } |
| 7350 } | |
| 7351 /* Add to the running totals */ | |
| 161 | 7352 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
|
7353 &char_count, (varnumber_T)MAXCOL, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7354 eol_size); |
| 7 | 7355 } |
| 7356 | |
| 7357 /* Correction for when last line doesn't have an EOL. */ | |
| 6933 | 7358 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
| 161 | 7359 byte_count -= eol_size; |
| 7 | 7360 |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7361 if (dict == NULL) |
| 7 | 7362 { |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7363 if (VIsual_active) |
| 7 | 7364 { |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7365 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
|
7366 { |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7367 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
|
7368 &max_pos.col); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7369 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
|
7370 (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
|
7371 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7372 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7373 buf1[0] = NUL; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7374 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7375 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
|
7376 && char_count == byte_count) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7377 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7378 _("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
|
7379 buf1, line_count_selected, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7380 (long)curbuf->b_ml.ml_line_count, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7381 word_count_cursor, word_count, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7382 byte_count_cursor, byte_count); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7383 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7384 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7385 _("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
|
7386 buf1, line_count_selected, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7387 (long)curbuf->b_ml.ml_line_count, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7388 word_count_cursor, word_count, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7389 char_count_cursor, char_count, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7390 byte_count_cursor, byte_count); |
| 7 | 7391 } |
| 7392 else | |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7393 { |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7394 p = ml_get_curline(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7395 validate_virtcol(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7396 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
|
7397 (int)curwin->w_virtcol + 1); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7398 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
|
7399 linetabsize(p)); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7400 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7401 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
|
7402 && char_count == byte_count) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7403 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7404 _("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
|
7405 (char *)buf1, (char *)buf2, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7406 (long)curwin->w_cursor.lnum, |
| 7 | 7407 (long)curbuf->b_ml.ml_line_count, |
| 7408 word_count_cursor, word_count, | |
| 161 | 7409 byte_count_cursor, byte_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7410 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7411 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7412 _("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
|
7413 (char *)buf1, (char *)buf2, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7414 (long)curwin->w_cursor.lnum, |
| 161 | 7415 (long)curbuf->b_ml.ml_line_count, |
| 7416 word_count_cursor, word_count, | |
| 7417 char_count_cursor, char_count, | |
| 7418 byte_count_cursor, byte_count); | |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7419 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7420 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7421 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7422 #ifdef FEAT_MBYTE |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7423 bom_count = bomb_size(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7424 if (bom_count > 0) |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7425 vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE, |
|
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7426 _("(+%ld for BOM)"), bom_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7427 #endif |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7428 if (dict == NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7429 { |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7430 /* 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
|
7431 p = p_shm; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7432 p_shm = (char_u *)""; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7433 msg(IObuff); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7434 p_shm = p; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7435 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7436 } |
|
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7437 #if defined(FEAT_EVAL) |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7438 if (dict != NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7439 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7440 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
|
7441 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
|
7442 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
|
7443 # ifdef FEAT_MBYTE |
|
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7444 + bom_count |
|
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7445 # endif |
|
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7446 , NULL); |
|
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7447 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
|
7448 byte_count_cursor, NULL); |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7449 dict_add_nr_str(dict, VIsual_active ? "visual_chars" : "cursor_chars", |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7450 char_count_cursor, NULL); |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7451 dict_add_nr_str(dict, VIsual_active ? "visual_words" : "cursor_words", |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7452 word_count_cursor, NULL); |
| 7 | 7453 } |
|
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7454 #endif |
| 7 | 7455 } |