Mercurial > vim
annotate src/ops.c @ 11997:66b677c77467 v8.0.0879
patch 8.0.0879: crash when shifting with huge number
commit https://github.com/vim/vim/commit/bae5a17a738d1a3b5c51d9aa5d99e228d3911955
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Aug 6 15:42:06 2017 +0200
patch 8.0.0879: crash when shifting with huge number
Problem: Crash when shifting with huge number.
Solution: Check for overflow. (Dominique Pelle, closes https://github.com/vim/vim/issues/1945)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 06 Aug 2017 15:45:04 +0200 |
| parents | 570f00932da8 |
| children | 4dba3e4f3b01 |
| 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 */ | |
|
11997
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
399 total = (int)((unsigned)amount * (unsigned)p_sw); |
|
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
400 if ((total / p_sw) != amount) |
|
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
401 return; /* multiplication overflow */ |
|
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
402 |
| 7 | 403 oldp = ml_get_curline(); |
| 404 | |
| 405 if (!left) | |
| 406 { | |
| 407 /* | |
| 408 * 1. Get start vcol | |
| 409 * 2. Total ws vcols | |
| 410 * 3. Divvy into TABs & spp | |
| 411 * 4. Construct new string | |
| 412 */ | |
| 413 total += bd.pre_whitesp; /* all virtual WS upto & incl a split TAB */ | |
| 414 ws_vcol = bd.start_vcol - bd.pre_whitesp; | |
| 415 if (bd.startspaces) | |
| 416 { | |
| 417 #ifdef FEAT_MBYTE | |
| 418 if (has_mbyte) | |
|
8399
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
419 { |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
420 if ((*mb_ptr2len)(bd.textstart) == 1) |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
421 ++bd.textstart; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
422 else |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
423 { |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
424 ws_vcol = 0; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
425 bd.startspaces = 0; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
426 } |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
427 } |
| 1995 | 428 else |
| 429 #endif | |
| 430 ++bd.textstart; | |
| 7 | 431 } |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
432 for ( ; VIM_ISWHITE(*bd.textstart); ) |
| 7 | 433 { |
| 5995 | 434 /* TODO: is passing bd.textstart for start of the line OK? */ |
| 435 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, | |
| 436 (colnr_T)(bd.start_vcol)); | |
| 7 | 437 total += incr; |
| 438 bd.start_vcol += incr; | |
| 439 } | |
| 440 /* OK, now total=all the VWS reqd, and textstart points at the 1st | |
| 441 * non-ws char in the block. */ | |
| 442 if (!curbuf->b_p_et) | |
| 443 i = ((ws_vcol % p_ts) + total) / p_ts; /* number of tabs */ | |
| 444 if (i) | |
| 445 j = ((ws_vcol % p_ts) + total) % p_ts; /* number of spp */ | |
| 446 else | |
| 447 j = total; | |
| 448 /* if we're splitting a TAB, allow for it */ | |
| 449 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0); | |
| 450 len = (int)STRLEN(bd.textstart) + 1; | |
| 451 newp = alloc_check((unsigned)(bd.textcol + i + j + len)); | |
| 452 if (newp == NULL) | |
| 453 return; | |
| 454 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len)); | |
| 455 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 6929 | 456 vim_memset(newp + bd.textcol, TAB, (size_t)i); |
| 457 vim_memset(newp + bd.textcol + i, ' ', (size_t)j); | |
| 7 | 458 /* the end */ |
| 459 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len); | |
| 460 } | |
| 461 else /* left */ | |
| 462 { | |
| 1839 | 463 colnr_T destination_col; /* column to which text in block will |
| 464 be shifted */ | |
| 465 char_u *verbatim_copy_end; /* end of the part of the line which is | |
| 466 copied verbatim */ | |
| 467 colnr_T verbatim_copy_width;/* the (displayed) width of this part | |
| 468 of line */ | |
| 469 unsigned fill; /* nr of spaces that replace a TAB */ | |
| 470 unsigned new_line_len; /* the length of the line after the | |
| 471 block shift */ | |
| 472 size_t block_space_width; | |
| 473 size_t shift_amount; | |
| 474 char_u *non_white = bd.textstart; | |
| 475 colnr_T non_white_col; | |
| 476 | |
| 477 /* | |
| 478 * Firstly, let's find the first non-whitespace character that is | |
| 479 * displayed after the block's start column and the character's column | |
| 480 * number. Also, let's calculate the width of all the whitespace | |
| 481 * characters that are displayed in the block and precede the searched | |
| 482 * non-whitespace character. | |
| 483 */ | |
| 484 | |
| 485 /* If "bd.startspaces" is set, "bd.textstart" points to the character, | |
| 486 * the part of which is displayed at the block's beginning. Let's start | |
| 487 * searching from the next character. */ | |
| 488 if (bd.startspaces) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
489 MB_PTR_ADV(non_white); |
| 1839 | 490 |
| 491 /* The character's column is in "bd.start_vcol". */ | |
| 492 non_white_col = bd.start_vcol; | |
| 493 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
494 while (VIM_ISWHITE(*non_white)) |
| 7 | 495 { |
| 5995 | 496 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col); |
| 1839 | 497 non_white_col += incr; |
| 7 | 498 } |
| 1839 | 499 |
| 500 block_space_width = non_white_col - oap->start_vcol; | |
| 501 /* We will shift by "total" or "block_space_width", whichever is less. | |
| 502 */ | |
| 1860 | 503 shift_amount = (block_space_width < (size_t)total |
| 504 ? block_space_width : (size_t)total); | |
| 1839 | 505 |
| 506 /* The column to which we will shift the text. */ | |
| 1860 | 507 destination_col = (colnr_T)(non_white_col - shift_amount); |
| 1839 | 508 |
| 509 /* Now let's find out how much of the beginning of the line we can | |
| 510 * reuse without modification. */ | |
| 511 verbatim_copy_end = bd.textstart; | |
| 512 verbatim_copy_width = bd.start_vcol; | |
| 513 | |
| 514 /* If "bd.startspaces" is set, "bd.textstart" points to the character | |
| 515 * preceding the block. We have to subtract its width to obtain its | |
| 516 * column number. */ | |
| 517 if (bd.startspaces) | |
| 518 verbatim_copy_width -= bd.start_char_vcols; | |
| 519 while (verbatim_copy_width < destination_col) | |
| 7 | 520 { |
| 5995 | 521 char_u *line = verbatim_copy_end; |
| 522 | |
| 523 /* TODO: is passing verbatim_copy_end for start of the line OK? */ | |
| 524 incr = lbr_chartabsize(line, verbatim_copy_end, | |
| 525 verbatim_copy_width); | |
| 1839 | 526 if (verbatim_copy_width + incr > destination_col) |
| 527 break; | |
| 528 verbatim_copy_width += incr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
529 MB_PTR_ADV(verbatim_copy_end); |
| 7 | 530 } |
| 531 | |
| 1839 | 532 /* If "destination_col" is different from the width of the initial |
| 533 * part of the line that will be copied, it means we encountered a tab | |
| 534 * character, which we will have to partly replace with spaces. */ | |
| 535 fill = destination_col - verbatim_copy_width; | |
| 536 | |
| 537 /* The replacement line will consist of: | |
| 538 * - the beginning of the original line up to "verbatim_copy_end", | |
| 539 * - "fill" number of spaces, | |
| 540 * - the rest of the line, pointed to by non_white. */ | |
| 541 new_line_len = (unsigned)(verbatim_copy_end - oldp) | |
| 542 + fill | |
| 543 + (unsigned)STRLEN(non_white) + 1; | |
| 544 | |
| 545 newp = alloc_check(new_line_len); | |
| 7 | 546 if (newp == NULL) |
| 547 return; | |
| 1839 | 548 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); |
| 6929 | 549 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill); |
| 1839 | 550 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); |
| 7 | 551 } |
| 552 /* replace the line */ | |
| 553 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 554 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol); | |
| 555 State = oldstate; | |
| 556 curwin->w_cursor.col = oldcol; | |
| 557 #ifdef FEAT_RIGHTLEFT | |
| 558 p_ri = old_p_ri; | |
| 559 #endif | |
| 560 } | |
| 561 #endif | |
| 562 | |
| 563 #ifdef FEAT_VISUALEXTRA | |
| 564 /* | |
| 565 * Insert string "s" (b_insert ? before : after) block :AKelly | |
| 566 * Caller must prepare for undo. | |
| 567 */ | |
| 568 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
569 block_insert( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
570 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
571 char_u *s, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
572 int b_insert, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
573 struct block_def *bdp) |
| 7 | 574 { |
| 575 int p_ts; | |
| 576 int count = 0; /* extra spaces to replace a cut TAB */ | |
| 577 int spaces = 0; /* non-zero if cutting a TAB */ | |
| 578 colnr_T offset; /* pointer along new line */ | |
| 579 unsigned s_len; /* STRLEN(s) */ | |
| 580 char_u *newp, *oldp; /* new, old lines */ | |
| 581 linenr_T lnum; /* loop var */ | |
| 582 int oldstate = State; | |
| 583 | |
| 584 State = INSERT; /* don't want REPLACE for State */ | |
| 585 s_len = (unsigned)STRLEN(s); | |
| 586 | |
| 587 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) | |
| 588 { | |
| 589 block_prep(oap, bdp, lnum, TRUE); | |
| 590 if (bdp->is_short && b_insert) | |
| 591 continue; /* OP_INSERT, line ends before block start */ | |
| 592 | |
| 593 oldp = ml_get(lnum); | |
| 594 | |
| 595 if (b_insert) | |
| 596 { | |
| 597 p_ts = bdp->start_char_vcols; | |
| 598 spaces = bdp->startspaces; | |
| 599 if (spaces != 0) | |
| 600 count = p_ts - 1; /* we're cutting a TAB */ | |
| 601 offset = bdp->textcol; | |
| 602 } | |
| 603 else /* append */ | |
| 604 { | |
| 605 p_ts = bdp->end_char_vcols; | |
| 606 if (!bdp->is_short) /* spaces = padding after block */ | |
| 607 { | |
| 608 spaces = (bdp->endspaces ? p_ts - bdp->endspaces : 0); | |
| 609 if (spaces != 0) | |
| 610 count = p_ts - 1; /* we're cutting a TAB */ | |
| 611 offset = bdp->textcol + bdp->textlen - (spaces != 0); | |
| 612 } | |
| 613 else /* spaces = padding to block edge */ | |
| 614 { | |
| 615 /* if $ used, just append to EOL (ie spaces==0) */ | |
| 616 if (!bdp->is_MAX) | |
| 617 spaces = (oap->end_vcol - bdp->end_vcol) + 1; | |
| 618 count = spaces; | |
| 619 offset = bdp->textcol + bdp->textlen; | |
| 620 } | |
| 621 } | |
| 622 | |
| 6140 | 623 #ifdef FEAT_MBYTE |
| 624 if (has_mbyte && spaces > 0) | |
| 625 { | |
| 6460 | 626 int off; |
| 627 | |
| 6140 | 628 /* Avoid starting halfway a multi-byte character. */ |
| 629 if (b_insert) | |
| 630 { | |
| 6460 | 631 off = (*mb_head_off)(oldp, oldp + offset + spaces); |
| 6140 | 632 } |
| 633 else | |
| 634 { | |
| 6460 | 635 off = (*mb_off_next)(oldp, oldp + offset); |
| 6140 | 636 offset += off; |
| 637 } | |
| 6460 | 638 spaces -= off; |
| 639 count -= off; | |
| 6140 | 640 } |
| 641 #endif | |
| 642 | |
| 7 | 643 newp = alloc_check((unsigned)(STRLEN(oldp)) + s_len + count + 1); |
| 644 if (newp == NULL) | |
| 645 continue; | |
| 646 | |
| 647 /* copy up to shifted part */ | |
| 648 mch_memmove(newp, oldp, (size_t)(offset)); | |
| 649 oldp += offset; | |
| 650 | |
| 651 /* insert pre-padding */ | |
| 6929 | 652 vim_memset(newp + offset, ' ', (size_t)spaces); |
| 7 | 653 |
| 654 /* copy the new text */ | |
| 655 mch_memmove(newp + offset + spaces, s, (size_t)s_len); | |
| 656 offset += s_len; | |
| 657 | |
| 658 if (spaces && !bdp->is_short) | |
| 659 { | |
| 660 /* insert post-padding */ | |
| 6929 | 661 vim_memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces)); |
| 7 | 662 /* We're splitting a TAB, don't copy it. */ |
| 663 oldp++; | |
| 664 /* We allowed for that TAB, remember this now */ | |
| 665 count++; | |
| 666 } | |
| 667 | |
| 668 if (spaces > 0) | |
| 669 offset += count; | |
| 1622 | 670 STRMOVE(newp + offset, oldp); |
| 7 | 671 |
| 672 ml_replace(lnum, newp, FALSE); | |
| 673 | |
| 674 if (lnum == oap->end.lnum) | |
| 675 { | |
| 676 /* Set "']" mark to the end of the block instead of the end of | |
| 677 * the insert in the first line. */ | |
| 678 curbuf->b_op_end.lnum = oap->end.lnum; | |
| 679 curbuf->b_op_end.col = offset; | |
| 680 } | |
| 681 } /* for all lnum */ | |
| 682 | |
| 683 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
| 684 | |
| 685 State = oldstate; | |
| 686 } | |
| 687 #endif | |
| 688 | |
| 689 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(PROTO) | |
| 690 /* | |
| 691 * op_reindent - handle reindenting a block of lines. | |
| 692 */ | |
| 693 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
694 op_reindent(oparg_T *oap, int (*how)(void)) |
| 7 | 695 { |
| 696 long i; | |
| 697 char_u *l; | |
| 6971 | 698 int amount; |
| 7 | 699 linenr_T first_changed = 0; |
| 700 linenr_T last_changed = 0; | |
| 701 linenr_T start_lnum = curwin->w_cursor.lnum; | |
| 702 | |
| 216 | 703 /* Don't even try when 'modifiable' is off. */ |
| 704 if (!curbuf->b_p_ma) | |
| 705 { | |
| 706 EMSG(_(e_modifiable)); | |
| 707 return; | |
| 708 } | |
| 709 | |
| 7 | 710 for (i = oap->line_count; --i >= 0 && !got_int; ) |
| 711 { | |
| 712 /* it's a slow thing to do, so give feedback so there's no worry that | |
| 713 * the computer's just hung. */ | |
| 714 | |
| 715 if (i > 1 | |
| 716 && (i % 50 == 0 || i == oap->line_count - 1) | |
| 717 && oap->line_count > p_report) | |
| 718 smsg((char_u *)_("%ld lines to indent... "), i); | |
| 719 | |
| 720 /* | |
| 721 * Be vi-compatible: For lisp indenting the first line is not | |
| 722 * indented, unless there is only one line. | |
| 723 */ | |
| 724 #ifdef FEAT_LISP | |
| 725 if (i != oap->line_count - 1 || oap->line_count == 1 | |
| 726 || how != get_lisp_indent) | |
| 727 #endif | |
| 728 { | |
| 729 l = skipwhite(ml_get_curline()); | |
| 730 if (*l == NUL) /* empty or blank line */ | |
| 6971 | 731 amount = 0; |
| 7 | 732 else |
| 6971 | 733 amount = how(); /* get the indent for this line */ |
| 734 | |
| 735 if (amount >= 0 && set_indent(amount, SIN_UNDO)) | |
| 7 | 736 { |
| 737 /* did change the indent, call changed_lines() later */ | |
| 738 if (first_changed == 0) | |
| 739 first_changed = curwin->w_cursor.lnum; | |
| 740 last_changed = curwin->w_cursor.lnum; | |
| 741 } | |
| 742 } | |
| 743 ++curwin->w_cursor.lnum; | |
| 1550 | 744 curwin->w_cursor.col = 0; /* make sure it's valid */ |
| 7 | 745 } |
| 746 | |
| 747 /* put cursor on first non-blank of indented line */ | |
| 748 curwin->w_cursor.lnum = start_lnum; | |
| 749 beginline(BL_SOL | BL_FIX); | |
| 750 | |
| 751 /* Mark changed lines so that they will be redrawn. When Visual | |
| 752 * highlighting was present, need to continue until the last line. When | |
| 753 * there is no change still need to remove the Visual highlighting. */ | |
| 754 if (last_changed != 0) | |
| 755 changed_lines(first_changed, 0, | |
| 756 oap->is_VIsual ? start_lnum + oap->line_count : | |
| 757 last_changed + 1, 0L); | |
| 758 else if (oap->is_VIsual) | |
| 759 redraw_curbuf_later(INVERTED); | |
| 760 | |
| 761 if (oap->line_count > p_report) | |
| 762 { | |
| 763 i = oap->line_count - (i + 1); | |
| 764 if (i == 1) | |
| 765 MSG(_("1 line indented ")); | |
| 766 else | |
| 767 smsg((char_u *)_("%ld lines indented "), i); | |
| 768 } | |
| 769 /* set '[ and '] marks */ | |
| 770 curbuf->b_op_start = oap->start; | |
| 771 curbuf->b_op_end = oap->end; | |
| 772 } | |
| 773 #endif /* defined(FEAT_LISP) || defined(FEAT_CINDENT) */ | |
| 774 | |
| 775 #if defined(FEAT_EVAL) || defined(PROTO) | |
| 776 /* | |
| 777 * Keep the last expression line here, for repeating. | |
| 778 */ | |
| 779 static char_u *expr_line = NULL; | |
| 780 | |
| 781 /* | |
| 782 * Get an expression for the "\"=expr1" or "CTRL-R =expr1" | |
| 783 * Returns '=' when OK, NUL otherwise. | |
| 784 */ | |
| 785 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
786 get_expr_register(void) |
| 7 | 787 { |
| 788 char_u *new_line; | |
| 789 | |
| 790 new_line = getcmdline('=', 0L, 0); | |
| 791 if (new_line == NULL) | |
| 792 return NUL; | |
| 793 if (*new_line == NUL) /* use previous line */ | |
| 794 vim_free(new_line); | |
| 795 else | |
| 796 set_expr_line(new_line); | |
| 797 return '='; | |
| 798 } | |
| 799 | |
| 800 /* | |
| 801 * Set the expression for the '=' register. | |
| 802 * Argument must be an allocated string. | |
| 803 */ | |
| 804 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
805 set_expr_line(char_u *new_line) |
| 7 | 806 { |
| 807 vim_free(expr_line); | |
| 808 expr_line = new_line; | |
| 809 } | |
| 810 | |
| 811 /* | |
| 812 * Get the result of the '=' register expression. | |
| 813 * Returns a pointer to allocated memory, or NULL for failure. | |
| 814 */ | |
| 815 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
816 get_expr_line(void) |
| 7 | 817 { |
| 818 char_u *expr_copy; | |
| 819 char_u *rv; | |
| 994 | 820 static int nested = 0; |
| 7 | 821 |
| 822 if (expr_line == NULL) | |
| 823 return NULL; | |
| 824 | |
| 825 /* Make a copy of the expression, because evaluating it may cause it to be | |
| 826 * changed. */ | |
| 827 expr_copy = vim_strsave(expr_line); | |
| 828 if (expr_copy == NULL) | |
| 829 return NULL; | |
| 830 | |
| 994 | 831 /* When we are invoked recursively limit the evaluation to 10 levels. |
| 832 * Then return the string as-is. */ | |
| 833 if (nested >= 10) | |
| 834 return expr_copy; | |
| 835 | |
| 836 ++nested; | |
| 714 | 837 rv = eval_to_string(expr_copy, NULL, TRUE); |
| 994 | 838 --nested; |
| 7 | 839 vim_free(expr_copy); |
| 840 return rv; | |
| 841 } | |
| 283 | 842 |
| 843 /* | |
| 844 * Get the '=' register expression itself, without evaluating it. | |
| 845 */ | |
| 846 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
847 get_expr_line_src(void) |
| 283 | 848 { |
| 849 if (expr_line == NULL) | |
| 850 return NULL; | |
| 851 return vim_strsave(expr_line); | |
| 852 } | |
| 7 | 853 #endif /* FEAT_EVAL */ |
| 854 | |
| 855 /* | |
| 856 * Check if 'regname' is a valid name of a yank register. | |
| 857 * Note: There is no check for 0 (default register), caller should do this | |
| 858 */ | |
| 859 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
860 valid_yank_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
861 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
862 int writing) /* if TRUE check for writable registers */ |
| 7 | 863 { |
| 864 if ( (regname > 0 && ASCII_ISALNUM(regname)) | |
| 865 || (!writing && vim_strchr((char_u *) | |
| 866 #ifdef FEAT_EVAL | |
| 6557 | 867 "/.%:=" |
| 7 | 868 #else |
| 6557 | 869 "/.%:" |
| 7 | 870 #endif |
| 871 , regname) != NULL) | |
| 6557 | 872 || regname == '#' |
| 7 | 873 || regname == '"' |
| 874 || regname == '-' | |
| 875 || regname == '_' | |
| 876 #ifdef FEAT_CLIPBOARD | |
| 877 || regname == '*' | |
| 878 || regname == '+' | |
| 879 #endif | |
| 880 #ifdef FEAT_DND | |
| 881 || (!writing && regname == '~') | |
| 882 #endif | |
| 883 ) | |
| 884 return TRUE; | |
| 885 return FALSE; | |
| 886 } | |
| 887 | |
| 888 /* | |
| 889 * Set y_current and y_append, according to the value of "regname". | |
| 890 * Cannot handle the '_' register. | |
| 140 | 891 * Must only be called with a valid register name! |
| 7 | 892 * |
| 893 * If regname is 0 and writing, use register 0 | |
| 894 * If regname is 0 and reading, use previous register | |
| 895 */ | |
| 15 | 896 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
897 get_yank_register(int regname, int writing) |
| 7 | 898 { |
| 899 int i; | |
| 900 | |
| 901 y_append = FALSE; | |
| 902 if ((regname == 0 || regname == '"') && !writing && y_previous != NULL) | |
| 903 { | |
| 904 y_current = y_previous; | |
| 905 return; | |
| 906 } | |
| 907 i = regname; | |
| 908 if (VIM_ISDIGIT(i)) | |
| 909 i -= '0'; | |
| 910 else if (ASCII_ISLOWER(i)) | |
| 911 i = CharOrdLow(i) + 10; | |
| 912 else if (ASCII_ISUPPER(i)) | |
| 913 { | |
| 914 i = CharOrdUp(i) + 10; | |
| 915 y_append = TRUE; | |
| 916 } | |
| 917 else if (regname == '-') | |
| 918 i = DELETION_REGISTER; | |
| 919 #ifdef FEAT_CLIPBOARD | |
| 920 /* When selection is not available, use register 0 instead of '*' */ | |
| 921 else if (clip_star.available && regname == '*') | |
| 922 i = STAR_REGISTER; | |
| 923 /* When clipboard is not available, use register 0 instead of '+' */ | |
| 924 else if (clip_plus.available && regname == '+') | |
| 925 i = PLUS_REGISTER; | |
| 926 #endif | |
| 927 #ifdef FEAT_DND | |
| 928 else if (!writing && regname == '~') | |
| 929 i = TILDE_REGISTER; | |
| 930 #endif | |
| 931 else /* not 0-9, a-z, A-Z or '-': use register 0 */ | |
| 932 i = 0; | |
| 933 y_current = &(y_regs[i]); | |
| 934 if (writing) /* remember the register we write into for do_put() */ | |
| 935 y_previous = y_current; | |
| 936 } | |
| 937 | |
| 15 | 938 #if defined(FEAT_CLIPBOARD) || defined(PROTO) |
| 7 | 939 /* |
| 940 * When "regname" is a clipboard register, obtain the selection. If it's not | |
| 941 * available return zero, otherwise return "regname". | |
| 942 */ | |
| 15 | 943 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
944 may_get_selection(int regname) |
| 7 | 945 { |
| 946 if (regname == '*') | |
| 947 { | |
| 948 if (!clip_star.available) | |
| 949 regname = 0; | |
| 950 else | |
| 951 clip_get_selection(&clip_star); | |
| 952 } | |
| 953 else if (regname == '+') | |
| 954 { | |
| 955 if (!clip_plus.available) | |
| 956 regname = 0; | |
| 957 else | |
| 958 clip_get_selection(&clip_plus); | |
| 959 } | |
| 960 return regname; | |
| 961 } | |
| 962 #endif | |
| 963 | |
| 964 /* | |
| 965 * Obtain the contents of a "normal" register. The register is made empty. | |
| 966 * The returned pointer has allocated memory, use put_register() later. | |
| 967 */ | |
| 968 void * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
969 get_register( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
970 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
971 int copy) /* make a copy, if FALSE make register empty. */ |
| 7 | 972 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
973 yankreg_T *reg; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
974 int i; |
| 7 | 975 |
| 976 #ifdef FEAT_CLIPBOARD | |
| 977 /* When Visual area changed, may have to update selection. Obtain the | |
| 978 * selection too. */ | |
| 1435 | 979 if (name == '*' && clip_star.available) |
| 7 | 980 { |
| 3674 | 981 if (clip_isautosel_star()) |
| 982 clip_update_selection(&clip_star); | |
| 983 may_get_selection(name); | |
| 984 } | |
| 985 if (name == '+' && clip_plus.available) | |
| 986 { | |
| 987 if (clip_isautosel_plus()) | |
| 988 clip_update_selection(&clip_plus); | |
| 7 | 989 may_get_selection(name); |
| 990 } | |
| 991 #endif | |
| 992 | |
| 993 get_yank_register(name, 0); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
994 reg = (yankreg_T *)alloc((unsigned)sizeof(yankreg_T)); |
| 7 | 995 if (reg != NULL) |
| 996 { | |
| 997 *reg = *y_current; | |
| 998 if (copy) | |
| 999 { | |
| 1000 /* If we run out of memory some or all of the lines are empty. */ | |
| 1001 if (reg->y_size == 0) | |
| 1002 reg->y_array = NULL; | |
| 1003 else | |
| 1004 reg->y_array = (char_u **)alloc((unsigned)(sizeof(char_u *) | |
| 1005 * reg->y_size)); | |
| 1006 if (reg->y_array != NULL) | |
| 1007 { | |
| 1008 for (i = 0; i < reg->y_size; ++i) | |
| 1009 reg->y_array[i] = vim_strsave(y_current->y_array[i]); | |
| 1010 } | |
| 1011 } | |
| 1012 else | |
| 1013 y_current->y_array = NULL; | |
| 1014 } | |
| 1015 return (void *)reg; | |
| 1016 } | |
| 1017 | |
| 1018 /* | |
| 1451 | 1019 * Put "reg" into register "name". Free any previous contents and "reg". |
| 7 | 1020 */ |
| 1021 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1022 put_register(int name, void *reg) |
| 7 | 1023 { |
| 1024 get_yank_register(name, 0); | |
| 1025 free_yank_all(); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1026 *y_current = *(yankreg_T *)reg; |
| 1451 | 1027 vim_free(reg); |
| 7 | 1028 |
| 5735 | 1029 #ifdef FEAT_CLIPBOARD |
| 7 | 1030 /* Send text written to clipboard register to the clipboard. */ |
| 1031 may_set_selection(); | |
| 5735 | 1032 #endif |
| 7 | 1033 } |
| 4209 | 1034 |
| 1035 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1036 free_register(void *reg) |
| 4209 | 1037 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1038 yankreg_T tmp; |
| 4209 | 1039 |
| 1040 tmp = *y_current; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1041 *y_current = *(yankreg_T *)reg; |
| 4209 | 1042 free_yank_all(); |
| 1043 vim_free(reg); | |
| 1044 *y_current = tmp; | |
| 1045 } | |
| 7 | 1046 |
| 1047 #if defined(FEAT_MOUSE) || defined(PROTO) | |
| 1048 /* | |
| 1049 * return TRUE if the current yank register has type MLINE | |
| 1050 */ | |
| 1051 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1052 yank_register_mline(int regname) |
| 7 | 1053 { |
| 1054 if (regname != 0 && !valid_yank_reg(regname, FALSE)) | |
| 1055 return FALSE; | |
| 1056 if (regname == '_') /* black hole is always empty */ | |
| 1057 return FALSE; | |
| 1058 get_yank_register(regname, FALSE); | |
| 1059 return (y_current->y_type == MLINE); | |
| 1060 } | |
| 1061 #endif | |
| 1062 | |
| 1063 /* | |
| 1157 | 1064 * Start or stop recording into a yank register. |
| 7 | 1065 * |
| 1157 | 1066 * Return FAIL for failure, OK otherwise. |
| 7 | 1067 */ |
| 1068 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1069 do_record(int c) |
| 7 | 1070 { |
| 1157 | 1071 char_u *p; |
| 1072 static int regname; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1073 yankreg_T *old_y_previous, *old_y_current; |
| 1157 | 1074 int retval; |
| 7 | 1075 |
| 1076 if (Recording == FALSE) /* start recording */ | |
| 1077 { | |
| 1078 /* registers 0-9, a-z and " are allowed */ | |
| 1079 if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) | |
| 1080 retval = FAIL; | |
| 1081 else | |
| 1082 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7011
diff
changeset
|
1083 Recording = c; |
| 7 | 1084 showmode(); |
| 1085 regname = c; | |
| 1086 retval = OK; | |
| 1087 } | |
| 1088 } | |
| 1089 else /* stop recording */ | |
| 1090 { | |
| 1091 /* | |
| 1157 | 1092 * Get the recorded key hits. K_SPECIAL and CSI will be escaped, this |
| 1093 * needs to be removed again to put it in a register. exec_reg then | |
| 1094 * adds the escaping back later. | |
| 7 | 1095 */ |
| 1096 Recording = FALSE; | |
| 1097 MSG(""); | |
| 1098 p = get_recorded(); | |
| 1099 if (p == NULL) | |
| 1100 retval = FAIL; | |
| 1101 else | |
| 1102 { | |
| 1081 | 1103 /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ |
| 1104 vim_unescape_csi(p); | |
| 1105 | |
| 7 | 1106 /* |
| 1107 * We don't want to change the default register here, so save and | |
| 1108 * restore the current register name. | |
| 1109 */ | |
| 1110 old_y_previous = y_previous; | |
| 1111 old_y_current = y_current; | |
| 1112 | |
| 1113 retval = stuff_yank(regname, p); | |
| 1114 | |
| 1115 y_previous = old_y_previous; | |
| 1116 y_current = old_y_current; | |
| 1117 } | |
| 1118 } | |
| 1119 return retval; | |
| 1120 } | |
| 1121 | |
| 1122 /* | |
| 1123 * Stuff string "p" into yank register "regname" as a single line (append if | |
| 1124 * uppercase). "p" must have been alloced. | |
| 1125 * | |
| 1126 * return FAIL for failure, OK otherwise | |
| 1127 */ | |
| 1128 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1129 stuff_yank(int regname, char_u *p) |
| 7 | 1130 { |
| 1131 char_u *lp; | |
| 1132 char_u **pp; | |
| 1133 | |
| 1134 /* check for read-only register */ | |
| 1135 if (regname != 0 && !valid_yank_reg(regname, TRUE)) | |
| 1136 { | |
| 1137 vim_free(p); | |
| 1138 return FAIL; | |
| 1139 } | |
| 1140 if (regname == '_') /* black hole: don't do anything */ | |
| 1141 { | |
| 1142 vim_free(p); | |
| 1143 return OK; | |
| 1144 } | |
| 1145 get_yank_register(regname, TRUE); | |
| 1146 if (y_append && y_current->y_array != NULL) | |
| 1147 { | |
| 1148 pp = &(y_current->y_array[y_current->y_size - 1]); | |
| 1149 lp = lalloc((long_u)(STRLEN(*pp) + STRLEN(p) + 1), TRUE); | |
| 1150 if (lp == NULL) | |
| 1151 { | |
| 1152 vim_free(p); | |
| 1153 return FAIL; | |
| 1154 } | |
| 1155 STRCPY(lp, *pp); | |
| 1156 STRCAT(lp, p); | |
| 1157 vim_free(p); | |
| 1158 vim_free(*pp); | |
| 1159 *pp = lp; | |
| 1160 } | |
| 1161 else | |
| 1162 { | |
| 1163 free_yank_all(); | |
| 1164 if ((y_current->y_array = | |
| 1165 (char_u **)alloc((unsigned)sizeof(char_u *))) == NULL) | |
| 1166 { | |
| 1167 vim_free(p); | |
| 1168 return FAIL; | |
| 1169 } | |
| 1170 y_current->y_array[0] = p; | |
| 1171 y_current->y_size = 1; | |
| 1172 y_current->y_type = MCHAR; /* used to be MLINE, why? */ | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1173 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1174 y_current->y_time_set = vim_time(); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1175 #endif |
| 7 | 1176 } |
| 1177 return OK; | |
| 1178 } | |
| 1179 | |
| 1893 | 1180 static int execreg_lastc = NUL; |
| 1181 | |
| 7 | 1182 /* |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1183 * Execute a yank register: copy it into the stuff buffer. |
| 7 | 1184 * |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1185 * Return FAIL for failure, OK otherwise. |
| 7 | 1186 */ |
| 1187 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1188 do_execreg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1189 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1190 int colon, /* insert ':' before each line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1191 int addcr, /* always add '\n' to end of line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1192 int silent) /* set "silent" flag in typeahead buffer */ |
| 7 | 1193 { |
| 1194 long i; | |
| 1195 char_u *p; | |
| 1196 int retval = OK; | |
| 1197 int remap; | |
| 1198 | |
| 1199 if (regname == '@') /* repeat previous one */ | |
| 168 | 1200 { |
| 1893 | 1201 if (execreg_lastc == NUL) |
| 168 | 1202 { |
| 1203 EMSG(_("E748: No previously used register")); | |
| 1204 return FAIL; | |
| 1205 } | |
| 1893 | 1206 regname = execreg_lastc; |
| 168 | 1207 } |
| 7 | 1208 /* check for valid regname */ |
| 1209 if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) | |
| 168 | 1210 { |
| 1211 emsg_invreg(regname); | |
| 7 | 1212 return FAIL; |
| 168 | 1213 } |
| 1893 | 1214 execreg_lastc = regname; |
| 7 | 1215 |
| 1216 #ifdef FEAT_CLIPBOARD | |
| 1217 regname = may_get_selection(regname); | |
| 1218 #endif | |
| 1219 | |
| 1220 if (regname == '_') /* black hole: don't stuff anything */ | |
| 1221 return OK; | |
| 1222 | |
| 1223 #ifdef FEAT_CMDHIST | |
| 1224 if (regname == ':') /* use last command line */ | |
| 1225 { | |
| 1226 if (last_cmdline == NULL) | |
| 1227 { | |
| 1228 EMSG(_(e_nolastcmd)); | |
| 1229 return FAIL; | |
| 1230 } | |
| 1231 vim_free(new_last_cmdline); /* don't keep the cmdline containing @: */ | |
| 1232 new_last_cmdline = NULL; | |
| 16 | 1233 /* Escape all control characters with a CTRL-V */ |
| 1234 p = vim_strsave_escaped_ext(last_cmdline, | |
| 20 | 1235 (char_u *)"\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037", Ctrl_V, FALSE); |
| 16 | 1236 if (p != NULL) |
| 480 | 1237 { |
| 1238 /* When in Visual mode "'<,'>" will be prepended to the command. | |
| 1239 * Remove it when it's already there. */ | |
| 1240 if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) | |
| 1077 | 1241 retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); |
| 480 | 1242 else |
| 1077 | 1243 retval = put_in_typebuf(p, TRUE, TRUE, silent); |
| 480 | 1244 } |
| 16 | 1245 vim_free(p); |
| 7 | 1246 } |
| 1247 #endif | |
| 1248 #ifdef FEAT_EVAL | |
| 1249 else if (regname == '=') | |
| 1250 { | |
| 1251 p = get_expr_line(); | |
| 1252 if (p == NULL) | |
| 1253 return FAIL; | |
| 1077 | 1254 retval = put_in_typebuf(p, TRUE, colon, silent); |
| 7 | 1255 vim_free(p); |
| 1256 } | |
| 1257 #endif | |
| 1258 else if (regname == '.') /* use last inserted text */ | |
| 1259 { | |
| 1260 p = get_last_insert_save(); | |
| 1261 if (p == NULL) | |
| 1262 { | |
| 1263 EMSG(_(e_noinstext)); | |
| 1264 return FAIL; | |
| 1265 } | |
| 1077 | 1266 retval = put_in_typebuf(p, FALSE, colon, silent); |
| 7 | 1267 vim_free(p); |
| 1268 } | |
| 1269 else | |
| 1270 { | |
| 1271 get_yank_register(regname, FALSE); | |
| 1272 if (y_current->y_array == NULL) | |
| 1273 return FAIL; | |
| 1274 | |
| 1275 /* Disallow remaping for ":@r". */ | |
| 1276 remap = colon ? REMAP_NONE : REMAP_YES; | |
| 1277 | |
| 1278 /* | |
| 1279 * Insert lines into typeahead buffer, from last one to first one. | |
| 1280 */ | |
| 1034 | 1281 put_reedit_in_typebuf(silent); |
| 7 | 1282 for (i = y_current->y_size; --i >= 0; ) |
| 1283 { | |
| 1077 | 1284 char_u *escaped; |
| 1285 | |
| 7 | 1286 /* insert NL between lines and after last line if type is MLINE */ |
| 1287 if (y_current->y_type == MLINE || i < y_current->y_size - 1 | |
| 1288 || addcr) | |
| 1289 { | |
| 1034 | 1290 if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) |
| 7 | 1291 return FAIL; |
| 1292 } | |
| 1077 | 1293 escaped = vim_strsave_escape_csi(y_current->y_array[i]); |
| 1294 if (escaped == NULL) | |
| 1295 return FAIL; | |
| 1296 retval = ins_typebuf(escaped, remap, 0, TRUE, silent); | |
| 1297 vim_free(escaped); | |
| 1298 if (retval == FAIL) | |
| 7 | 1299 return FAIL; |
| 1034 | 1300 if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) |
| 7 | 1301 == FAIL) |
| 1302 return FAIL; | |
| 1303 } | |
| 1304 Exec_reg = TRUE; /* disable the 'q' command */ | |
| 1305 } | |
| 1306 return retval; | |
| 1307 } | |
| 1308 | |
| 1309 /* | |
| 1310 * If "restart_edit" is not zero, put it in the typeahead buffer, so that it's | |
| 1311 * used only after other typeahead has been processed. | |
| 1312 */ | |
| 1313 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1314 put_reedit_in_typebuf(int silent) |
| 7 | 1315 { |
| 1316 char_u buf[3]; | |
| 1317 | |
| 1318 if (restart_edit != NUL) | |
| 1319 { | |
| 1320 if (restart_edit == 'V') | |
| 1321 { | |
| 1322 buf[0] = 'g'; | |
| 1323 buf[1] = 'R'; | |
| 1324 buf[2] = NUL; | |
| 1325 } | |
| 1326 else | |
| 1327 { | |
| 1328 buf[0] = restart_edit == 'I' ? 'i' : restart_edit; | |
| 1329 buf[1] = NUL; | |
| 1330 } | |
| 1034 | 1331 if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK) |
| 7 | 1332 restart_edit = NUL; |
| 1333 } | |
| 1334 } | |
| 1335 | |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1336 /* |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1337 * Insert register contents "s" into the typeahead buffer, so that it will be |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1338 * executed again. |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1339 * When "esc" is TRUE it is to be taken literally: Escape CSI characters and |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1340 * no remapping. |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1341 */ |
| 7 | 1342 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1343 put_in_typebuf( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1344 char_u *s, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1345 int esc, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1346 int colon, /* add ':' before the line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1347 int silent) |
| 7 | 1348 { |
| 1349 int retval = OK; | |
| 1350 | |
| 1034 | 1351 put_reedit_in_typebuf(silent); |
| 7 | 1352 if (colon) |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1353 retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent); |
| 7 | 1354 if (retval == OK) |
| 1077 | 1355 { |
| 1356 char_u *p; | |
| 1357 | |
| 1358 if (esc) | |
| 1359 p = vim_strsave_escape_csi(s); | |
| 1360 else | |
| 1361 p = s; | |
| 1362 if (p == NULL) | |
| 1363 retval = FAIL; | |
| 1364 else | |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1365 retval = ins_typebuf(p, esc ? REMAP_NONE : REMAP_YES, |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1366 0, TRUE, silent); |
| 1077 | 1367 if (esc) |
| 1368 vim_free(p); | |
| 1369 } | |
| 7 | 1370 if (colon && retval == OK) |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1371 retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent); |
| 7 | 1372 return retval; |
| 1373 } | |
| 1374 | |
| 1375 /* | |
| 1376 * Insert a yank register: copy it into the Read buffer. | |
| 1377 * Used by CTRL-R command and middle mouse button in insert mode. | |
| 1378 * | |
| 1379 * return FAIL for failure, OK otherwise | |
| 1380 */ | |
| 1381 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1382 insert_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1383 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1384 int literally) /* insert literally, not as if typed */ |
| 7 | 1385 { |
| 1386 long i; | |
| 1387 int retval = OK; | |
| 1388 char_u *arg; | |
| 1389 int allocated; | |
| 1390 | |
| 1391 /* | |
| 1392 * It is possible to get into an endless loop by having CTRL-R a in | |
| 1393 * register a and then, in insert mode, doing CTRL-R a. | |
| 1394 * If you hit CTRL-C, the loop will be broken here. | |
| 1395 */ | |
| 1396 ui_breakcheck(); | |
| 1397 if (got_int) | |
| 1398 return FAIL; | |
| 1399 | |
| 1400 /* check for valid regname */ | |
| 1401 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
| 1402 return FAIL; | |
| 1403 | |
| 1404 #ifdef FEAT_CLIPBOARD | |
| 1405 regname = may_get_selection(regname); | |
| 1406 #endif | |
| 1407 | |
| 1408 if (regname == '.') /* insert last inserted text */ | |
| 1409 retval = stuff_inserted(NUL, 1L, TRUE); | |
| 1410 else if (get_spec_reg(regname, &arg, &allocated, TRUE)) | |
| 1411 { | |
| 1412 if (arg == NULL) | |
| 1413 return FAIL; | |
| 1414 stuffescaped(arg, literally); | |
| 1415 if (allocated) | |
| 1416 vim_free(arg); | |
| 1417 } | |
| 1418 else /* name or number register */ | |
| 1419 { | |
| 1420 get_yank_register(regname, FALSE); | |
| 1421 if (y_current->y_array == NULL) | |
| 1422 retval = FAIL; | |
| 1423 else | |
| 1424 { | |
| 1425 for (i = 0; i < y_current->y_size; ++i) | |
| 1426 { | |
| 1427 stuffescaped(y_current->y_array[i], literally); | |
| 1428 /* | |
| 1429 * Insert a newline between lines and after last line if | |
| 1430 * y_type is MLINE. | |
| 1431 */ | |
| 1432 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 1433 stuffcharReadbuff('\n'); | |
| 1434 } | |
| 1435 } | |
| 1436 } | |
| 1437 | |
| 1438 return retval; | |
| 1439 } | |
| 1440 | |
| 1441 /* | |
| 1442 * Stuff a string into the typeahead buffer, such that edit() will insert it | |
| 1443 * literally ("literally" TRUE) or interpret is as typed characters. | |
| 1444 */ | |
| 1445 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1446 stuffescaped(char_u *arg, int literally) |
| 7 | 1447 { |
| 1448 int c; | |
| 1449 char_u *start; | |
| 1450 | |
| 1451 while (*arg != NUL) | |
| 1452 { | |
| 1453 /* Stuff a sequence of normal ASCII characters, that's fast. Also | |
| 1454 * stuff K_SPECIAL to get the effect of a special key when "literally" | |
| 1455 * is TRUE. */ | |
| 1456 start = arg; | |
| 1457 while ((*arg >= ' ' | |
| 1458 #ifndef EBCDIC | |
| 1459 && *arg < DEL /* EBCDIC: chars above space are normal */ | |
| 1460 #endif | |
| 1461 ) | |
| 1462 || (*arg == K_SPECIAL && !literally)) | |
| 1463 ++arg; | |
| 1464 if (arg > start) | |
| 1465 stuffReadbuffLen(start, (long)(arg - start)); | |
| 1466 | |
| 1467 /* stuff a single special character */ | |
| 1468 if (*arg != NUL) | |
| 1469 { | |
| 1470 #ifdef FEAT_MBYTE | |
| 1471 if (has_mbyte) | |
|
2446
348f64c129df
Fixed: CTRL-R in Insert mode doesn't insert composing characters.
Bram Moolenaar <bram@vim.org>
parents:
2311
diff
changeset
|
1472 c = mb_cptr2char_adv(&arg); |
| 7 | 1473 else |
| 1474 #endif | |
| 1475 c = *arg++; | |
| 1476 if (literally && ((c < ' ' && c != TAB) || c == DEL)) | |
| 1477 stuffcharReadbuff(Ctrl_V); | |
| 1478 stuffcharReadbuff(c); | |
| 1479 } | |
| 1480 } | |
| 1481 } | |
| 1482 | |
| 1483 /* | |
| 1157 | 1484 * If "regname" is a special register, return TRUE and store a pointer to its |
| 1485 * value in "argp". | |
| 7 | 1486 */ |
| 15 | 1487 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1488 get_spec_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1489 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1490 char_u **argp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1491 int *allocated, /* return: TRUE when value was allocated */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1492 int errmsg) /* give error message when failing */ |
| 7 | 1493 { |
| 1494 int cnt; | |
| 1495 | |
| 1496 *argp = NULL; | |
| 1497 *allocated = FALSE; | |
| 1498 switch (regname) | |
| 1499 { | |
| 1500 case '%': /* file name */ | |
| 1501 if (errmsg) | |
| 1502 check_fname(); /* will give emsg if not set */ | |
| 1503 *argp = curbuf->b_fname; | |
| 1504 return TRUE; | |
| 1505 | |
| 1506 case '#': /* alternate file name */ | |
| 1507 *argp = getaltfname(errmsg); /* may give emsg if not set */ | |
| 1508 return TRUE; | |
| 1509 | |
| 1510 #ifdef FEAT_EVAL | |
| 1511 case '=': /* result of expression */ | |
| 1512 *argp = get_expr_line(); | |
| 1513 *allocated = TRUE; | |
| 1514 return TRUE; | |
| 1515 #endif | |
| 1516 | |
| 1517 case ':': /* last command line */ | |
| 1518 if (last_cmdline == NULL && errmsg) | |
| 1519 EMSG(_(e_nolastcmd)); | |
| 1520 *argp = last_cmdline; | |
| 1521 return TRUE; | |
| 1522 | |
| 1523 case '/': /* last search-pattern */ | |
| 1524 if (last_search_pat() == NULL && errmsg) | |
| 1525 EMSG(_(e_noprevre)); | |
| 1526 *argp = last_search_pat(); | |
| 1527 return TRUE; | |
| 1528 | |
| 1529 case '.': /* last inserted text */ | |
| 1530 *argp = get_last_insert_save(); | |
| 1531 *allocated = TRUE; | |
| 1532 if (*argp == NULL && errmsg) | |
| 1533 EMSG(_(e_noinstext)); | |
| 1534 return TRUE; | |
| 1535 | |
| 1536 #ifdef FEAT_SEARCHPATH | |
| 1537 case Ctrl_F: /* Filename under cursor */ | |
| 1538 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
| 1539 if (!errmsg) | |
| 1540 return FALSE; | |
| 1541 *argp = file_name_at_cursor(FNAME_MESS | FNAME_HYP | |
| 681 | 1542 | (regname == Ctrl_P ? FNAME_EXP : 0), 1L, NULL); |
| 7 | 1543 *allocated = TRUE; |
| 1544 return TRUE; | |
| 1545 #endif | |
| 1546 | |
| 1547 case Ctrl_W: /* word under cursor */ | |
| 1548 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
| 1549 if (!errmsg) | |
| 1550 return FALSE; | |
| 1551 cnt = find_ident_under_cursor(argp, regname == Ctrl_W | |
| 1552 ? (FIND_IDENT|FIND_STRING) : FIND_STRING); | |
| 1553 *argp = cnt ? vim_strnsave(*argp, cnt) : NULL; | |
| 1554 *allocated = TRUE; | |
| 1555 return TRUE; | |
| 1556 | |
| 1557 case '_': /* black hole: always empty */ | |
| 1558 *argp = (char_u *)""; | |
| 1559 return TRUE; | |
| 1560 } | |
| 1561 | |
| 1562 return FALSE; | |
| 1563 } | |
| 1564 | |
| 1565 /* | |
| 15 | 1566 * Paste a yank register into the command line. |
| 1567 * Only for non-special registers. | |
| 1568 * Used by CTRL-R command in command-line mode | |
| 7 | 1569 * insert_reg() can't be used here, because special characters from the |
| 1570 * register contents will be interpreted as commands. | |
| 1571 * | |
| 1572 * return FAIL for failure, OK otherwise | |
| 1573 */ | |
| 1574 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1575 cmdline_paste_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1576 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1577 int literally, /* Insert text literally instead of "as typed" */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1578 int remcr) /* don't add CR characters */ |
| 7 | 1579 { |
| 1580 long i; | |
| 1581 | |
| 1582 get_yank_register(regname, FALSE); | |
| 1583 if (y_current->y_array == NULL) | |
| 1584 return FAIL; | |
| 1585 | |
| 1586 for (i = 0; i < y_current->y_size; ++i) | |
| 1587 { | |
| 1588 cmdline_paste_str(y_current->y_array[i], literally); | |
| 1589 | |
| 1015 | 1590 /* Insert ^M between lines and after last line if type is MLINE. |
|
7336
4c5f53a60543
commit https://github.com/vim/vim/commit/6f62fed349bf829da2adb02619dc9acba13c8ab6
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
1591 * Don't do this when "remcr" is TRUE. */ |
|
4c5f53a60543
commit https://github.com/vim/vim/commit/6f62fed349bf829da2adb02619dc9acba13c8ab6
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
1592 if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr) |
| 7 | 1593 cmdline_paste_str((char_u *)"\r", literally); |
| 1594 | |
| 1595 /* Check for CTRL-C, in case someone tries to paste a few thousand | |
| 1596 * lines and gets bored. */ | |
| 1597 ui_breakcheck(); | |
| 1598 if (got_int) | |
| 1599 return FAIL; | |
| 1600 } | |
| 1601 return OK; | |
| 1602 } | |
| 1603 | |
| 1604 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
| 1605 /* | |
| 1606 * Adjust the register name pointed to with "rp" for the clipboard being | |
| 1607 * used always and the clipboard being available. | |
| 1608 */ | |
| 1609 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1610 adjust_clip_reg(int *rp) |
| 7 | 1611 { |
| 2654 | 1612 /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', |
| 1613 * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ | |
| 6116 | 1614 if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0)) |
| 1615 { | |
| 1616 if (clip_unnamed != 0) | |
| 1617 *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
| 2654 | 1618 ? '+' : '*'; |
| 6116 | 1619 else |
| 1620 *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
| 1621 ? '+' : '*'; | |
| 1622 } | |
| 7 | 1623 if (!clip_star.available && *rp == '*') |
| 1624 *rp = 0; | |
| 1625 if (!clip_plus.available && *rp == '+') | |
| 1626 *rp = 0; | |
| 1627 } | |
| 1628 #endif | |
| 1629 | |
| 1630 /* | |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1631 * 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
|
1632 */ |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1633 void |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1634 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
|
1635 { |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1636 int n; |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1637 |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1638 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
|
1639 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
|
1640 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
|
1641 y_regs[n] = y_regs[n - 1]; |
|
11597
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1642 y_current = &y_regs[1]; |
|
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1643 if (!y_append) |
|
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1644 y_previous = y_current; |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1645 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
|
1646 } |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1647 |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1648 /* |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1649 * Handle a delete operation. |
| 7 | 1650 * |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1651 * Return FAIL if undo failed, OK otherwise. |
| 7 | 1652 */ |
| 1653 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1654 op_delete(oparg_T *oap) |
| 7 | 1655 { |
| 1656 int n; | |
| 1657 linenr_T lnum; | |
| 1658 char_u *ptr; | |
| 1659 char_u *newp, *oldp; | |
| 1660 struct block_def bd; | |
| 1661 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
| 1662 int did_yank = FALSE; | |
| 3782 | 1663 int orig_regname = oap->regname; |
| 7 | 1664 |
| 1665 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
| 1666 return OK; | |
| 1667 | |
| 1668 /* Nothing to delete, return here. Do prepare undo, for op_change(). */ | |
| 1669 if (oap->empty) | |
| 1670 return u_save_cursor(); | |
| 1671 | |
| 1672 if (!curbuf->b_p_ma) | |
| 1673 { | |
| 1674 EMSG(_(e_modifiable)); | |
| 1675 return FAIL; | |
| 1676 } | |
| 1677 | |
| 1678 #ifdef FEAT_CLIPBOARD | |
| 1679 adjust_clip_reg(&oap->regname); | |
| 1680 #endif | |
| 1681 | |
| 1682 #ifdef FEAT_MBYTE | |
| 1683 if (has_mbyte) | |
| 1684 mb_adjust_opend(oap); | |
| 1685 #endif | |
| 1686 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1687 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1688 * 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
|
1689 * 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
|
1690 * 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
|
1691 */ |
| 7 | 1692 if ( oap->motion_type == MCHAR |
| 1693 && !oap->is_VIsual | |
| 50 | 1694 && !oap->block_mode |
| 7 | 1695 && oap->line_count > 1 |
| 3254 | 1696 && oap->motion_force == NUL |
| 7 | 1697 && oap->op_type == OP_DELETE) |
| 1698 { | |
| 2957 | 1699 ptr = ml_get(oap->end.lnum) + oap->end.col; |
| 1700 if (*ptr != NUL) | |
| 1701 ptr += oap->inclusive; | |
| 7 | 1702 ptr = skipwhite(ptr); |
| 1703 if (*ptr == NUL && inindent(0)) | |
| 1704 oap->motion_type = MLINE; | |
| 1705 } | |
| 1706 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1707 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1708 * 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
|
1709 * 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
|
1710 */ |
| 7 | 1711 if ( oap->motion_type == MCHAR |
| 1712 && oap->line_count == 1 | |
| 1713 && oap->op_type == OP_DELETE | |
| 1714 && *ml_get(oap->start.lnum) == NUL) | |
| 1715 { | |
| 1716 /* | |
| 446 | 1717 * It's an error to operate on an empty region, when 'E' included in |
| 7 | 1718 * 'cpoptions' (Vi compatible). |
| 1719 */ | |
| 446 | 1720 #ifdef FEAT_VIRTUALEDIT |
| 1721 if (virtual_op) | |
| 1722 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
| 1723 * marks as if it happened. */ | |
| 1724 goto setmarks; | |
| 1725 #endif | |
| 7 | 1726 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
| 1727 beep_flush(); | |
| 1728 return OK; | |
| 1729 } | |
| 1730 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1731 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1732 * 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
|
1733 * 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
|
1734 * 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
|
1735 */ |
| 7 | 1736 if (oap->regname != '_') |
| 1737 { | |
| 1738 if (oap->regname != 0) | |
| 1739 { | |
| 1740 /* check for read-only register */ | |
| 1741 if (!valid_yank_reg(oap->regname, TRUE)) | |
| 1742 { | |
| 1743 beep_flush(); | |
| 1744 return OK; | |
| 1745 } | |
| 1746 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
| 1747 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
| 1748 did_yank = TRUE; | |
| 1749 } | |
| 1750 | |
| 1751 /* | |
| 1752 * Put deleted text into register 1 and shift number registers if the | |
| 1753 * delete contains a line break, or when a regname has been specified. | |
| 3782 | 1754 * Use the register name from before adjust_clip_reg() may have |
| 1755 * changed it. | |
| 7 | 1756 */ |
| 3782 | 1757 if (orig_regname != 0 || oap->motion_type == MLINE |
| 7 | 1758 || oap->line_count > 1 || oap->use_reg_one) |
| 1759 { | |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1760 shift_delete_registers(); |
| 7 | 1761 if (op_yank(oap, TRUE, FALSE) == OK) |
| 1762 did_yank = TRUE; | |
| 1763 } | |
| 1764 | |
| 3468 | 1765 /* Yank into small delete register when no named register specified |
| 1766 * and the delete is within one line. */ | |
| 1767 if (( | |
| 1768 #ifdef FEAT_CLIPBOARD | |
| 3584 | 1769 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
| 1770 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
| 3468 | 1771 #endif |
| 1772 oap->regname == 0) && oap->motion_type != MLINE | |
| 7 | 1773 && oap->line_count == 1) |
| 1774 { | |
| 1775 oap->regname = '-'; | |
| 1776 get_yank_register(oap->regname, TRUE); | |
| 1777 if (op_yank(oap, TRUE, FALSE) == OK) | |
| 1778 did_yank = TRUE; | |
| 1779 oap->regname = 0; | |
| 1780 } | |
| 1781 | |
| 1782 /* | |
| 1783 * If there's too much stuff to fit in the yank register, then get a | |
| 1784 * confirmation before doing the delete. This is crude, but simple. | |
| 1785 * And it avoids doing a delete of something we can't put back if we | |
| 1786 * want. | |
| 1787 */ | |
| 1788 if (!did_yank) | |
| 1789 { | |
| 1790 int msg_silent_save = msg_silent; | |
| 1791 | |
| 1792 msg_silent = 0; /* must display the prompt */ | |
| 1793 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
| 1794 msg_silent = msg_silent_save; | |
| 1795 if (n != 'y') | |
| 1796 { | |
| 1797 EMSG(_(e_abort)); | |
| 1798 return FAIL; | |
| 1799 } | |
| 1800 } | |
| 1801 } | |
| 1802 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1803 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1804 * 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
|
1805 */ |
| 7 | 1806 if (oap->block_mode) |
| 1807 { | |
| 1808 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 1809 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 1810 return FAIL; | |
| 1811 | |
| 1812 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
| 1813 { | |
| 1814 block_prep(oap, &bd, lnum, TRUE); | |
| 1815 if (bd.textlen == 0) /* nothing to delete */ | |
| 1816 continue; | |
| 1817 | |
| 1818 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
| 1819 if (lnum == curwin->w_cursor.lnum) | |
| 1820 { | |
| 1821 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
| 1822 # ifdef FEAT_VIRTUALEDIT | |
| 1823 curwin->w_cursor.coladd = 0; | |
| 1824 # endif | |
| 1825 } | |
| 1826 | |
| 1827 /* n == number of chars deleted | |
| 1828 * If we delete a TAB, it may be replaced by several characters. | |
| 1829 * Thus the number of characters may increase! | |
| 1830 */ | |
| 1831 n = bd.textlen - bd.startspaces - bd.endspaces; | |
| 1832 oldp = ml_get(lnum); | |
| 1833 newp = alloc_check((unsigned)STRLEN(oldp) + 1 - n); | |
| 1834 if (newp == NULL) | |
| 1835 continue; | |
| 1836 /* copy up to deleted part */ | |
| 1837 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 1838 /* insert spaces */ | |
| 6929 | 1839 vim_memset(newp + bd.textcol, ' ', |
| 7 | 1840 (size_t)(bd.startspaces + bd.endspaces)); |
| 1841 /* copy the part after the deleted part */ | |
| 1842 oldp += bd.textcol + bd.textlen; | |
| 1622 | 1843 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
| 7 | 1844 /* replace the line */ |
| 1845 ml_replace(lnum, newp, FALSE); | |
| 1846 } | |
| 1847 | |
| 1848 check_cursor_col(); | |
| 1849 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
| 1850 oap->end.lnum + 1, 0L); | |
| 1851 oap->line_count = 0; /* no lines deleted */ | |
| 1852 } | |
| 5735 | 1853 else if (oap->motion_type == MLINE) |
| 7 | 1854 { |
| 1855 if (oap->op_type == OP_CHANGE) | |
| 1856 { | |
| 1857 /* Delete the lines except the first one. Temporarily move the | |
| 1858 * cursor to the next line. Save the current line number, if the | |
| 1859 * last line is deleted it may be changed. | |
| 1860 */ | |
| 1861 if (oap->line_count > 1) | |
| 1862 { | |
| 1863 lnum = curwin->w_cursor.lnum; | |
| 1864 ++curwin->w_cursor.lnum; | |
| 1865 del_lines((long)(oap->line_count - 1), TRUE); | |
| 1866 curwin->w_cursor.lnum = lnum; | |
| 1867 } | |
| 1868 if (u_save_cursor() == FAIL) | |
| 1869 return FAIL; | |
| 1870 if (curbuf->b_p_ai) /* don't delete indent */ | |
| 1871 { | |
| 1872 beginline(BL_WHITE); /* cursor on first non-white */ | |
| 1873 did_ai = TRUE; /* delete the indent when ESC hit */ | |
| 1874 ai_col = curwin->w_cursor.col; | |
| 1875 } | |
| 1876 else | |
| 1877 beginline(0); /* cursor in column 0 */ | |
| 1878 truncate_line(FALSE); /* delete the rest of the line */ | |
| 1879 /* leave cursor past last char in line */ | |
| 1880 if (oap->line_count > 1) | |
| 1881 u_clearline(); /* "U" command not possible after "2cc" */ | |
| 1882 } | |
| 1883 else | |
| 1884 { | |
| 1885 del_lines(oap->line_count, TRUE); | |
| 1886 beginline(BL_WHITE | BL_FIX); | |
| 1887 u_clearline(); /* "U" command not possible after "dd" */ | |
| 1888 } | |
| 1889 } | |
| 1890 else | |
| 1891 { | |
| 1892 #ifdef FEAT_VIRTUALEDIT | |
| 1893 if (virtual_op) | |
| 1894 { | |
| 1895 int endcol = 0; | |
| 1896 | |
| 1897 /* For virtualedit: break the tabs that are partly included. */ | |
| 1898 if (gchar_pos(&oap->start) == '\t') | |
| 1899 { | |
| 1900 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
| 1901 return FAIL; | |
| 1902 if (oap->line_count == 1) | |
| 1903 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
| 1904 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
| 1905 oap->start = curwin->w_cursor; | |
| 1906 if (oap->line_count == 1) | |
| 1907 { | |
| 1908 coladvance(endcol); | |
| 1909 oap->end.col = curwin->w_cursor.col; | |
| 1910 oap->end.coladd = curwin->w_cursor.coladd; | |
| 1911 curwin->w_cursor = oap->start; | |
| 1912 } | |
| 1913 } | |
| 1914 | |
| 1915 /* Break a tab only when it's included in the area. */ | |
| 1916 if (gchar_pos(&oap->end) == '\t' | |
| 1917 && (int)oap->end.coladd < oap->inclusive) | |
| 1918 { | |
| 1919 /* save last line for undo */ | |
| 1920 if (u_save((linenr_T)(oap->end.lnum - 1), | |
| 1921 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 1922 return FAIL; | |
| 1923 curwin->w_cursor = oap->end; | |
| 1924 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
| 1925 oap->end = curwin->w_cursor; | |
| 1926 curwin->w_cursor = oap->start; | |
| 1927 } | |
| 1928 } | |
| 1929 #endif | |
| 1930 | |
| 1931 if (oap->line_count == 1) /* delete characters within one line */ | |
| 1932 { | |
| 1933 if (u_save_cursor() == FAIL) /* save line for undo */ | |
| 1934 return FAIL; | |
| 1935 | |
| 1936 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
| 5735 | 1937 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
| 7 | 1938 && oap->op_type == OP_CHANGE |
| 1939 && oap->end.lnum == curwin->w_cursor.lnum | |
| 5735 | 1940 && !oap->is_VIsual) |
| 7 | 1941 display_dollar(oap->end.col - !oap->inclusive); |
| 1942 | |
| 1943 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
| 1944 | |
| 1945 #ifdef FEAT_VIRTUALEDIT | |
| 1946 if (virtual_op) | |
| 1947 { | |
| 1948 /* fix up things for virtualedit-delete: | |
| 1949 * break the tabs which are going to get in our way | |
| 1950 */ | |
| 1951 char_u *curline = ml_get_curline(); | |
| 1952 int len = (int)STRLEN(curline); | |
| 1953 | |
| 1954 if (oap->end.coladd != 0 | |
| 1955 && (int)oap->end.col >= len - 1 | |
| 1956 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
| 1957 n++; | |
| 1958 /* Delete at least one char (e.g, when on a control char). */ | |
| 1959 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
| 1960 n = 1; | |
| 1961 | |
| 1962 /* When deleted a char in the line, reset coladd. */ | |
| 1963 if (gchar_cursor() != NUL) | |
| 1964 curwin->w_cursor.coladd = 0; | |
| 1965 } | |
| 1966 #endif | |
| 6826 | 1967 (void)del_bytes((long)n, !virtual_op, |
| 1968 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
| 7 | 1969 } |
| 1970 else /* delete characters between lines */ | |
| 1971 { | |
| 1972 pos_T curpos; | |
| 1973 | |
| 1974 /* save deleted and changed lines for undo */ | |
| 1975 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
| 1976 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
| 1977 return FAIL; | |
| 1978 | |
| 1979 truncate_line(TRUE); /* delete from cursor to end of line */ | |
| 1980 | |
| 1981 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
| 1982 ++curwin->w_cursor.lnum; | |
| 1983 del_lines((long)(oap->line_count - 2), FALSE); | |
| 1984 | |
| 6826 | 1985 /* delete from start of line until op_end */ |
| 2957 | 1986 n = (oap->end.col + 1 - !oap->inclusive); |
| 6826 | 1987 curwin->w_cursor.col = 0; |
| 1988 (void)del_bytes((long)n, !virtual_op, | |
| 1989 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
| 1990 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
| 1991 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
| 7 | 1992 } |
| 1993 } | |
| 1994 | |
| 1995 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
| 1996 | |
| 446 | 1997 #ifdef FEAT_VIRTUALEDIT |
| 1998 setmarks: | |
| 1999 #endif | |
| 7 | 2000 if (oap->block_mode) |
| 2001 { | |
| 2002 curbuf->b_op_end.lnum = oap->end.lnum; | |
| 2003 curbuf->b_op_end.col = oap->start.col; | |
| 2004 } | |
| 2005 else | |
| 2006 curbuf->b_op_end = oap->start; | |
| 2007 curbuf->b_op_start = oap->start; | |
| 2008 | |
| 2009 return OK; | |
| 2010 } | |
| 2011 | |
| 2012 #ifdef FEAT_MBYTE | |
| 2013 /* | |
| 2014 * Adjust end of operating area for ending on a multi-byte character. | |
| 2015 * Used for deletion. | |
| 2016 */ | |
| 2017 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2018 mb_adjust_opend(oparg_T *oap) |
| 7 | 2019 { |
| 2020 char_u *p; | |
| 2021 | |
| 2022 if (oap->inclusive) | |
| 2023 { | |
| 2024 p = ml_get(oap->end.lnum); | |
| 2025 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
| 2026 } | |
| 2027 } | |
| 2028 #endif | |
| 2029 | |
| 2030 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
| 2031 /* | |
| 2032 * Replace a whole area with one character. | |
| 2033 */ | |
| 2034 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2035 op_replace(oparg_T *oap, int c) |
| 7 | 2036 { |
| 2037 int n, numc; | |
| 2038 #ifdef FEAT_MBYTE | |
| 2039 int num_chars; | |
| 2040 #endif | |
| 2041 char_u *newp, *oldp; | |
| 2042 size_t oldlen; | |
| 2043 struct block_def bd; | |
| 5428 | 2044 char_u *after_p = NULL; |
| 2045 int had_ctrl_v_cr = (c == -1 || c == -2); | |
| 7 | 2046 |
| 2047 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
| 2048 return OK; /* nothing to do */ | |
| 2049 | |
| 5428 | 2050 if (had_ctrl_v_cr) |
| 2051 c = (c == -1 ? '\r' : '\n'); | |
| 2052 | |
| 7 | 2053 #ifdef FEAT_MBYTE |
| 2054 if (has_mbyte) | |
| 2055 mb_adjust_opend(oap); | |
| 2056 #endif | |
| 2057 | |
| 2058 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 2059 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 2060 return FAIL; | |
| 2061 | |
| 2062 /* | |
| 2063 * block mode replace | |
| 2064 */ | |
| 2065 if (oap->block_mode) | |
| 2066 { | |
| 2067 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
| 2068 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
| 2069 { | |
| 1982 | 2070 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
| 7 | 2071 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
| 2072 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
| 2073 continue; /* nothing to replace */ | |
| 2074 | |
| 2075 /* n == number of extra chars required | |
| 2076 * If we split a TAB, it may be replaced by several characters. | |
| 2077 * Thus the number of characters may increase! | |
| 2078 */ | |
| 2079 #ifdef FEAT_VIRTUALEDIT | |
| 2080 /* If the range starts in virtual space, count the initial | |
| 2081 * coladd offset as part of "startspaces" */ | |
| 2082 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
| 2083 { | |
| 2084 pos_T vpos; | |
| 2085 | |
| 1982 | 2086 vpos.lnum = curwin->w_cursor.lnum; |
| 7 | 2087 getvpos(&vpos, oap->start_vcol); |
| 2088 bd.startspaces += vpos.coladd; | |
| 2089 n = bd.startspaces; | |
| 2090 } | |
| 2091 else | |
| 2092 #endif | |
| 2093 /* allow for pre spaces */ | |
| 2094 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
| 2095 | |
| 2096 /* allow for post spp */ | |
| 2097 n += (bd.endspaces | |
| 2098 #ifdef FEAT_VIRTUALEDIT | |
| 2099 && !bd.is_oneChar | |
| 2100 #endif | |
| 2101 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
| 2102 /* Figure out how many characters to replace. */ | |
| 2103 numc = oap->end_vcol - oap->start_vcol + 1; | |
| 2104 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
| 2105 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
| 2106 | |
| 2107 #ifdef FEAT_MBYTE | |
| 2108 /* A double-wide character can be replaced only up to half the | |
| 2109 * times. */ | |
| 2110 if ((*mb_char2cells)(c) > 1) | |
| 2111 { | |
| 2112 if ((numc & 1) && !bd.is_short) | |
| 2113 { | |
| 2114 ++bd.endspaces; | |
| 2115 ++n; | |
| 2116 } | |
| 2117 numc = numc / 2; | |
| 2118 } | |
| 2119 | |
| 2120 /* Compute bytes needed, move character count to num_chars. */ | |
| 2121 num_chars = numc; | |
| 2122 numc *= (*mb_char2len)(c); | |
| 2123 #endif | |
| 2124 /* oldlen includes textlen, so don't double count */ | |
| 2125 n += numc - bd.textlen; | |
| 2126 | |
| 2127 oldp = ml_get_curline(); | |
| 2128 oldlen = STRLEN(oldp); | |
| 2129 newp = alloc_check((unsigned)oldlen + 1 + n); | |
| 2130 if (newp == NULL) | |
| 2131 continue; | |
| 2132 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
| 2133 /* copy up to deleted part */ | |
| 2134 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 2135 oldp += bd.textcol + bd.textlen; | |
| 2136 /* insert pre-spaces */ | |
| 6929 | 2137 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
| 7 | 2138 /* insert replacement chars CHECK FOR ALLOCATED SPACE */ |
| 5428 | 2139 /* -1/-2 is used for entering CR literally. */ |
| 2140 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) | |
| 7 | 2141 { |
| 5428 | 2142 #ifdef FEAT_MBYTE |
| 2143 if (has_mbyte) | |
| 2144 { | |
| 2145 n = (int)STRLEN(newp); | |
| 2146 while (--num_chars >= 0) | |
| 2147 n += (*mb_char2bytes)(c, newp + n); | |
| 2148 } | |
| 2149 else | |
| 2150 #endif | |
| 6929 | 2151 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
| 5428 | 2152 if (!bd.is_short) |
| 2153 { | |
| 2154 /* insert post-spaces */ | |
| 6929 | 2155 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
| 5428 | 2156 /* copy the part after the changed part */ |
| 2157 STRMOVE(newp + STRLEN(newp), oldp); | |
| 2158 } | |
| 7 | 2159 } |
| 2160 else | |
| 2161 { | |
| 5428 | 2162 /* Replacing with \r or \n means splitting the line. */ |
| 5475 | 2163 after_p = alloc_check( |
| 2164 (unsigned)(oldlen + 1 + n - STRLEN(newp))); | |
| 5428 | 2165 if (after_p != NULL) |
| 2166 STRMOVE(after_p, oldp); | |
| 7 | 2167 } |
| 2168 /* replace the line */ | |
| 2169 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 5428 | 2170 if (after_p != NULL) |
| 2171 { | |
| 2172 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
| 2173 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
| 2174 oap->end.lnum++; | |
| 2175 vim_free(after_p); | |
| 2176 } | |
| 7 | 2177 } |
| 2178 } | |
| 2179 else | |
| 2180 { | |
| 2181 /* | |
| 2182 * MCHAR and MLINE motion replace. | |
| 2183 */ | |
| 2184 if (oap->motion_type == MLINE) | |
| 2185 { | |
| 2186 oap->start.col = 0; | |
| 2187 curwin->w_cursor.col = 0; | |
| 2188 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
| 2189 if (oap->end.col) | |
| 2190 --oap->end.col; | |
| 2191 } | |
| 2192 else if (!oap->inclusive) | |
| 2193 dec(&(oap->end)); | |
| 2194 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2195 while (LTOREQ_POS(curwin->w_cursor, oap->end)) |
| 7 | 2196 { |
| 2197 n = gchar_cursor(); | |
| 2198 if (n != NUL) | |
| 2199 { | |
| 2200 #ifdef FEAT_MBYTE | |
| 2201 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
| 2202 { | |
| 2203 /* This is slow, but it handles replacing a single-byte | |
| 2204 * with a multi-byte and the other way around. */ | |
| 4203 | 2205 if (curwin->w_cursor.lnum == oap->end.lnum) |
| 2206 oap->end.col += (*mb_char2len)(c) - (*mb_char2len)(n); | |
| 7 | 2207 n = State; |
| 2208 State = REPLACE; | |
| 2209 ins_char(c); | |
| 2210 State = n; | |
| 2211 /* Backup to the replaced character. */ | |
| 2212 dec_cursor(); | |
| 2213 } | |
| 2214 else | |
| 2215 #endif | |
| 2216 { | |
| 2217 #ifdef FEAT_VIRTUALEDIT | |
| 2218 if (n == TAB) | |
| 2219 { | |
| 2220 int end_vcol = 0; | |
| 2221 | |
| 2222 if (curwin->w_cursor.lnum == oap->end.lnum) | |
| 2223 { | |
| 2224 /* oap->end has to be recalculated when | |
| 2225 * the tab breaks */ | |
| 2226 end_vcol = getviscol2(oap->end.col, | |
| 2227 oap->end.coladd); | |
| 2228 } | |
| 2229 coladvance_force(getviscol()); | |
| 2230 if (curwin->w_cursor.lnum == oap->end.lnum) | |
| 2231 getvpos(&oap->end, end_vcol); | |
| 2232 } | |
| 2233 #endif | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2234 PCHAR(curwin->w_cursor, c); |
| 7 | 2235 } |
| 2236 } | |
| 2237 #ifdef FEAT_VIRTUALEDIT | |
| 2238 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
| 2239 { | |
| 2240 int virtcols = oap->end.coladd; | |
| 2241 | |
| 2242 if (curwin->w_cursor.lnum == oap->start.lnum | |
| 2243 && oap->start.col == oap->end.col && oap->start.coladd) | |
| 2244 virtcols -= oap->start.coladd; | |
| 2245 | |
| 2246 /* oap->end has been trimmed so it's effectively inclusive; | |
| 2247 * as a result an extra +1 must be counted so we don't | |
| 2248 * trample the NUL byte. */ | |
| 2249 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
| 2250 curwin->w_cursor.col -= (virtcols + 1); | |
| 2251 for (; virtcols >= 0; virtcols--) | |
| 2252 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2253 PCHAR(curwin->w_cursor, c); |
| 7 | 2254 if (inc(&curwin->w_cursor) == -1) |
| 2255 break; | |
| 2256 } | |
| 2257 } | |
| 2258 #endif | |
| 2259 | |
| 2260 /* Advance to next character, stop at the end of the file. */ | |
| 2261 if (inc_cursor() == -1) | |
| 2262 break; | |
| 2263 } | |
| 2264 } | |
| 2265 | |
| 2266 curwin->w_cursor = oap->start; | |
| 2267 check_cursor(); | |
| 2268 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
| 2269 | |
| 2270 /* Set "'[" and "']" marks. */ | |
| 2271 curbuf->b_op_start = oap->start; | |
| 2272 curbuf->b_op_end = oap->end; | |
| 2273 | |
| 2274 return OK; | |
| 2275 } | |
| 2276 #endif | |
| 2277 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2278 static int swapchars(int op_type, pos_T *pos, int length); |
| 1525 | 2279 |
| 7 | 2280 /* |
| 2281 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
| 2282 */ | |
| 2283 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2284 op_tilde(oparg_T *oap) |
| 7 | 2285 { |
| 2286 pos_T pos; | |
| 2287 struct block_def bd; | |
| 1528 | 2288 int did_change = FALSE; |
| 7 | 2289 |
| 2290 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 2291 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 2292 return; | |
| 2293 | |
| 2294 pos = oap->start; | |
| 2295 if (oap->block_mode) /* Visual block mode */ | |
| 2296 { | |
| 2297 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
| 2298 { | |
| 1766 | 2299 int one_change; |
| 2300 | |
| 7 | 2301 block_prep(oap, &bd, pos.lnum, FALSE); |
| 2302 pos.col = bd.textcol; | |
| 1766 | 2303 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
| 2304 did_change |= one_change; | |
| 1525 | 2305 |
| 5735 | 2306 #ifdef FEAT_NETBEANS_INTG |
| 2210 | 2307 if (netbeans_active() && one_change) |
| 7 | 2308 { |
| 2309 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 2310 | |
| 33 | 2311 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
| 2312 (long)bd.textlen); | |
| 7 | 2313 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
| 2210 | 2314 &ptr[bd.textcol], bd.textlen); |
| 7 | 2315 } |
| 5735 | 2316 #endif |
| 7 | 2317 } |
| 2318 if (did_change) | |
| 2319 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
| 2320 } | |
| 2321 else /* not block mode */ | |
| 2322 { | |
| 2323 if (oap->motion_type == MLINE) | |
| 2324 { | |
| 2325 oap->start.col = 0; | |
| 2326 pos.col = 0; | |
| 2327 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
| 2328 if (oap->end.col) | |
| 2329 --oap->end.col; | |
| 2330 } | |
| 2331 else if (!oap->inclusive) | |
| 2332 dec(&(oap->end)); | |
| 2333 | |
| 1528 | 2334 if (pos.lnum == oap->end.lnum) |
| 2335 did_change = swapchars(oap->op_type, &pos, | |
| 2336 oap->end.col - pos.col + 1); | |
| 2337 else | |
| 2338 for (;;) | |
| 2339 { | |
| 2340 did_change |= swapchars(oap->op_type, &pos, | |
| 2341 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
| 2342 (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
|
2343 if (LTOREQ_POS(oap->end, pos) || inc(&pos) == -1) |
| 1528 | 2344 break; |
| 2345 } | |
| 7 | 2346 if (did_change) |
| 2347 { | |
| 2348 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
| 2349 0L); | |
| 2350 #ifdef FEAT_NETBEANS_INTG | |
| 2210 | 2351 if (netbeans_active() && did_change) |
| 7 | 2352 { |
| 2353 char_u *ptr; | |
| 2354 int count; | |
| 2355 | |
| 2356 pos = oap->start; | |
| 2357 while (pos.lnum < oap->end.lnum) | |
| 2358 { | |
| 2359 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 835 | 2360 count = (int)STRLEN(ptr) - pos.col; |
| 33 | 2361 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
| 7 | 2362 netbeans_inserted(curbuf, pos.lnum, pos.col, |
| 2210 | 2363 &ptr[pos.col], count); |
| 7 | 2364 pos.col = 0; |
| 2365 pos.lnum++; | |
| 2366 } | |
| 2367 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 2368 count = oap->end.col - pos.col + 1; | |
| 33 | 2369 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
| 7 | 2370 netbeans_inserted(curbuf, pos.lnum, pos.col, |
| 2210 | 2371 &ptr[pos.col], count); |
| 7 | 2372 } |
| 2373 #endif | |
| 2374 } | |
| 2375 } | |
| 2376 | |
| 2377 if (!did_change && oap->is_VIsual) | |
| 2378 /* No change: need to remove the Visual selection */ | |
| 2379 redraw_curbuf_later(INVERTED); | |
| 2380 | |
| 2381 /* | |
| 2382 * Set '[ and '] marks. | |
| 2383 */ | |
| 2384 curbuf->b_op_start = oap->start; | |
| 2385 curbuf->b_op_end = oap->end; | |
| 2386 | |
| 2387 if (oap->line_count > p_report) | |
| 2388 { | |
| 2389 if (oap->line_count == 1) | |
| 2390 MSG(_("1 line changed")); | |
| 2391 else | |
| 2392 smsg((char_u *)_("%ld lines changed"), oap->line_count); | |
| 2393 } | |
| 2394 } | |
| 2395 | |
| 2396 /* | |
| 1525 | 2397 * Invoke swapchar() on "length" bytes at position "pos". |
| 2398 * "pos" is advanced to just after the changed characters. | |
| 2399 * "length" is rounded up to include the whole last multi-byte character. | |
| 2400 * Also works correctly when the number of bytes changes. | |
| 2401 * Returns TRUE if some character was changed. | |
| 2402 */ | |
| 2403 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2404 swapchars(int op_type, pos_T *pos, int length) |
| 1525 | 2405 { |
| 2406 int todo; | |
| 2407 int did_change = 0; | |
| 2408 | |
| 2409 for (todo = length; todo > 0; --todo) | |
| 2410 { | |
| 2411 # ifdef FEAT_MBYTE | |
| 2412 if (has_mbyte) | |
|
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2413 { |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2414 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2415 |
| 1525 | 2416 /* we're counting bytes, not characters */ |
|
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2417 if (len > 0) |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2418 todo -= len - 1; |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2419 } |
| 1525 | 2420 # endif |
| 2421 did_change |= swapchar(op_type, pos); | |
| 2422 if (inc(pos) == -1) /* at end of file */ | |
| 2423 break; | |
| 2424 } | |
| 2425 return did_change; | |
| 2426 } | |
| 2427 | |
| 2428 /* | |
| 7 | 2429 * If op_type == OP_UPPER: make uppercase, |
| 2430 * if op_type == OP_LOWER: make lowercase, | |
| 2431 * if op_type == OP_ROT13: do rot13 encoding, | |
| 2432 * else swap case of character at 'pos' | |
| 2433 * returns TRUE when something actually changed. | |
| 2434 */ | |
| 2435 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2436 swapchar(int op_type, pos_T *pos) |
| 7 | 2437 { |
| 2438 int c; | |
| 2439 int nc; | |
| 2440 | |
| 2441 c = gchar_pos(pos); | |
| 2442 | |
| 2443 /* Only do rot13 encoding for ASCII characters. */ | |
| 2444 if (c >= 0x80 && op_type == OP_ROT13) | |
| 2445 return FALSE; | |
| 2446 | |
| 2447 #ifdef FEAT_MBYTE | |
| 1525 | 2448 if (op_type == OP_UPPER && c == 0xdf |
| 2449 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
| 493 | 2450 { |
| 2451 pos_T sp = curwin->w_cursor; | |
| 2452 | |
| 2453 /* Special handling of German sharp s: change to "SS". */ | |
| 2454 curwin->w_cursor = *pos; | |
| 2455 del_char(FALSE); | |
| 2456 ins_char('S'); | |
| 2457 ins_char('S'); | |
| 2458 curwin->w_cursor = sp; | |
| 2459 inc(pos); | |
| 2460 } | |
| 2461 | |
| 7 | 2462 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
| 2463 return FALSE; | |
| 2464 #endif | |
| 2465 nc = c; | |
| 2466 if (MB_ISLOWER(c)) | |
| 2467 { | |
| 2468 if (op_type == OP_ROT13) | |
| 2469 nc = ROT13(c, 'a'); | |
| 2470 else if (op_type != OP_LOWER) | |
| 2471 nc = MB_TOUPPER(c); | |
| 2472 } | |
| 2473 else if (MB_ISUPPER(c)) | |
| 2474 { | |
| 2475 if (op_type == OP_ROT13) | |
| 2476 nc = ROT13(c, 'A'); | |
| 2477 else if (op_type != OP_UPPER) | |
| 2478 nc = MB_TOLOWER(c); | |
| 2479 } | |
| 2480 if (nc != c) | |
| 2481 { | |
| 2482 #ifdef FEAT_MBYTE | |
| 2483 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
| 2484 { | |
| 2485 pos_T sp = curwin->w_cursor; | |
| 2486 | |
| 2487 curwin->w_cursor = *pos; | |
|
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2488 /* 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
|
2489 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
| 7 | 2490 ins_char(nc); |
| 2491 curwin->w_cursor = sp; | |
| 2492 } | |
| 2493 else | |
| 2494 #endif | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2495 PCHAR(*pos, nc); |
| 7 | 2496 return TRUE; |
| 2497 } | |
| 2498 return FALSE; | |
| 2499 } | |
| 2500 | |
| 2501 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
| 2502 /* | |
| 2503 * op_insert - Insert and append operators for Visual mode. | |
| 2504 */ | |
| 2505 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2506 op_insert(oparg_T *oap, long count1) |
| 7 | 2507 { |
| 2508 long ins_len, pre_textlen = 0; | |
| 2509 char_u *firstline, *ins_text; | |
| 2510 struct block_def bd; | |
| 2511 int i; | |
| 6579 | 2512 pos_T t1; |
| 7 | 2513 |
| 2514 /* edit() changes this - record it for OP_APPEND */ | |
| 2515 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
| 2516 | |
| 2517 /* vis block is still marked. Get rid of it now. */ | |
| 2518 curwin->w_cursor.lnum = oap->start.lnum; | |
| 2519 update_screen(INVERTED); | |
| 2520 | |
| 2521 if (oap->block_mode) | |
| 2522 { | |
| 2523 #ifdef FEAT_VIRTUALEDIT | |
| 2524 /* When 'virtualedit' is used, need to insert the extra spaces before | |
| 2525 * doing block_prep(). When only "block" is used, virtual edit is | |
| 2526 * already disabled, but still need it when calling | |
| 2527 * coladvance_force(). */ | |
| 2528 if (curwin->w_cursor.coladd > 0) | |
| 2529 { | |
| 2530 int old_ve_flags = ve_flags; | |
| 2531 | |
| 2532 ve_flags = VE_ALL; | |
| 2533 if (u_save_cursor() == FAIL) | |
| 2534 return; | |
| 2535 coladvance_force(oap->op_type == OP_APPEND | |
| 2536 ? oap->end_vcol + 1 : getviscol()); | |
| 2537 if (oap->op_type == OP_APPEND) | |
| 2538 --curwin->w_cursor.col; | |
| 2539 ve_flags = old_ve_flags; | |
| 2540 } | |
| 2541 #endif | |
| 2542 /* Get the info about the block before entering the text */ | |
| 2543 block_prep(oap, &bd, oap->start.lnum, TRUE); | |
| 2544 firstline = ml_get(oap->start.lnum) + bd.textcol; | |
| 2545 if (oap->op_type == OP_APPEND) | |
| 2546 firstline += bd.textlen; | |
| 2547 pre_textlen = (long)STRLEN(firstline); | |
| 2548 } | |
| 2549 | |
| 2550 if (oap->op_type == OP_APPEND) | |
| 2551 { | |
| 2552 if (oap->block_mode | |
| 2553 #ifdef FEAT_VIRTUALEDIT | |
| 2554 && curwin->w_cursor.coladd == 0 | |
| 2555 #endif | |
| 2556 ) | |
| 2557 { | |
| 2558 /* Move the cursor to the character right of the block. */ | |
| 2559 curwin->w_set_curswant = TRUE; | |
| 2560 while (*ml_get_cursor() != NUL | |
| 2561 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
| 2562 ++curwin->w_cursor.col; | |
| 2563 if (bd.is_short && !bd.is_MAX) | |
| 2564 { | |
| 2565 /* First line was too short, make it longer and adjust the | |
| 2566 * values in "bd". */ | |
| 2567 if (u_save_cursor() == FAIL) | |
| 2568 return; | |
| 2569 for (i = 0; i < bd.endspaces; ++i) | |
| 2570 ins_char(' '); | |
| 2571 bd.textlen += bd.endspaces; | |
| 2572 } | |
| 2573 } | |
| 2574 else | |
| 2575 { | |
| 2576 curwin->w_cursor = oap->end; | |
| 893 | 2577 check_cursor_col(); |
| 7 | 2578 |
| 2579 /* 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
|
2580 if (!LINEEMPTY(curwin->w_cursor.lnum) |
| 7 | 2581 && oap->start_vcol != oap->end_vcol) |
| 2582 inc_cursor(); | |
| 2583 } | |
| 2584 } | |
| 2585 | |
| 6579 | 2586 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
|
2587 (void)edit(NUL, FALSE, (linenr_T)count1); |
| 7 | 2588 |
| 6579 | 2589 /* When a tab was inserted, and the characters in front of the tab |
| 2590 * have been converted to a tab as well, the column of the cursor | |
| 2591 * might have actually been reduced, so need to adjust here. */ | |
| 2592 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
|
2593 && LT_POS(curbuf->b_op_start_orig, t1)) |
| 6579 | 2594 oap->start = curbuf->b_op_start_orig; |
| 2595 | |
| 1477 | 2596 /* If user has moved off this line, we don't know what to do, so do |
| 2597 * nothing. | |
| 2598 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
| 2599 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
| 7 | 2600 return; |
| 2601 | |
| 2602 if (oap->block_mode) | |
| 2603 { | |
| 2604 struct block_def bd2; | |
| 2605 | |
| 5471 | 2606 /* The user may have moved the cursor before inserting something, try |
| 2607 * to adjust the block for that. */ | |
| 5680 | 2608 if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX) |
| 5471 | 2609 { |
| 2610 if (oap->op_type == OP_INSERT | |
| 5730 | 2611 && oap->start.col |
| 2612 #ifdef FEAT_VIRTUALEDIT | |
| 2613 + oap->start.coladd | |
| 2614 #endif | |
| 2615 != curbuf->b_op_start_orig.col | |
| 2616 #ifdef FEAT_VIRTUALEDIT | |
| 2617 + curbuf->b_op_start_orig.coladd | |
| 2618 #endif | |
| 2619 ) | |
| 5471 | 2620 { |
| 6579 | 2621 int t = getviscol2(curbuf->b_op_start_orig.col, |
| 2622 curbuf->b_op_start_orig.coladd); | |
| 5680 | 2623 oap->start.col = curbuf->b_op_start_orig.col; |
| 6579 | 2624 pre_textlen -= t - oap->start_vcol; |
| 2625 oap->start_vcol = t; | |
| 5471 | 2626 } |
| 2627 else if (oap->op_type == OP_APPEND | |
| 5730 | 2628 && oap->end.col |
| 2629 #ifdef FEAT_VIRTUALEDIT | |
| 2630 + oap->end.coladd | |
| 2631 #endif | |
| 2632 >= curbuf->b_op_start_orig.col | |
| 2633 #ifdef FEAT_VIRTUALEDIT | |
| 2634 + curbuf->b_op_start_orig.coladd | |
| 2635 #endif | |
| 2636 ) | |
| 5471 | 2637 { |
| 6579 | 2638 int t = getviscol2(curbuf->b_op_start_orig.col, |
| 2639 curbuf->b_op_start_orig.coladd); | |
| 5680 | 2640 oap->start.col = curbuf->b_op_start_orig.col; |
| 5471 | 2641 /* reset pre_textlen to the value of OP_INSERT */ |
| 2642 pre_textlen += bd.textlen; | |
| 6579 | 2643 pre_textlen -= t - oap->start_vcol; |
| 2644 oap->start_vcol = t; | |
| 5471 | 2645 oap->op_type = OP_INSERT; |
| 2646 } | |
| 2647 } | |
| 2648 | |
| 7 | 2649 /* |
| 2650 * Spaces and tabs in the indent may have changed to other spaces and | |
| 1392 | 2651 * tabs. Get the starting column again and correct the length. |
| 7 | 2652 * Don't do this when "$" used, end-of-line will have changed. |
| 2653 */ | |
| 2654 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
| 2655 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
| 2656 { | |
| 2657 if (oap->op_type == OP_APPEND) | |
| 2658 { | |
| 2659 pre_textlen += bd2.textlen - bd.textlen; | |
| 2660 if (bd2.endspaces) | |
| 2661 --bd2.textlen; | |
| 2662 } | |
| 2663 bd.textcol = bd2.textcol; | |
| 2664 bd.textlen = bd2.textlen; | |
| 2665 } | |
| 2666 | |
| 2667 /* | |
| 2668 * Subsequent calls to ml_get() flush the firstline data - take a | |
| 2669 * copy of the required string. | |
| 2670 */ | |
| 2671 firstline = ml_get(oap->start.lnum) + bd.textcol; | |
| 2672 if (oap->op_type == OP_APPEND) | |
| 2673 firstline += bd.textlen; | |
| 3421 | 2674 if (pre_textlen >= 0 |
| 2675 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
| 7 | 2676 { |
| 2677 ins_text = vim_strnsave(firstline, (int)ins_len); | |
| 2678 if (ins_text != NULL) | |
| 2679 { | |
| 2680 /* block handled here */ | |
| 2681 if (u_save(oap->start.lnum, | |
| 2682 (linenr_T)(oap->end.lnum + 1)) == OK) | |
| 2683 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
| 2684 &bd); | |
| 2685 | |
| 2686 curwin->w_cursor.col = oap->start.col; | |
| 2687 check_cursor(); | |
| 2688 vim_free(ins_text); | |
| 2689 } | |
| 2690 } | |
| 2691 } | |
| 2692 } | |
| 2693 #endif | |
| 2694 | |
| 2695 /* | |
| 2696 * op_change - handle a change operation | |
| 2697 * | |
| 2698 * return TRUE if edit() returns because of a CTRL-O command | |
| 2699 */ | |
| 2700 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2701 op_change(oparg_T *oap) |
| 7 | 2702 { |
| 2703 colnr_T l; | |
| 2704 int retval; | |
| 2705 #ifdef FEAT_VISUALEXTRA | |
| 2706 long offset; | |
| 2707 linenr_T linenr; | |
| 1392 | 2708 long ins_len; |
| 2709 long pre_textlen = 0; | |
| 2710 long pre_indent = 0; | |
| 7 | 2711 char_u *firstline; |
| 2712 char_u *ins_text, *newp, *oldp; | |
| 2713 struct block_def bd; | |
| 2714 #endif | |
| 2715 | |
| 2716 l = oap->start.col; | |
| 2717 if (oap->motion_type == MLINE) | |
| 2718 { | |
| 2719 l = 0; | |
| 2720 #ifdef FEAT_SMARTINDENT | |
| 2721 if (!p_paste && curbuf->b_p_si | |
| 2722 # ifdef FEAT_CINDENT | |
| 2723 && !curbuf->b_p_cin | |
| 2724 # endif | |
| 2725 ) | |
| 2726 can_si = TRUE; /* It's like opening a new line, do si */ | |
| 2727 #endif | |
| 2728 } | |
| 2729 | |
| 2730 /* First delete the text in the region. In an empty buffer only need to | |
| 2731 * save for undo */ | |
| 2732 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
| 2733 { | |
| 2734 if (u_save_cursor() == FAIL) | |
| 2735 return FALSE; | |
| 2736 } | |
| 2737 else if (op_delete(oap) == FAIL) | |
| 2738 return FALSE; | |
| 2739 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2740 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum) |
| 7 | 2741 && !virtual_op) |
| 2742 inc_cursor(); | |
| 2743 | |
| 2744 #ifdef FEAT_VISUALEXTRA | |
| 2745 /* check for still on same line (<CR> in inserted text meaningless) */ | |
| 2746 /* skip blank lines too */ | |
| 2747 if (oap->block_mode) | |
| 2748 { | |
| 2749 # ifdef FEAT_VIRTUALEDIT | |
| 2750 /* Add spaces before getting the current line length. */ | |
| 2751 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
| 2752 || gchar_cursor() == NUL)) | |
| 2753 coladvance_force(getviscol()); | |
| 2754 # endif | |
| 1392 | 2755 firstline = ml_get(oap->start.lnum); |
| 2756 pre_textlen = (long)STRLEN(firstline); | |
| 2757 pre_indent = (long)(skipwhite(firstline) - firstline); | |
| 7 | 2758 bd.textcol = curwin->w_cursor.col; |
| 2759 } | |
| 2760 #endif | |
| 2761 | |
| 2762 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
| 2763 if (oap->motion_type == MLINE) | |
| 2764 fix_indent(); | |
| 2765 #endif | |
| 2766 | |
| 2767 retval = edit(NUL, FALSE, (linenr_T)1); | |
| 2768 | |
| 2769 #ifdef FEAT_VISUALEXTRA | |
| 2770 /* | |
| 39 | 2771 * In Visual block mode, handle copying the new text to all lines of the |
| 7 | 2772 * block. |
| 1477 | 2773 * Don't repeat the insert when Insert mode ended with CTRL-C. |
| 7 | 2774 */ |
| 1477 | 2775 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
| 7 | 2776 { |
| 1392 | 2777 /* Auto-indenting may have changed the indent. If the cursor was past |
| 2778 * the indent, exclude that indent change from the inserted text. */ | |
| 7 | 2779 firstline = ml_get(oap->start.lnum); |
| 1403 | 2780 if (bd.textcol > (colnr_T)pre_indent) |
| 7 | 2781 { |
| 1392 | 2782 long new_indent = (long)(skipwhite(firstline) - firstline); |
| 2783 | |
| 2784 pre_textlen += new_indent - pre_indent; | |
| 2785 bd.textcol += new_indent - pre_indent; | |
| 2786 } | |
| 2787 | |
| 2788 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
| 2789 if (ins_len > 0) | |
| 2790 { | |
| 2791 /* Subsequent calls to ml_get() flush the firstline data - take a | |
| 2792 * copy of the inserted text. */ | |
| 7 | 2793 if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL) |
| 2794 { | |
| 419 | 2795 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
| 7 | 2796 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
| 2797 linenr++) | |
| 2798 { | |
| 2799 block_prep(oap, &bd, linenr, TRUE); | |
| 2800 if (!bd.is_short || virtual_op) | |
| 2801 { | |
| 2802 # ifdef FEAT_VIRTUALEDIT | |
| 2803 pos_T vpos; | |
| 2804 | |
| 2805 /* If the block starts in virtual space, count the | |
| 2806 * initial coladd offset as part of "startspaces" */ | |
| 2807 if (bd.is_short) | |
| 2808 { | |
| 1982 | 2809 vpos.lnum = linenr; |
| 7 | 2810 (void)getvpos(&vpos, oap->start_vcol); |
| 2811 } | |
| 2812 else | |
| 2813 vpos.coladd = 0; | |
| 2814 # endif | |
| 2815 oldp = ml_get(linenr); | |
| 2816 newp = alloc_check((unsigned)(STRLEN(oldp) | |
| 2817 # ifdef FEAT_VIRTUALEDIT | |
| 2818 + vpos.coladd | |
| 2819 # endif | |
| 2820 + ins_len + 1)); | |
| 2821 if (newp == NULL) | |
| 2822 continue; | |
| 2823 /* copy up to block start */ | |
| 2824 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 2825 offset = bd.textcol; | |
| 2826 # ifdef FEAT_VIRTUALEDIT | |
| 6929 | 2827 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
| 7 | 2828 offset += vpos.coladd; |
| 2829 # endif | |
| 2830 mch_memmove(newp + offset, ins_text, (size_t)ins_len); | |
| 2831 offset += ins_len; | |
| 2832 oldp += bd.textcol; | |
| 1622 | 2833 STRMOVE(newp + offset, oldp); |
| 7 | 2834 ml_replace(linenr, newp, FALSE); |
| 2835 } | |
| 2836 } | |
| 2837 check_cursor(); | |
| 2838 | |
| 2839 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
| 2840 } | |
| 2841 vim_free(ins_text); | |
| 2842 } | |
| 2843 } | |
| 2844 #endif | |
| 2845 | |
| 2846 return retval; | |
| 2847 } | |
| 2848 | |
| 2849 /* | |
| 2850 * set all the yank registers to empty (called from main()) | |
| 2851 */ | |
| 2852 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2853 init_yank(void) |
| 7 | 2854 { |
| 2855 int i; | |
| 2856 | |
| 2857 for (i = 0; i < NUM_REGISTERS; ++i) | |
| 2858 y_regs[i].y_array = NULL; | |
| 2859 } | |
| 2860 | |
| 356 | 2861 #if defined(EXITFREE) || defined(PROTO) |
| 2862 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2863 clear_registers(void) |
| 356 | 2864 { |
| 2865 int i; | |
| 2866 | |
| 2867 for (i = 0; i < NUM_REGISTERS; ++i) | |
| 2868 { | |
| 2869 y_current = &y_regs[i]; | |
| 2870 if (y_current->y_array != NULL) | |
| 2871 free_yank_all(); | |
| 2872 } | |
| 2873 } | |
| 2874 #endif | |
| 2875 | |
| 7 | 2876 /* |
| 2877 * Free "n" lines from the current yank register. | |
| 2878 * Called for normal freeing and in case of error. | |
| 2879 */ | |
| 2880 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2881 free_yank(long n) |
| 7 | 2882 { |
| 2883 if (y_current->y_array != NULL) | |
| 2884 { | |
| 2885 long i; | |
| 2886 | |
| 2887 for (i = n; --i >= 0; ) | |
| 2888 { | |
| 2889 #ifdef AMIGA /* only for very slow machines */ | |
| 2890 if ((i & 1023) == 1023) /* this may take a while */ | |
| 2891 { | |
| 2892 /* | |
| 2893 * This message should never cause a hit-return message. | |
| 2894 * Overwrite this message with any next message. | |
| 2895 */ | |
| 2896 ++no_wait_return; | |
| 2897 smsg((char_u *)_("freeing %ld lines"), i + 1); | |
| 2898 --no_wait_return; | |
| 2899 msg_didout = FALSE; | |
| 2900 msg_col = 0; | |
| 2901 } | |
| 2902 #endif | |
| 2903 vim_free(y_current->y_array[i]); | |
| 2904 } | |
| 2905 vim_free(y_current->y_array); | |
| 2906 y_current->y_array = NULL; | |
| 2907 #ifdef AMIGA | |
| 2908 if (n >= 1000) | |
| 2909 MSG(""); | |
| 2910 #endif | |
| 2911 } | |
| 2912 } | |
| 2913 | |
| 2914 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2915 free_yank_all(void) |
| 7 | 2916 { |
| 2917 free_yank(y_current->y_size); | |
| 2918 } | |
| 2919 | |
| 2920 /* | |
| 2921 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
| 2922 * If we are to append (uppercase register), we first yank into a new yank | |
| 2923 * register and then concatenate the old and the new one (so we keep the old | |
| 2924 * one in case of out-of-memory). | |
| 2925 * | |
|
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
2926 * Return FAIL for failure, OK otherwise. |
| 7 | 2927 */ |
| 2928 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2929 op_yank(oparg_T *oap, int deleting, int mess) |
| 7 | 2930 { |
| 2931 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
|
2932 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
|
2933 yankreg_T newreg; /* new yank register when appending */ |
| 7 | 2934 char_u **new_ptr; |
| 2935 linenr_T lnum; /* current line number */ | |
| 2936 long j; | |
| 2937 int yanktype = oap->motion_type; | |
| 2938 long yanklines = oap->line_count; | |
| 2939 linenr_T yankendlnum = oap->end.lnum; | |
| 2940 char_u *p; | |
| 2941 char_u *pnew; | |
| 2942 struct block_def bd; | |
| 2658 | 2943 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
| 2654 | 2944 int did_star = FALSE; |
| 2658 | 2945 #endif |
| 7 | 2946 |
| 2947 /* check for read-only register */ | |
| 2948 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
| 2949 { | |
| 2950 beep_flush(); | |
| 2951 return FAIL; | |
| 2952 } | |
| 2953 if (oap->regname == '_') /* black hole: nothing to do */ | |
| 2954 return OK; | |
| 2955 | |
| 2956 #ifdef FEAT_CLIPBOARD | |
| 2957 if (!clip_star.available && oap->regname == '*') | |
| 2958 oap->regname = 0; | |
| 2959 else if (!clip_plus.available && oap->regname == '+') | |
| 2960 oap->regname = 0; | |
| 2961 #endif | |
| 2962 | |
| 2963 if (!deleting) /* op_delete() already set y_current */ | |
| 2964 get_yank_register(oap->regname, TRUE); | |
| 2965 | |
| 2966 curr = y_current; | |
| 2967 /* append to existing contents */ | |
| 2968 if (y_append && y_current->y_array != NULL) | |
| 2969 y_current = &newreg; | |
| 2970 else | |
| 2971 free_yank_all(); /* free previously yanked lines */ | |
| 2972 | |
| 593 | 2973 /* |
| 2974 * If the cursor was in column 1 before and after the movement, and the | |
| 2975 * operator is not inclusive, the yank is always linewise. | |
| 2976 */ | |
| 7 | 2977 if ( oap->motion_type == MCHAR |
| 2978 && oap->start.col == 0 | |
| 2979 && !oap->inclusive | |
| 2980 && (!oap->is_VIsual || *p_sel == 'o') | |
| 50 | 2981 && !oap->block_mode |
| 7 | 2982 && oap->end.col == 0 |
| 2983 && yanklines > 1) | |
| 2984 { | |
| 2985 yanktype = MLINE; | |
| 2986 --yankendlnum; | |
| 2987 --yanklines; | |
| 2988 } | |
| 2989 | |
| 2990 y_current->y_size = yanklines; | |
| 2991 y_current->y_type = yanktype; /* set the yank register type */ | |
| 2992 y_current->y_width = 0; | |
| 2993 y_current->y_array = (char_u **)lalloc_clear((long_u)(sizeof(char_u *) * | |
| 2994 yanklines), TRUE); | |
| 2995 if (y_current->y_array == NULL) | |
| 2996 { | |
| 2997 y_current = curr; | |
| 2998 return FAIL; | |
| 2999 } | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3000 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3001 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
|
3002 #endif |
| 7 | 3003 |
| 3004 y_idx = 0; | |
| 3005 lnum = oap->start.lnum; | |
| 3006 | |
| 3007 if (oap->block_mode) | |
| 3008 { | |
| 3009 /* Visual block mode */ | |
| 3010 y_current->y_type = MBLOCK; /* set the yank register type */ | |
| 3011 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
| 3012 | |
| 3013 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
| 3014 y_current->y_width--; | |
| 3015 } | |
| 3016 | |
| 3017 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
| 3018 { | |
| 3019 switch (y_current->y_type) | |
| 3020 { | |
| 3021 case MBLOCK: | |
| 3022 block_prep(oap, &bd, lnum, FALSE); | |
| 3023 if (yank_copy_line(&bd, y_idx) == FAIL) | |
| 3024 goto fail; | |
| 3025 break; | |
| 3026 | |
| 3027 case MLINE: | |
| 3028 if ((y_current->y_array[y_idx] = | |
| 3029 vim_strsave(ml_get(lnum))) == NULL) | |
| 3030 goto fail; | |
| 3031 break; | |
| 3032 | |
| 3033 case MCHAR: | |
| 3034 { | |
| 3035 colnr_T startcol = 0, endcol = MAXCOL; | |
| 3036 #ifdef FEAT_VIRTUALEDIT | |
| 3037 int is_oneChar = FALSE; | |
| 3038 colnr_T cs, ce; | |
| 3039 #endif | |
| 3040 p = ml_get(lnum); | |
| 3041 bd.startspaces = 0; | |
| 3042 bd.endspaces = 0; | |
| 3043 | |
| 3044 if (lnum == oap->start.lnum) | |
| 3045 { | |
| 3046 startcol = oap->start.col; | |
| 3047 #ifdef FEAT_VIRTUALEDIT | |
| 3048 if (virtual_op) | |
| 3049 { | |
| 3050 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
| 3051 if (ce != cs && oap->start.coladd > 0) | |
| 3052 { | |
| 3053 /* Part of a tab selected -- but don't | |
| 3054 * double-count it. */ | |
| 3055 bd.startspaces = (ce - cs + 1) | |
| 3056 - oap->start.coladd; | |
| 3057 startcol++; | |
| 3058 } | |
| 3059 } | |
| 3060 #endif | |
| 3061 } | |
| 3062 | |
| 3063 if (lnum == oap->end.lnum) | |
| 3064 { | |
| 3065 endcol = oap->end.col; | |
| 3066 #ifdef FEAT_VIRTUALEDIT | |
| 3067 if (virtual_op) | |
| 3068 { | |
| 3069 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
| 3070 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
| 3071 # ifdef FEAT_MBYTE | |
| 3072 /* Don't add space for double-wide | |
| 3073 * char; endcol will be on last byte | |
| 3074 * of multi-byte char. */ | |
| 3075 && (*mb_head_off)(p, p + endcol) == 0 | |
| 3076 # endif | |
| 3077 )) | |
| 3078 { | |
| 3079 if (oap->start.lnum == oap->end.lnum | |
| 3080 && oap->start.col == oap->end.col) | |
| 3081 { | |
| 3082 /* Special case: inside a single char */ | |
| 3083 is_oneChar = TRUE; | |
| 3084 bd.startspaces = oap->end.coladd | |
| 3085 - oap->start.coladd + oap->inclusive; | |
| 3086 endcol = startcol; | |
| 3087 } | |
| 3088 else | |
| 3089 { | |
| 3090 bd.endspaces = oap->end.coladd | |
| 3091 + oap->inclusive; | |
| 3092 endcol -= oap->inclusive; | |
| 3093 } | |
| 3094 } | |
| 3095 } | |
| 3096 #endif | |
| 3097 } | |
| 3510 | 3098 if (endcol == MAXCOL) |
| 3099 endcol = (colnr_T)STRLEN(p); | |
| 7 | 3100 if (startcol > endcol |
| 3101 #ifdef FEAT_VIRTUALEDIT | |
| 3102 || is_oneChar | |
| 3103 #endif | |
| 3104 ) | |
| 3105 bd.textlen = 0; | |
| 3106 else | |
| 3107 { | |
| 3108 bd.textlen = endcol - startcol + oap->inclusive; | |
| 3109 } | |
| 3110 bd.textstart = p + startcol; | |
| 3111 if (yank_copy_line(&bd, y_idx) == FAIL) | |
| 3112 goto fail; | |
| 3113 break; | |
| 3114 } | |
| 3115 /* NOTREACHED */ | |
| 3116 } | |
| 3117 } | |
| 3118 | |
| 3119 if (curr != y_current) /* append the new block to the old block */ | |
| 3120 { | |
| 3121 new_ptr = (char_u **)lalloc((long_u)(sizeof(char_u *) * | |
| 3122 (curr->y_size + y_current->y_size)), TRUE); | |
| 3123 if (new_ptr == NULL) | |
| 3124 goto fail; | |
| 3125 for (j = 0; j < curr->y_size; ++j) | |
| 3126 new_ptr[j] = curr->y_array[j]; | |
| 3127 vim_free(curr->y_array); | |
| 3128 curr->y_array = new_ptr; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3129 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3130 curr->y_time_set = vim_time(); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3131 #endif |
| 7 | 3132 |
| 3133 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
| 3134 curr->y_type = MLINE; | |
| 3135 | |
| 164 | 3136 /* Concatenate the last line of the old block with the first line of |
| 3137 * the new block, unless being Vi compatible. */ | |
| 3138 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
| 7 | 3139 { |
| 3140 pnew = lalloc((long_u)(STRLEN(curr->y_array[curr->y_size - 1]) | |
| 3141 + STRLEN(y_current->y_array[0]) + 1), TRUE); | |
| 3142 if (pnew == NULL) | |
| 3143 { | |
| 3144 y_idx = y_current->y_size - 1; | |
| 3145 goto fail; | |
| 3146 } | |
| 3147 STRCPY(pnew, curr->y_array[--j]); | |
| 3148 STRCAT(pnew, y_current->y_array[0]); | |
| 3149 vim_free(curr->y_array[j]); | |
| 3150 vim_free(y_current->y_array[0]); | |
| 3151 curr->y_array[j++] = pnew; | |
| 3152 y_idx = 1; | |
| 3153 } | |
| 3154 else | |
| 3155 y_idx = 0; | |
| 3156 while (y_idx < y_current->y_size) | |
| 3157 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
| 3158 curr->y_size = j; | |
| 3159 vim_free(y_current->y_array); | |
| 3160 y_current = curr; | |
| 3161 } | |
| 5981 | 3162 if (curwin->w_p_rnu) |
| 3163 redraw_later(SOME_VALID); /* cursor moved to start */ | |
| 7 | 3164 if (mess) /* Display message about yank? */ |
| 3165 { | |
| 3166 if (yanktype == MCHAR | |
| 3167 && !oap->block_mode | |
| 3168 && yanklines == 1) | |
| 3169 yanklines = 0; | |
| 3170 /* Some versions of Vi use ">=" here, some don't... */ | |
| 3171 if (yanklines > p_report) | |
| 3172 { | |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3173 char namebuf[100]; |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3174 |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3175 if (oap->regname == NUL) |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3176 *namebuf = NUL; |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3177 else |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3178 vim_snprintf(namebuf, sizeof(namebuf), |
|
11688
570f00932da8
patch 8.0.0727: message about what register to yank into is not translated
Christian Brabandt <cb@256bit.org>
parents:
11682
diff
changeset
|
3179 _(" into \"%c"), oap->regname); |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3180 |
| 7 | 3181 /* redisplay now, so message is not deleted */ |
| 3182 update_topline_redraw(); | |
| 3183 if (yanklines == 1) | |
| 205 | 3184 { |
| 3185 if (oap->block_mode) | |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3186 smsg((char_u *)_("block of 1 line yanked%s"), namebuf); |
| 205 | 3187 else |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3188 smsg((char_u *)_("1 line yanked%s"), namebuf); |
| 205 | 3189 } |
| 3190 else if (oap->block_mode) | |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3191 smsg((char_u *)_("block of %ld lines yanked%s"), |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3192 yanklines, namebuf); |
| 7 | 3193 else |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3194 smsg((char_u *)_("%ld lines yanked%s"), yanklines, |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3195 namebuf); |
| 7 | 3196 } |
| 3197 } | |
| 3198 | |
| 3199 /* | |
| 3200 * Set "'[" and "']" marks. | |
| 3201 */ | |
| 3202 curbuf->b_op_start = oap->start; | |
| 3203 curbuf->b_op_end = oap->end; | |
| 5735 | 3204 if (yanktype == MLINE && !oap->block_mode) |
| 36 | 3205 { |
| 3206 curbuf->b_op_start.col = 0; | |
| 3207 curbuf->b_op_end.col = MAXCOL; | |
| 3208 } | |
| 7 | 3209 |
| 3210 #ifdef FEAT_CLIPBOARD | |
| 3211 /* | |
| 3212 * If we were yanking to the '*' register, send result to clipboard. | |
| 3213 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
| 3214 * to the '*' register. | |
| 3215 */ | |
| 3216 if (clip_star.available | |
| 3217 && (curr == &(y_regs[STAR_REGISTER]) | |
| 2654 | 3218 || (!deleting && oap->regname == 0 |
| 6116 | 3219 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
| 7 | 3220 { |
| 3221 if (curr != &(y_regs[STAR_REGISTER])) | |
| 3222 /* Copy the text from register 0 to the clipboard register. */ | |
| 3223 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
| 3224 | |
| 3225 clip_own_selection(&clip_star); | |
| 3226 clip_gen_set_selection(&clip_star); | |
| 2658 | 3227 # ifdef FEAT_X11 |
| 2654 | 3228 did_star = TRUE; |
| 2658 | 3229 # endif |
| 7 | 3230 } |
| 3231 | |
| 3232 # ifdef FEAT_X11 | |
| 3233 /* | |
| 3234 * If we were yanking to the '+' register, send result to selection. | |
| 3235 * Also copy to the '*' register, in case auto-select is off. | |
| 3236 */ | |
| 2654 | 3237 if (clip_plus.available |
| 3238 && (curr == &(y_regs[PLUS_REGISTER]) | |
| 3239 || (!deleting && oap->regname == 0 | |
| 6116 | 3240 && ((clip_unnamed | clip_unnamed_saved) & |
| 3241 CLIP_UNNAMED_PLUS)))) | |
| 7 | 3242 { |
| 2654 | 3243 if (curr != &(y_regs[PLUS_REGISTER])) |
| 3244 /* Copy the text from register 0 to the clipboard register. */ | |
| 3245 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
| 3246 | |
| 7 | 3247 clip_own_selection(&clip_plus); |
| 3248 clip_gen_set_selection(&clip_plus); | |
| 3674 | 3249 if (!clip_isautosel_star() && !did_star |
| 3250 && curr == &(y_regs[PLUS_REGISTER])) | |
| 7 | 3251 { |
| 3252 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
| 3253 clip_own_selection(&clip_star); | |
| 3254 clip_gen_set_selection(&clip_star); | |
| 3255 } | |
| 3256 } | |
| 3257 # endif | |
| 3258 #endif | |
| 3259 | |
| 3260 return OK; | |
| 3261 | |
| 3262 fail: /* free the allocated lines */ | |
| 3263 free_yank(y_idx + 1); | |
| 3264 y_current = curr; | |
| 3265 return FAIL; | |
| 3266 } | |
| 3267 | |
| 3268 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3269 yank_copy_line(struct block_def *bd, long y_idx) |
| 7 | 3270 { |
| 3271 char_u *pnew; | |
| 3272 | |
| 3273 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
| 3274 == NULL) | |
| 3275 return FAIL; | |
| 3276 y_current->y_array[y_idx] = pnew; | |
| 6929 | 3277 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
| 7 | 3278 pnew += bd->startspaces; |
| 3279 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
| 3280 pnew += bd->textlen; | |
| 6929 | 3281 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
| 7 | 3282 pnew += bd->endspaces; |
| 3283 *pnew = NUL; | |
| 3284 return OK; | |
| 3285 } | |
| 3286 | |
| 3287 #ifdef FEAT_CLIPBOARD | |
| 3288 /* | |
| 3289 * Make a copy of the y_current register to register "reg". | |
| 3290 */ | |
| 3291 static void | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3292 copy_yank_reg(yankreg_T *reg) |
| 7 | 3293 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3294 yankreg_T *curr = y_current; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3295 long j; |
| 7 | 3296 |
| 3297 y_current = reg; | |
| 3298 free_yank_all(); | |
| 3299 *y_current = *curr; | |
| 3300 y_current->y_array = (char_u **)lalloc_clear( | |
| 3301 (long_u)(sizeof(char_u *) * y_current->y_size), TRUE); | |
| 3302 if (y_current->y_array == NULL) | |
| 3303 y_current->y_size = 0; | |
| 3304 else | |
| 3305 for (j = 0; j < y_current->y_size; ++j) | |
| 3306 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
| 3307 { | |
| 3308 free_yank(j); | |
| 3309 y_current->y_size = 0; | |
| 3310 break; | |
| 3311 } | |
| 3312 y_current = curr; | |
| 3313 } | |
| 3314 #endif | |
| 3315 | |
| 3316 /* | |
| 140 | 3317 * Put contents of register "regname" into the text. |
| 3318 * Caller must check "regname" to be valid! | |
| 3319 * "flags": PUT_FIXINDENT make indent look nice | |
| 3320 * PUT_CURSEND leave cursor after end of new text | |
| 3321 * PUT_LINE force linewise put (":put") | |
| 7 | 3322 */ |
| 3323 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3324 do_put( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3325 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3326 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
|
3327 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3328 int flags) |
| 7 | 3329 { |
| 3330 char_u *ptr; | |
| 3331 char_u *newp, *oldp; | |
| 3332 int yanklen; | |
| 3333 int totlen = 0; /* init for gcc */ | |
| 3334 linenr_T lnum; | |
| 3335 colnr_T col; | |
| 3336 long i; /* index in y_array[] */ | |
| 3337 int y_type; | |
| 3338 long y_size; | |
| 3339 int oldlen; | |
| 3340 long y_width = 0; | |
| 3341 colnr_T vcol; | |
| 3342 int delcount; | |
| 3343 int incr = 0; | |
| 3344 long j; | |
| 3345 struct block_def bd; | |
| 3346 char_u **y_array = NULL; | |
| 3347 long nr_lines = 0; | |
| 3348 pos_T new_cursor; | |
| 3349 int indent; | |
| 3350 int orig_indent = 0; /* init for gcc */ | |
| 3351 int indent_diff = 0; /* init for gcc */ | |
| 3352 int first_indent = TRUE; | |
| 3353 int lendiff = 0; | |
| 3354 pos_T old_pos; | |
| 3355 char_u *insert_string = NULL; | |
| 3356 int allocated = FALSE; | |
| 3357 long cnt; | |
| 3358 | |
| 3359 #ifdef FEAT_CLIPBOARD | |
| 3360 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
| 3361 adjust_clip_reg(®name); | |
| 3362 (void)may_get_selection(regname); | |
| 3363 #endif | |
| 3364 | |
| 3365 if (flags & PUT_FIXINDENT) | |
| 3366 orig_indent = get_indent(); | |
| 3367 | |
| 3368 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
| 3369 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
| 3370 | |
| 3371 /* | |
| 3372 * Using inserted text works differently, because the register includes | |
| 3373 * special characters (newlines, etc.). | |
| 3374 */ | |
| 3375 if (regname == '.') | |
| 3376 { | |
|
10494
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3377 if (VIsual_active) |
|
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3378 stuffcharReadbuff(VIsual_mode); |
| 7 | 3379 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : |
| 3380 (count == -1 ? 'O' : 'i')), count, FALSE); | |
| 3381 /* Putting the text is done later, so can't really move the cursor to | |
| 3382 * the next character. Use "l" to simulate it. */ | |
| 3383 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
| 3384 stuffcharReadbuff('l'); | |
| 3385 return; | |
| 3386 } | |
| 3387 | |
| 3388 /* | |
| 3389 * For special registers '%' (file name), '#' (alternate file name) and | |
| 3390 * ':' (last command line), etc. we have to create a fake yank register. | |
| 3391 */ | |
| 3392 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
| 3393 { | |
| 3394 if (insert_string == NULL) | |
| 3395 return; | |
| 3396 } | |
| 3397 | |
| 4005 | 3398 #ifdef FEAT_AUTOCMD |
| 3399 /* Autocommands may be executed when saving lines for undo, which may make | |
| 3400 * y_array invalid. Start undo now to avoid that. */ | |
| 3401 u_save(curwin->w_cursor.lnum, curwin->w_cursor.lnum + 1); | |
| 3402 #endif | |
| 3403 | |
| 7 | 3404 if (insert_string != NULL) |
| 3405 { | |
| 3406 y_type = MCHAR; | |
| 3407 #ifdef FEAT_EVAL | |
| 3408 if (regname == '=') | |
| 3409 { | |
| 3410 /* For the = register we need to split the string at NL | |
| 3093 | 3411 * characters. |
| 3412 * Loop twice: count the number of lines and save them. */ | |
| 7 | 3413 for (;;) |
| 3414 { | |
| 3415 y_size = 0; | |
| 3416 ptr = insert_string; | |
| 3417 while (ptr != NULL) | |
| 3418 { | |
| 3419 if (y_array != NULL) | |
| 3420 y_array[y_size] = ptr; | |
| 3421 ++y_size; | |
| 3422 ptr = vim_strchr(ptr, '\n'); | |
| 3423 if (ptr != NULL) | |
| 3424 { | |
| 3425 if (y_array != NULL) | |
| 3426 *ptr = NUL; | |
| 3427 ++ptr; | |
| 3093 | 3428 /* A trailing '\n' makes the register linewise. */ |
| 7 | 3429 if (*ptr == NUL) |
| 3430 { | |
| 3431 y_type = MLINE; | |
| 3432 break; | |
| 3433 } | |
| 3434 } | |
| 3435 } | |
| 3436 if (y_array != NULL) | |
| 3437 break; | |
| 3438 y_array = (char_u **)alloc((unsigned) | |
| 3439 (y_size * sizeof(char_u *))); | |
| 3440 if (y_array == NULL) | |
| 3441 goto end; | |
| 3442 } | |
| 3443 } | |
| 3444 else | |
| 3445 #endif | |
| 3446 { | |
| 3447 y_size = 1; /* use fake one-line yank register */ | |
| 3448 y_array = &insert_string; | |
| 3449 } | |
| 3450 } | |
| 3451 else | |
| 3452 { | |
| 3453 get_yank_register(regname, FALSE); | |
| 3454 | |
| 3455 y_type = y_current->y_type; | |
| 3456 y_width = y_current->y_width; | |
| 3457 y_size = y_current->y_size; | |
| 3458 y_array = y_current->y_array; | |
| 3459 } | |
| 3460 | |
| 3461 if (y_type == MLINE) | |
| 3462 { | |
| 3463 if (flags & PUT_LINE_SPLIT) | |
| 3464 { | |
| 6845 | 3465 char_u *p; |
| 3466 | |
| 7 | 3467 /* "p" or "P" in Visual mode: split the lines to put the text in |
| 3468 * between. */ | |
| 3469 if (u_save_cursor() == FAIL) | |
| 3470 goto end; | |
| 6845 | 3471 p = ml_get_cursor(); |
| 3472 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
|
3473 MB_PTR_ADV(p); |
| 6845 | 3474 ptr = vim_strsave(p); |
| 7 | 3475 if (ptr == NULL) |
| 3476 goto end; | |
| 3477 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
| 3478 vim_free(ptr); | |
| 3479 | |
| 6845 | 3480 oldp = ml_get_curline(); |
| 3481 p = oldp + curwin->w_cursor.col; | |
| 3482 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
|
3483 MB_PTR_ADV(p); |
| 6845 | 3484 ptr = vim_strnsave(oldp, p - oldp); |
| 7 | 3485 if (ptr == NULL) |
| 3486 goto end; | |
| 3487 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
| 3488 ++nr_lines; | |
| 3489 dir = FORWARD; | |
| 3490 } | |
| 3491 if (flags & PUT_LINE_FORWARD) | |
| 3492 { | |
| 3493 /* Must be "p" for a Visual block, put lines below the block. */ | |
| 692 | 3494 curwin->w_cursor = curbuf->b_visual.vi_end; |
| 7 | 3495 dir = FORWARD; |
| 3496 } | |
| 3497 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
| 3498 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
| 3499 } | |
| 3500 | |
| 3501 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
| 3502 y_type = MLINE; | |
| 3503 | |
| 3504 if (y_size == 0 || y_array == NULL) | |
| 3505 { | |
| 3506 EMSG2(_("E353: Nothing in register %s"), | |
| 3507 regname == 0 ? (char_u *)"\"" : transchar(regname)); | |
| 3508 goto end; | |
| 3509 } | |
| 3510 | |
| 3511 if (y_type == MBLOCK) | |
| 3512 { | |
| 3513 lnum = curwin->w_cursor.lnum + y_size + 1; | |
| 3514 if (lnum > curbuf->b_ml.ml_line_count) | |
| 3515 lnum = curbuf->b_ml.ml_line_count + 1; | |
| 3516 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
| 3517 goto end; | |
| 3518 } | |
| 5735 | 3519 else if (y_type == MLINE) |
| 7 | 3520 { |
| 3521 lnum = curwin->w_cursor.lnum; | |
| 3522 #ifdef FEAT_FOLDING | |
| 3523 /* Correct line number for closed fold. Don't move the cursor yet, | |
| 3524 * u_save() uses it. */ | |
| 3525 if (dir == BACKWARD) | |
| 3526 (void)hasFolding(lnum, &lnum, NULL); | |
| 3527 else | |
| 3528 (void)hasFolding(lnum, NULL, &lnum); | |
| 3529 #endif | |
| 3530 if (dir == FORWARD) | |
| 3531 ++lnum; | |
|
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3532 /* 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
|
3533 * 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
|
3534 if ((BUFEMPTY() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
| 7 | 3535 goto end; |
| 3536 #ifdef FEAT_FOLDING | |
| 3537 if (dir == FORWARD) | |
| 3538 curwin->w_cursor.lnum = lnum - 1; | |
| 3539 else | |
| 3540 curwin->w_cursor.lnum = lnum; | |
| 3541 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
| 3542 #endif | |
| 3543 } | |
| 3544 else if (u_save_cursor() == FAIL) | |
| 3545 goto end; | |
| 3546 | |
| 3547 yanklen = (int)STRLEN(y_array[0]); | |
| 3548 | |
| 3549 #ifdef FEAT_VIRTUALEDIT | |
| 3550 if (ve_flags == VE_ALL && y_type == MCHAR) | |
| 3551 { | |
| 3552 if (gchar_cursor() == TAB) | |
| 3553 { | |
| 3554 /* Don't need to insert spaces when "p" on the last position of a | |
| 3555 * tab or "P" on the first position. */ | |
| 3556 if (dir == FORWARD | |
| 3557 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
| 3558 : curwin->w_cursor.coladd > 0) | |
| 3559 coladvance_force(getviscol()); | |
| 3560 else | |
| 3561 curwin->w_cursor.coladd = 0; | |
| 3562 } | |
| 3563 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
| 3564 coladvance_force(getviscol() + (dir == FORWARD)); | |
| 3565 } | |
| 3566 #endif | |
| 3567 | |
| 3568 lnum = curwin->w_cursor.lnum; | |
| 3569 col = curwin->w_cursor.col; | |
| 3570 | |
| 3571 /* | |
| 3572 * Block mode | |
| 3573 */ | |
| 3574 if (y_type == MBLOCK) | |
| 3575 { | |
|
10664
94db9c08e206
patch 8.0.0222: blockwise put on multi-byte character misplaced
Christian Brabandt <cb@256bit.org>
parents:
10494
diff
changeset
|
3576 int c = gchar_cursor(); |
| 7 | 3577 colnr_T endcol2 = 0; |
| 3578 | |
| 3579 if (dir == FORWARD && c != NUL) | |
| 3580 { | |
| 3581 #ifdef FEAT_VIRTUALEDIT | |
| 3582 if (ve_flags == VE_ALL) | |
| 3583 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
| 3584 else | |
| 3585 #endif | |
| 3586 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
| 3587 | |
| 3588 #ifdef FEAT_MBYTE | |
| 3589 if (has_mbyte) | |
| 3590 /* move to start of next multi-byte character */ | |
| 474 | 3591 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
| 7 | 3592 else |
| 3593 #endif | |
| 3594 #ifdef FEAT_VIRTUALEDIT | |
| 3595 if (c != TAB || ve_flags != VE_ALL) | |
| 3596 #endif | |
| 3597 ++curwin->w_cursor.col; | |
| 3598 ++col; | |
| 3599 } | |
| 3600 else | |
| 3601 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
| 3602 | |
| 3603 #ifdef FEAT_VIRTUALEDIT | |
| 3604 col += curwin->w_cursor.coladd; | |
| 1304 | 3605 if (ve_flags == VE_ALL |
| 3606 && (curwin->w_cursor.coladd > 0 | |
| 3607 || endcol2 == curwin->w_cursor.col)) | |
| 7 | 3608 { |
| 3609 if (dir == FORWARD && c == NUL) | |
| 3610 ++col; | |
| 3611 if (dir != FORWARD && c != NUL) | |
| 3612 ++curwin->w_cursor.col; | |
| 3613 if (c == TAB) | |
| 3614 { | |
| 3615 if (dir == BACKWARD && curwin->w_cursor.col) | |
| 3616 curwin->w_cursor.col--; | |
| 3617 if (dir == FORWARD && col - 1 == endcol2) | |
| 3618 curwin->w_cursor.col++; | |
| 3619 } | |
| 3620 } | |
| 3621 curwin->w_cursor.coladd = 0; | |
| 3622 #endif | |
| 699 | 3623 bd.textcol = 0; |
| 7 | 3624 for (i = 0; i < y_size; ++i) |
| 3625 { | |
| 3626 int spaces; | |
| 3627 char shortline; | |
| 3628 | |
| 3629 bd.startspaces = 0; | |
| 3630 bd.endspaces = 0; | |
| 3631 vcol = 0; | |
| 3632 delcount = 0; | |
| 3633 | |
| 3634 /* add a new line */ | |
| 3635 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
| 3636 { | |
| 3637 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
| 3638 (colnr_T)1, FALSE) == FAIL) | |
| 3639 break; | |
| 3640 ++nr_lines; | |
| 3641 } | |
| 3642 /* get the old line and advance to the position to insert at */ | |
| 3643 oldp = ml_get_curline(); | |
| 3644 oldlen = (int)STRLEN(oldp); | |
| 3645 for (ptr = oldp; vcol < col && *ptr; ) | |
| 3646 { | |
| 3647 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5995 | 3648 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
| 7 | 3649 vcol += incr; |
| 3650 } | |
| 3651 bd.textcol = (colnr_T)(ptr - oldp); | |
| 3652 | |
| 3653 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
| 3654 | |
| 3655 if (vcol < col) /* line too short, padd with spaces */ | |
| 3656 bd.startspaces = col - vcol; | |
| 3657 else if (vcol > col) | |
| 3658 { | |
| 3659 bd.endspaces = vcol - col; | |
| 3660 bd.startspaces = incr - bd.endspaces; | |
| 3661 --bd.textcol; | |
| 3662 delcount = 1; | |
| 3663 #ifdef FEAT_MBYTE | |
| 3664 if (has_mbyte) | |
| 3665 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
| 3666 #endif | |
| 3667 if (oldp[bd.textcol] != TAB) | |
| 3668 { | |
| 3669 /* Only a Tab can be split into spaces. Other | |
| 3670 * characters will have to be moved to after the | |
| 3671 * block, causing misalignment. */ | |
| 3672 delcount = 0; | |
| 3673 bd.endspaces = 0; | |
| 3674 } | |
| 3675 } | |
| 3676 | |
| 3677 yanklen = (int)STRLEN(y_array[i]); | |
| 3678 | |
| 3679 /* calculate number of spaces required to fill right side of block*/ | |
| 3680 spaces = y_width + 1; | |
| 3681 for (j = 0; j < yanklen; j++) | |
| 5995 | 3682 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
| 7 | 3683 if (spaces < 0) |
| 3684 spaces = 0; | |
| 3685 | |
| 3686 /* insert the new text */ | |
| 3687 totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces; | |
| 3688 newp = alloc_check((unsigned)totlen + oldlen + 1); | |
| 3689 if (newp == NULL) | |
| 3690 break; | |
| 3691 /* copy part up to cursor to new line */ | |
| 3692 ptr = newp; | |
| 3693 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
| 3694 ptr += bd.textcol; | |
| 3695 /* may insert some spaces before the new text */ | |
| 6929 | 3696 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
| 7 | 3697 ptr += bd.startspaces; |
| 3698 /* insert the new text */ | |
| 3699 for (j = 0; j < count; ++j) | |
| 3700 { | |
| 3701 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
| 3702 ptr += yanklen; | |
| 3703 | |
| 3704 /* insert block's trailing spaces only if there's text behind */ | |
| 3705 if ((j < count - 1 || !shortline) && spaces) | |
| 3706 { | |
| 6929 | 3707 vim_memset(ptr, ' ', (size_t)spaces); |
| 7 | 3708 ptr += spaces; |
| 3709 } | |
| 3710 } | |
| 3711 /* may insert some spaces after the new text */ | |
| 6929 | 3712 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
| 7 | 3713 ptr += bd.endspaces; |
| 3714 /* move the text after the cursor to the end of the line. */ | |
| 3715 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
| 3716 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
| 3717 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 3718 | |
| 3719 ++curwin->w_cursor.lnum; | |
| 3720 if (i == 0) | |
| 3721 curwin->w_cursor.col += bd.startspaces; | |
| 3722 } | |
| 3723 | |
| 3724 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
| 3725 | |
| 3726 /* Set '[ mark. */ | |
| 3727 curbuf->b_op_start = curwin->w_cursor; | |
| 3728 curbuf->b_op_start.lnum = lnum; | |
| 3729 | |
| 3730 /* adjust '] mark */ | |
| 3731 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
| 3732 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
| 237 | 3733 # ifdef FEAT_VIRTUALEDIT |
| 7 | 3734 curbuf->b_op_end.coladd = 0; |
| 237 | 3735 # endif |
| 7 | 3736 if (flags & PUT_CURSEND) |
| 3737 { | |
| 916 | 3738 colnr_T len; |
| 3739 | |
| 7 | 3740 curwin->w_cursor = curbuf->b_op_end; |
| 3741 curwin->w_cursor.col++; | |
| 916 | 3742 |
| 3743 /* in Insert mode we might be after the NUL, correct for that */ | |
| 3744 len = (colnr_T)STRLEN(ml_get_curline()); | |
| 3745 if (curwin->w_cursor.col > len) | |
| 3746 curwin->w_cursor.col = len; | |
| 7 | 3747 } |
| 3748 else | |
| 3749 curwin->w_cursor.lnum = lnum; | |
| 3750 } | |
| 3751 else | |
| 3752 { | |
| 3753 /* | |
| 3754 * Character or Line mode | |
| 3755 */ | |
| 3756 if (y_type == MCHAR) | |
| 3757 { | |
| 3758 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
| 3759 * char */ | |
| 3760 if (dir == FORWARD && gchar_cursor() != NUL) | |
| 3761 { | |
| 3762 #ifdef FEAT_MBYTE | |
| 3763 if (has_mbyte) | |
| 3764 { | |
| 474 | 3765 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
| 7 | 3766 |
| 3767 /* put it on the next of the multi-byte character. */ | |
| 3768 col += bytelen; | |
| 3769 if (yanklen) | |
| 3770 { | |
| 3771 curwin->w_cursor.col += bytelen; | |
| 3772 curbuf->b_op_end.col += bytelen; | |
| 3773 } | |
| 3774 } | |
| 3775 else | |
| 3776 #endif | |
| 3777 { | |
| 3778 ++col; | |
| 3779 if (yanklen) | |
| 3780 { | |
| 3781 ++curwin->w_cursor.col; | |
| 3782 ++curbuf->b_op_end.col; | |
| 3783 } | |
| 3784 } | |
| 3785 } | |
| 3786 curbuf->b_op_start = curwin->w_cursor; | |
| 3787 } | |
| 3788 /* | |
| 3789 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
| 3790 */ | |
| 3791 else if (dir == BACKWARD) | |
| 3792 --lnum; | |
| 699 | 3793 new_cursor = curwin->w_cursor; |
| 7 | 3794 |
| 3795 /* | |
| 3796 * simple case: insert into current line | |
| 3797 */ | |
| 3798 if (y_type == MCHAR && y_size == 1) | |
| 3799 { | |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3800 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
|
3801 |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3802 if (VIsual_active) |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3803 { |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3804 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
|
3805 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
|
3806 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
|
3807 } |
|
10670
bce3eccea39a
patch 8.0.0225: put in Visual block mode terminates early
Christian Brabandt <cb@256bit.org>
parents:
10664
diff
changeset
|
3808 |
| 5365 | 3809 do { |
| 3810 totlen = count * yanklen; | |
| 3811 if (totlen > 0) | |
| 7 | 3812 { |
| 5365 | 3813 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
|
3814 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
|
3815 { |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3816 lnum++; |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3817 continue; |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3818 } |
| 5365 | 3819 newp = alloc_check((unsigned)(STRLEN(oldp) + totlen + 1)); |
| 3820 if (newp == NULL) | |
| 3821 goto end; /* alloc() gave an error message */ | |
| 3822 mch_memmove(newp, oldp, (size_t)col); | |
| 3823 ptr = newp + col; | |
| 3824 for (i = 0; i < count; ++i) | |
| 3825 { | |
| 3826 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
| 3827 ptr += yanklen; | |
| 3828 } | |
| 3829 STRMOVE(ptr, oldp + col); | |
| 3830 ml_replace(lnum, newp, FALSE); | |
| 3831 /* Place cursor on last putted char. */ | |
| 3832 if (lnum == curwin->w_cursor.lnum) | |
| 5496 | 3833 { |
| 3834 /* make sure curwin->w_virtcol is updated */ | |
| 3835 changed_cline_bef_curs(); | |
| 5365 | 3836 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
| 5496 | 3837 } |
| 7 | 3838 } |
| 5365 | 3839 if (VIsual_active) |
| 3840 lnum++; | |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3841 } while (VIsual_active && lnum <= end_lnum); |
| 5365 | 3842 |
| 6379 | 3843 if (VIsual_active) /* reset lnum to the last visual line */ |
| 3844 lnum--; | |
| 3845 | |
| 7 | 3846 curbuf->b_op_end = curwin->w_cursor; |
| 3847 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
| 3848 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
| 3849 ++curwin->w_cursor.col; | |
| 3850 changed_bytes(lnum, col); | |
| 3851 } | |
| 3852 else | |
| 3853 { | |
| 3854 /* | |
| 3855 * Insert at least one line. When y_type is MCHAR, break the first | |
| 3856 * line in two. | |
| 3857 */ | |
| 3858 for (cnt = 1; cnt <= count; ++cnt) | |
| 3859 { | |
| 3860 i = 0; | |
| 3861 if (y_type == MCHAR) | |
| 3862 { | |
| 3863 /* | |
| 3864 * Split the current line in two at the insert position. | |
| 3865 * First insert y_array[size - 1] in front of second line. | |
| 3866 * Then append y_array[0] to first line. | |
| 3867 */ | |
| 3868 lnum = new_cursor.lnum; | |
| 3869 ptr = ml_get(lnum) + col; | |
| 3870 totlen = (int)STRLEN(y_array[y_size - 1]); | |
| 3871 newp = alloc_check((unsigned)(STRLEN(ptr) + totlen + 1)); | |
| 3872 if (newp == NULL) | |
| 3873 goto error; | |
| 3874 STRCPY(newp, y_array[y_size - 1]); | |
| 3875 STRCAT(newp, ptr); | |
| 3876 /* insert second line */ | |
| 3877 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
| 3878 vim_free(newp); | |
| 3879 | |
| 3880 oldp = ml_get(lnum); | |
| 3881 newp = alloc_check((unsigned)(col + yanklen + 1)); | |
| 3882 if (newp == NULL) | |
| 3883 goto error; | |
| 3884 /* copy first part of line */ | |
| 3885 mch_memmove(newp, oldp, (size_t)col); | |
| 3886 /* append to first line */ | |
| 3887 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
| 3888 ml_replace(lnum, newp, FALSE); | |
| 3889 | |
| 3890 curwin->w_cursor.lnum = lnum; | |
| 3891 i = 1; | |
| 3892 } | |
| 3893 | |
| 3894 for (; i < y_size; ++i) | |
| 3895 { | |
| 3896 if ((y_type != MCHAR || i < y_size - 1) | |
| 3897 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
| 3898 == FAIL) | |
| 3899 goto error; | |
| 3900 lnum++; | |
| 3901 ++nr_lines; | |
| 3902 if (flags & PUT_FIXINDENT) | |
| 3903 { | |
| 3904 old_pos = curwin->w_cursor; | |
| 3905 curwin->w_cursor.lnum = lnum; | |
| 3906 ptr = ml_get(lnum); | |
| 3907 if (cnt == count && i == y_size - 1) | |
| 3908 lendiff = (int)STRLEN(ptr); | |
| 3909 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
| 3910 if (*ptr == '#' && preprocs_left()) | |
| 3911 indent = 0; /* Leave # lines at start */ | |
| 3912 else | |
| 3913 #endif | |
| 3914 if (*ptr == NUL) | |
| 3915 indent = 0; /* Ignore empty lines */ | |
| 3916 else if (first_indent) | |
| 3917 { | |
| 3918 indent_diff = orig_indent - get_indent(); | |
| 3919 indent = orig_indent; | |
| 3920 first_indent = FALSE; | |
| 3921 } | |
| 3922 else if ((indent = get_indent() + indent_diff) < 0) | |
| 3923 indent = 0; | |
| 3924 (void)set_indent(indent, 0); | |
| 3925 curwin->w_cursor = old_pos; | |
| 3926 /* remember how many chars were removed */ | |
| 3927 if (cnt == count && i == y_size - 1) | |
| 3928 lendiff -= (int)STRLEN(ml_get(lnum)); | |
| 3929 } | |
| 3930 } | |
| 3931 } | |
| 3932 | |
| 3933 error: | |
| 3934 /* Adjust marks. */ | |
| 3935 if (y_type == MLINE) | |
| 3936 { | |
| 3937 curbuf->b_op_start.col = 0; | |
| 3938 if (dir == FORWARD) | |
| 3939 curbuf->b_op_start.lnum++; | |
| 3940 } | |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3941 /* 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
|
3942 * 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
|
3943 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
|
3944 < 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
|
3945 #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
|
3946 || 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
|
3947 #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
|
3948 ) |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3949 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
| 7 | 3950 (linenr_T)MAXLNUM, nr_lines, 0L); |
| 3951 | |
| 3952 /* note changed text for displaying and folding */ | |
| 3953 if (y_type == MCHAR) | |
| 3954 changed_lines(curwin->w_cursor.lnum, col, | |
| 3955 curwin->w_cursor.lnum + 1, nr_lines); | |
| 3956 else | |
| 3957 changed_lines(curbuf->b_op_start.lnum, 0, | |
| 3958 curbuf->b_op_start.lnum, nr_lines); | |
| 3959 | |
| 3960 /* put '] mark at last inserted character */ | |
| 3961 curbuf->b_op_end.lnum = lnum; | |
| 3962 /* correct length for change in indent */ | |
| 3963 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
| 3964 if (col > 1) | |
| 3965 curbuf->b_op_end.col = col - 1; | |
| 3966 else | |
| 3967 curbuf->b_op_end.col = 0; | |
| 3968 | |
| 168 | 3969 if (flags & PUT_CURSLINE) |
| 3970 { | |
| 237 | 3971 /* ":put": put cursor on last inserted line */ |
| 168 | 3972 curwin->w_cursor.lnum = lnum; |
| 3973 beginline(BL_WHITE | BL_FIX); | |
| 3974 } | |
| 3975 else if (flags & PUT_CURSEND) | |
| 7 | 3976 { |
| 3977 /* put cursor after inserted text */ | |
| 3978 if (y_type == MLINE) | |
| 3979 { | |
| 3980 if (lnum >= curbuf->b_ml.ml_line_count) | |
| 3981 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
| 3982 else | |
| 3983 curwin->w_cursor.lnum = lnum + 1; | |
| 3984 curwin->w_cursor.col = 0; | |
| 3985 } | |
| 3986 else | |
| 3987 { | |
| 3988 curwin->w_cursor.lnum = lnum; | |
| 3989 curwin->w_cursor.col = col; | |
| 3990 } | |
| 3991 } | |
| 3992 else if (y_type == MLINE) | |
| 3993 { | |
| 168 | 3994 /* put cursor on first non-blank in first inserted line */ |
| 7 | 3995 curwin->w_cursor.col = 0; |
| 3996 if (dir == FORWARD) | |
| 3997 ++curwin->w_cursor.lnum; | |
| 3998 beginline(BL_WHITE | BL_FIX); | |
| 3999 } | |
| 4000 else /* put cursor on first inserted character */ | |
| 4001 curwin->w_cursor = new_cursor; | |
| 4002 } | |
| 4003 } | |
| 4004 | |
| 4005 msgmore(nr_lines); | |
| 4006 curwin->w_set_curswant = TRUE; | |
| 4007 | |
| 4008 end: | |
| 4009 if (allocated) | |
| 4010 vim_free(insert_string); | |
| 840 | 4011 if (regname == '=') |
| 4012 vim_free(y_array); | |
| 4013 | |
| 5380 | 4014 VIsual_active = FALSE; |
| 4015 | |
| 140 | 4016 /* If the cursor is past the end of the line put it at the end. */ |
| 844 | 4017 adjust_cursor_eol(); |
| 4018 } | |
| 4019 | |
| 4020 /* | |
| 4021 * When the cursor is on the NUL past the end of the line and it should not be | |
| 4022 * there move it left. | |
| 4023 */ | |
| 4024 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4025 adjust_cursor_eol(void) |
| 844 | 4026 { |
| 4027 if (curwin->w_cursor.col > 0 | |
| 4028 && gchar_cursor() == NUL | |
| 773 | 4029 #ifdef FEAT_VIRTUALEDIT |
| 4030 && (ve_flags & VE_ONEMORE) == 0 | |
| 4031 #endif | |
| 7 | 4032 && !(restart_edit || (State & INSERT))) |
| 4033 { | |
| 557 | 4034 /* Put the cursor on the last character in the line. */ |
| 555 | 4035 dec_cursor(); |
| 844 | 4036 |
| 7 | 4037 #ifdef FEAT_VIRTUALEDIT |
| 4038 if (ve_flags == VE_ALL) | |
| 557 | 4039 { |
| 4040 colnr_T scol, ecol; | |
| 4041 | |
| 4042 /* Coladd is set to the width of the last character. */ | |
| 4043 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
| 4044 curwin->w_cursor.coladd = ecol - scol + 1; | |
| 4045 } | |
| 7 | 4046 #endif |
| 4047 } | |
| 4048 } | |
| 4049 | |
| 4050 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
| 4051 /* | |
| 4052 * Return TRUE if lines starting with '#' should be left aligned. | |
| 4053 */ | |
| 4054 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4055 preprocs_left(void) |
| 7 | 4056 { |
| 4057 return | |
| 4058 # ifdef FEAT_SMARTINDENT | |
| 4059 # ifdef FEAT_CINDENT | |
| 4060 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
| 4061 # else | |
| 4062 curbuf->b_p_si | |
| 4063 # endif | |
| 4064 # endif | |
| 4065 # ifdef FEAT_CINDENT | |
| 5438 | 4066 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
| 4067 && curbuf->b_ind_hash_comment == 0) | |
| 7 | 4068 # endif |
| 4069 ; | |
| 4070 } | |
| 4071 #endif | |
| 4072 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4073 /* |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4074 * 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
|
4075 */ |
| 7 | 4076 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4077 get_register_name(int num) |
| 7 | 4078 { |
| 4079 if (num == -1) | |
| 4080 return '"'; | |
| 4081 else if (num < 10) | |
| 4082 return num + '0'; | |
| 4083 else if (num == DELETION_REGISTER) | |
| 4084 return '-'; | |
| 4085 #ifdef FEAT_CLIPBOARD | |
| 4086 else if (num == STAR_REGISTER) | |
| 4087 return '*'; | |
| 4088 else if (num == PLUS_REGISTER) | |
| 4089 return '+'; | |
| 4090 #endif | |
| 4091 else | |
| 4092 { | |
| 4093 #ifdef EBCDIC | |
| 4094 int i; | |
| 4095 | |
| 4096 /* EBCDIC is really braindead ... */ | |
| 4097 i = 'a' + (num - 10); | |
| 4098 if (i > 'i') | |
| 4099 i += 7; | |
| 4100 if (i > 'r') | |
| 4101 i += 8; | |
| 4102 return i; | |
| 4103 #else | |
| 4104 return num + 'a' - 10; | |
| 4105 #endif | |
| 4106 } | |
| 4107 } | |
| 4108 | |
| 4109 /* | |
| 4110 * ":dis" and ":registers": Display the contents of the yank registers. | |
| 4111 */ | |
| 4112 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4113 ex_display(exarg_T *eap) |
| 7 | 4114 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4115 int i, n; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4116 long j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4117 char_u *p; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4118 yankreg_T *yb; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4119 int name; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4120 int attr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4121 char_u *arg = eap->arg; |
| 22 | 4122 #ifdef FEAT_MBYTE |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4123 int clen; |
| 22 | 4124 #else |
| 4125 # define clen 1 | |
| 4126 #endif | |
| 7 | 4127 |
| 4128 if (arg != NULL && *arg == NUL) | |
| 4129 arg = NULL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
4130 attr = HL_ATTR(HLF_8); |
| 7 | 4131 |
| 4132 /* Highlight title */ | |
| 4133 MSG_PUTS_TITLE(_("\n--- Registers ---")); | |
| 4134 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) | |
| 4135 { | |
| 4136 name = get_register_name(i); | |
| 2644 | 4137 if (arg != NULL && vim_strchr(arg, name) == NULL |
| 4138 #ifdef ONE_CLIPBOARD | |
| 4139 /* Star register and plus register contain the same thing. */ | |
| 4140 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
| 4141 #endif | |
| 4142 ) | |
| 7 | 4143 continue; /* did not ask for this register */ |
| 4144 | |
| 4145 #ifdef FEAT_CLIPBOARD | |
| 4146 /* Adjust register name for "unnamed" in 'clipboard'. | |
| 4147 * When it's a clipboard register, fill it with the current contents | |
| 4148 * of the clipboard. */ | |
| 4149 adjust_clip_reg(&name); | |
| 4150 (void)may_get_selection(name); | |
| 4151 #endif | |
| 4152 | |
| 4153 if (i == -1) | |
| 4154 { | |
| 4155 if (y_previous != NULL) | |
| 4156 yb = y_previous; | |
| 4157 else | |
| 4158 yb = &(y_regs[0]); | |
| 4159 } | |
| 4160 else | |
| 4161 yb = &(y_regs[i]); | |
| 2000 | 4162 |
| 4163 #ifdef FEAT_EVAL | |
| 4164 if (name == MB_TOLOWER(redir_reg) | |
| 4165 || (redir_reg == '"' && yb == y_previous)) | |
| 4166 continue; /* do not list register being written to, the | |
| 4167 * pointer can be freed */ | |
| 4168 #endif | |
| 4169 | |
| 7 | 4170 if (yb->y_array != NULL) |
| 4171 { | |
| 4172 msg_putchar('\n'); | |
| 4173 msg_putchar('"'); | |
| 4174 msg_putchar(name); | |
| 4175 MSG_PUTS(" "); | |
| 4176 | |
| 4177 n = (int)Columns - 6; | |
| 4178 for (j = 0; j < yb->y_size && n > 1; ++j) | |
| 4179 { | |
| 4180 if (j) | |
| 4181 { | |
| 4182 MSG_PUTS_ATTR("^J", attr); | |
| 4183 n -= 2; | |
| 4184 } | |
| 4185 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
| 4186 { | |
| 4187 #ifdef FEAT_MBYTE | |
| 474 | 4188 clen = (*mb_ptr2len)(p); |
| 22 | 4189 #endif |
| 4190 msg_outtrans_len(p, clen); | |
| 4191 #ifdef FEAT_MBYTE | |
| 4192 p += clen - 1; | |
| 7 | 4193 #endif |
| 4194 } | |
| 4195 } | |
| 4196 if (n > 1 && yb->y_type == MLINE) | |
| 4197 MSG_PUTS_ATTR("^J", attr); | |
| 4198 out_flush(); /* show one line at a time */ | |
| 4199 } | |
| 4200 ui_breakcheck(); | |
| 4201 } | |
| 4202 | |
| 4203 /* | |
| 4204 * display last inserted text | |
| 4205 */ | |
| 4206 if ((p = get_last_insert()) != NULL | |
| 4207 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
| 4208 { | |
| 4209 MSG_PUTS("\n\". "); | |
| 4210 dis_msg(p, TRUE); | |
| 4211 } | |
| 4212 | |
| 4213 /* | |
| 4214 * display last command line | |
| 4215 */ | |
| 4216 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
| 4217 && !got_int) | |
| 4218 { | |
| 4219 MSG_PUTS("\n\": "); | |
| 4220 dis_msg(last_cmdline, FALSE); | |
| 4221 } | |
| 4222 | |
| 4223 /* | |
| 4224 * display current file name | |
| 4225 */ | |
| 4226 if (curbuf->b_fname != NULL | |
| 4227 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
| 4228 { | |
| 4229 MSG_PUTS("\n\"% "); | |
| 4230 dis_msg(curbuf->b_fname, FALSE); | |
| 4231 } | |
| 4232 | |
| 4233 /* | |
| 4234 * display alternate file name | |
| 4235 */ | |
| 4236 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
| 4237 { | |
| 4238 char_u *fname; | |
| 4239 linenr_T dummy; | |
| 4240 | |
| 4241 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
| 4242 { | |
| 4243 MSG_PUTS("\n\"# "); | |
| 4244 dis_msg(fname, FALSE); | |
| 4245 } | |
| 4246 } | |
| 4247 | |
| 4248 /* | |
| 4249 * display last search pattern | |
| 4250 */ | |
| 4251 if (last_search_pat() != NULL | |
| 4252 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
| 4253 { | |
| 4254 MSG_PUTS("\n\"/ "); | |
| 4255 dis_msg(last_search_pat(), FALSE); | |
| 4256 } | |
| 4257 | |
| 4258 #ifdef FEAT_EVAL | |
| 4259 /* | |
| 4260 * display last used expression | |
| 4261 */ | |
| 4262 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
| 4263 && !got_int) | |
| 4264 { | |
| 4265 MSG_PUTS("\n\"= "); | |
| 4266 dis_msg(expr_line, FALSE); | |
| 4267 } | |
| 4268 #endif | |
| 4269 } | |
| 4270 | |
| 4271 /* | |
| 4272 * display a string for do_dis() | |
| 4273 * truncate at end of screen line | |
| 4274 */ | |
| 4275 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4276 dis_msg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4277 char_u *p, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4278 int skip_esc) /* if TRUE, ignore trailing ESC */ |
| 7 | 4279 { |
| 4280 int n; | |
| 4281 #ifdef FEAT_MBYTE | |
| 4282 int l; | |
| 4283 #endif | |
| 4284 | |
| 4285 n = (int)Columns - 6; | |
| 4286 while (*p != NUL | |
| 4287 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
| 4288 && (n -= ptr2cells(p)) >= 0) | |
| 4289 { | |
| 4290 #ifdef FEAT_MBYTE | |
| 474 | 4291 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
| 7 | 4292 { |
| 4293 msg_outtrans_len(p, l); | |
| 4294 p += l; | |
| 4295 } | |
| 4296 else | |
| 4297 #endif | |
| 4298 msg_outtrans_len(p++, 1); | |
| 4299 } | |
| 4300 ui_breakcheck(); | |
| 4301 } | |
| 4302 | |
| 3562 | 4303 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4304 /* | |
| 4305 * If "process" is TRUE and the line begins with a comment leader (possibly | |
| 4306 * after some white space), return a pointer to the text after it. Put a boolean | |
| 4307 * value indicating whether the line ends with an unclosed comment in | |
| 4308 * "is_comment". | |
| 4309 * line - line to be processed, | |
| 4310 * process - if FALSE, will only check whether the line ends with an unclosed | |
| 3584 | 4311 * comment, |
| 3562 | 4312 * include_space - whether to also skip space following the comment leader, |
| 4313 * is_comment - will indicate whether the current line ends with an unclosed | |
| 3584 | 4314 * comment. |
| 3562 | 4315 */ |
|
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4316 char_u * |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4317 skip_comment( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4318 char_u *line, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4319 int process, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4320 int include_space, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4321 int *is_comment) |
| 3562 | 4322 { |
| 4323 char_u *comment_flags = NULL; | |
| 4324 int lead_len; | |
| 4325 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
| 4326 | |
| 4327 *is_comment = FALSE; | |
| 4328 if (leader_offset != -1) | |
| 4329 { | |
| 4330 /* Let's check whether the line ends with an unclosed comment. | |
| 4331 * If the last comment leader has COM_END in flags, there's no comment. | |
| 4332 */ | |
| 4333 while (*comment_flags) | |
| 4334 { | |
| 4335 if (*comment_flags == COM_END | |
| 4336 || *comment_flags == ':') | |
| 4337 break; | |
| 4338 ++comment_flags; | |
| 4339 } | |
| 4340 if (*comment_flags != COM_END) | |
| 4341 *is_comment = TRUE; | |
| 4342 } | |
| 4343 | |
| 4344 if (process == FALSE) | |
| 4345 return line; | |
| 4346 | |
| 4347 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
| 4348 | |
| 4349 if (lead_len == 0) | |
| 4350 return line; | |
| 4351 | |
| 4352 /* Find: | |
| 4353 * - COM_END, | |
| 4354 * - colon, | |
| 4355 * whichever comes first. | |
| 4356 */ | |
| 4357 while (*comment_flags) | |
| 4358 { | |
| 3580 | 4359 if (*comment_flags == COM_END |
| 3562 | 4360 || *comment_flags == ':') |
| 4361 { | |
| 4362 break; | |
| 4363 } | |
| 4364 ++comment_flags; | |
| 4365 } | |
| 4366 | |
| 4367 /* If we found a colon, it means that we are not processing a line | |
| 3580 | 4368 * starting with a closing part of a three-part comment. That's good, |
| 4369 * because we don't want to remove those as this would be annoying. | |
| 3562 | 4370 */ |
| 4371 if (*comment_flags == ':' || *comment_flags == NUL) | |
| 4372 line += lead_len; | |
| 4373 | |
| 4374 return line; | |
| 4375 } | |
| 4376 #endif | |
| 4377 | |
| 7 | 4378 /* |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4379 * 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
|
4380 * When "save_undo" is TRUE save lines for undo first. |
| 5848 | 4381 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
| 4382 * leaders should not be removed. | |
| 4383 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
| 4384 * to set those marks. | |
| 7 | 4385 * |
| 1217 | 4386 * return FAIL for failure, OK otherwise |
| 7 | 4387 */ |
| 4388 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4389 do_join( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4390 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4391 int insert_space, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4392 int save_undo, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4393 int use_formatoptions UNUSED, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4394 int setmark) |
| 7 | 4395 { |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4396 char_u *curr = NULL; |
| 2597 | 4397 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
|
4398 char_u *cend; |
| 7 | 4399 char_u *newp; |
| 2597 | 4400 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
|
4401 int endcurr1 = NUL; |
|
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4402 int endcurr2 = NUL; |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4403 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
|
4404 int sumsize = 0; /* size of the long new line */ |
| 7 | 4405 linenr_T t; |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4406 colnr_T col = 0; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4407 int ret = OK; |
| 3562 | 4408 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 3574 | 4409 int *comments = NULL; |
| 3562 | 4410 int remove_comments = (use_formatoptions == TRUE) |
| 4411 && has_format_option(FO_REMOVE_COMS); | |
| 4412 int prev_was_comment; | |
| 4413 #endif | |
| 4414 | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4415 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4416 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
|
4417 (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
|
4418 return FAIL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4419 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4420 /* 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
|
4421 * 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
|
4422 * 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
|
4423 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
|
4424 if (spaces == NULL) |
| 7 | 4425 return FAIL; |
| 3562 | 4426 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4427 if (remove_comments) | |
| 4428 { | |
| 4429 comments = (int *)lalloc_clear((long_u)count * sizeof(int), TRUE); | |
| 4430 if (comments == NULL) | |
| 4431 { | |
| 4432 vim_free(spaces); | |
| 4433 return FAIL; | |
| 4434 } | |
| 4435 } | |
| 4436 #endif | |
| 7 | 4437 |
| 4438 /* | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4439 * 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
|
4440 * and setup the array of space strings lengths |
| 7 | 4441 */ |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4442 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
|
4443 { |
| 2597 | 4444 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
| 5848 | 4445 if (t == 0 && setmark) |
| 5664 | 4446 { |
| 4447 /* Set the '[ mark. */ | |
| 4448 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
| 4449 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
| 4450 } | |
| 3562 | 4451 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4452 if (remove_comments) | |
| 4453 { | |
| 4454 /* We don't want to remove the comment leader if the | |
| 4455 * previous line is not a comment. */ | |
| 4456 if (t > 0 && prev_was_comment) | |
| 4457 { | |
| 4458 | |
| 4459 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
| 4460 &prev_was_comment); | |
| 3576 | 4461 comments[t] = (int)(new_curr - curr); |
| 3562 | 4462 curr = new_curr; |
| 4463 } | |
| 4464 else | |
| 4465 curr = skip_comment(curr, FALSE, insert_space, | |
| 4466 &prev_was_comment); | |
| 4467 } | |
| 4468 #endif | |
| 4469 | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4470 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
|
4471 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4472 curr = skipwhite(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4473 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
|
4474 #ifdef FEAT_MBYTE |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4475 && (!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
|
4476 || (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
|
4477 && (!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
|
4478 || 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
|
4479 #endif |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4480 ) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4481 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4482 /* 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
|
4483 if (endcurr1 == ' ') |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4484 endcurr1 = endcurr2; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4485 else |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4486 ++spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4487 /* 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
|
4488 if ( p_js |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4489 && (endcurr1 == '.' |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4490 || (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
|
4491 && (endcurr1 == '?' || endcurr1 == '!')))) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4492 ++spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4493 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4494 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4495 currsize = (int)STRLEN(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4496 sumsize += currsize + spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4497 endcurr1 = endcurr2 = NUL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4498 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
|
4499 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4500 #ifdef FEAT_MBYTE |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4501 if (has_mbyte) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4502 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4503 cend = curr + currsize; |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4504 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
|
4505 endcurr1 = (*mb_ptr2char)(cend); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4506 if (cend > curr) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4507 { |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4508 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
|
4509 endcurr2 = (*mb_ptr2char)(cend); |
|
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 else |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4513 #endif |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4514 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4515 endcurr1 = *(curr + currsize - 1); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4516 if (currsize > 1) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4517 endcurr2 = *(curr + currsize - 2); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4518 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4519 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4520 line_breakcheck(); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4521 if (got_int) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4522 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4523 ret = FAIL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4524 goto theend; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4525 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4526 } |
|
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 /* 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
|
4529 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
|
4530 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4531 /* 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
|
4532 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
|
4533 cend = newp + sumsize; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4534 *cend = 0; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4535 |
|
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 * 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
|
4538 * |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4539 * 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
|
4540 * 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
|
4541 * 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
|
4542 */ |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4543 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
|
4544 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4545 cend -= currsize; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4546 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
|
4547 if (spaces[t] > 0) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4548 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4549 cend -= spaces[t]; |
| 6929 | 4550 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
|
4551 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4552 mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t, |
| 2597 | 4553 (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
|
4554 if (t == 0) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4555 break; |
| 2597 | 4556 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1)); |
| 3562 | 4557 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4558 if (remove_comments) | |
| 4559 curr += comments[t - 1]; | |
| 4560 #endif | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4561 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
|
4562 curr = skipwhite(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4563 currsize = (int)STRLEN(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4564 } |
| 7 | 4565 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
| 4566 | |
| 5848 | 4567 if (setmark) |
| 4568 { | |
| 4569 /* Set the '] mark. */ | |
| 4570 curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; | |
| 4571 curwin->w_buffer->b_op_end.col = (colnr_T)STRLEN(newp); | |
| 4572 } | |
| 5664 | 4573 |
| 7 | 4574 /* Only report the change in the first line here, del_lines() will report |
| 4575 * the deleted line. */ | |
| 4576 changed_lines(curwin->w_cursor.lnum, currsize, | |
| 4577 curwin->w_cursor.lnum + 1, 0L); | |
| 4578 | |
| 4579 /* | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4580 * Delete following lines. To do this we move the cursor there |
| 7 | 4581 * briefly, and then move it back. After del_lines() the cursor may |
| 4582 * have moved up (last line deleted), so the current lnum is kept in t. | |
| 4583 */ | |
| 4584 t = curwin->w_cursor.lnum; | |
| 4585 ++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
|
4586 del_lines(count - 1, FALSE); |
| 7 | 4587 curwin->w_cursor.lnum = t; |
| 4588 | |
| 4589 /* | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4590 * Set the cursor column: |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4591 * 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
|
4592 * vim: use the column of the last join |
| 7 | 4593 */ |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4594 curwin->w_cursor.col = |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4595 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
| 7 | 4596 check_cursor_col(); |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4597 |
| 7 | 4598 #ifdef FEAT_VIRTUALEDIT |
| 4599 curwin->w_cursor.coladd = 0; | |
| 4600 #endif | |
| 4601 curwin->w_set_curswant = TRUE; | |
| 4602 | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4603 theend: |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4604 vim_free(spaces); |
| 3562 | 4605 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4606 if (remove_comments) | |
| 4607 vim_free(comments); | |
| 4608 #endif | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4609 return ret; |
| 7 | 4610 } |
| 4611 | |
| 4612 #ifdef FEAT_COMMENTS | |
| 4613 /* | |
| 4614 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
| 4615 * the first line. White-space is ignored. Note that the whole of | |
| 4616 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
| 4617 */ | |
| 4618 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4619 same_leader( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4620 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4621 int leader1_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4622 char_u *leader1_flags, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4623 int leader2_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4624 char_u *leader2_flags) |
| 7 | 4625 { |
| 4626 int idx1 = 0, idx2 = 0; | |
| 4627 char_u *p; | |
| 4628 char_u *line1; | |
| 4629 char_u *line2; | |
| 4630 | |
| 4631 if (leader1_len == 0) | |
| 4632 return (leader2_len == 0); | |
| 4633 | |
| 4634 /* | |
| 4635 * If first leader has 'f' flag, the lines can be joined only if the | |
| 4636 * second line does not have a leader. | |
| 4637 * If first leader has 'e' flag, the lines can never be joined. | |
| 4638 * If fist leader has 's' flag, the lines can only be joined if there is | |
| 4639 * some text after it and the second line has the 'm' flag. | |
| 4640 */ | |
| 4641 if (leader1_flags != NULL) | |
| 4642 { | |
| 4643 for (p = leader1_flags; *p && *p != ':'; ++p) | |
| 4644 { | |
| 4645 if (*p == COM_FIRST) | |
| 4646 return (leader2_len == 0); | |
| 4647 if (*p == COM_END) | |
| 4648 return FALSE; | |
| 4649 if (*p == COM_START) | |
| 4650 { | |
| 4651 if (*(ml_get(lnum) + leader1_len) == NUL) | |
| 4652 return FALSE; | |
| 4653 if (leader2_flags == NULL || leader2_len == 0) | |
| 4654 return FALSE; | |
| 4655 for (p = leader2_flags; *p && *p != ':'; ++p) | |
| 4656 if (*p == COM_MIDDLE) | |
| 4657 return TRUE; | |
| 4658 return FALSE; | |
| 4659 } | |
| 4660 } | |
| 4661 } | |
| 4662 | |
| 4663 /* | |
| 4664 * Get current line and next line, compare the leaders. | |
| 4665 * The first line has to be saved, only one line can be locked at a time. | |
| 4666 */ | |
| 4667 line1 = vim_strsave(ml_get(lnum)); | |
| 4668 if (line1 != NULL) | |
| 4669 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4670 for (idx1 = 0; VIM_ISWHITE(line1[idx1]); ++idx1) |
| 7 | 4671 ; |
| 4672 line2 = ml_get(lnum + 1); | |
| 4673 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
| 4674 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4675 if (!VIM_ISWHITE(line2[idx2])) |
| 7 | 4676 { |
| 4677 if (line1[idx1++] != line2[idx2]) | |
| 4678 break; | |
| 4679 } | |
| 4680 else | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4681 while (VIM_ISWHITE(line1[idx1])) |
| 7 | 4682 ++idx1; |
| 4683 } | |
| 4684 vim_free(line1); | |
| 4685 } | |
| 4686 return (idx2 == leader2_len && idx1 == leader1_len); | |
| 4687 } | |
| 4688 #endif | |
| 4689 | |
| 4690 /* | |
| 3252 | 4691 * Implementation of the format operator 'gq'. |
| 7 | 4692 */ |
| 4693 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4694 op_format( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4695 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4696 int keep_cursor) /* keep cursor on same text char */ |
| 7 | 4697 { |
| 4698 long old_line_count = curbuf->b_ml.ml_line_count; | |
| 4699 | |
| 4700 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
| 4701 * can put it back there. */ | |
| 4702 curwin->w_cursor = oap->cursor_start; | |
| 4703 | |
| 4704 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 4705 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 4706 return; | |
| 4707 curwin->w_cursor = oap->start; | |
| 4708 | |
| 4709 if (oap->is_VIsual) | |
| 4710 /* When there is no change: need to remove the Visual selection */ | |
| 4711 redraw_curbuf_later(INVERTED); | |
| 4712 | |
| 4713 /* Set '[ mark at the start of the formatted area */ | |
| 4714 curbuf->b_op_start = oap->start; | |
| 4715 | |
| 4716 /* For "gw" remember the cursor position and put it back below (adjusted | |
| 4717 * for joined and split lines). */ | |
| 4718 if (keep_cursor) | |
| 4719 saved_cursor = oap->cursor_start; | |
| 4720 | |
| 1563 | 4721 format_lines(oap->line_count, keep_cursor); |
| 7 | 4722 |
| 4723 /* | |
| 4724 * Leave the cursor at the first non-blank of the last formatted line. | |
| 4725 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
| 4726 * line, so "." will do the next lines. | |
| 4727 */ | |
| 4728 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
| 4729 ++curwin->w_cursor.lnum; | |
| 4730 beginline(BL_WHITE | BL_FIX); | |
| 4731 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
| 4732 msgmore(old_line_count); | |
| 4733 | |
| 4734 /* put '] mark on the end of the formatted area */ | |
| 4735 curbuf->b_op_end = curwin->w_cursor; | |
| 4736 | |
| 4737 if (keep_cursor) | |
| 4738 { | |
| 4739 curwin->w_cursor = saved_cursor; | |
| 4740 saved_cursor.lnum = 0; | |
| 4741 } | |
| 4742 | |
| 4743 if (oap->is_VIsual) | |
| 4744 { | |
| 4745 win_T *wp; | |
| 4746 | |
| 4747 FOR_ALL_WINDOWS(wp) | |
| 4748 { | |
| 4749 if (wp->w_old_cursor_lnum != 0) | |
| 4750 { | |
| 4751 /* When lines have been inserted or deleted, adjust the end of | |
| 4752 * the Visual area to be redrawn. */ | |
| 4753 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
| 4754 wp->w_old_cursor_lnum += old_line_count; | |
| 4755 else | |
| 4756 wp->w_old_visual_lnum += old_line_count; | |
| 4757 } | |
| 4758 } | |
| 4759 } | |
| 4760 } | |
| 4761 | |
| 667 | 4762 #if defined(FEAT_EVAL) || defined(PROTO) |
| 4763 /* | |
| 4764 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
| 4765 */ | |
| 4766 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4767 op_formatexpr(oparg_T *oap) |
| 667 | 4768 { |
| 4769 if (oap->is_VIsual) | |
| 4770 /* When there is no change: need to remove the Visual selection */ | |
| 4771 redraw_curbuf_later(INVERTED); | |
| 4772 | |
|
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4773 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
|
4774 /* 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
|
4775 * internal formatting. */ |
|
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4776 op_format(oap, FALSE); |
| 667 | 4777 } |
| 4778 | |
| 4779 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4780 fex_format( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4781 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4782 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4783 int c) /* character to be inserted */ |
| 667 | 4784 { |
| 681 | 4785 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
| 4786 OPT_LOCAL); | |
| 667 | 4787 int r; |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4788 char_u *fex; |
| 667 | 4789 |
| 4790 /* | |
| 4791 * Set v:lnum to the first line number and v:count to the number of lines. | |
| 844 | 4792 * Set v:char to the character to be inserted (can be NUL). |
| 667 | 4793 */ |
| 4794 set_vim_var_nr(VV_LNUM, lnum); | |
| 4795 set_vim_var_nr(VV_COUNT, count); | |
| 1969 | 4796 set_vim_var_char(c); |
| 844 | 4797 |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4798 /* 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
|
4799 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
|
4800 if (fex == NULL) |
|
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4801 return 0; |
|
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4802 |
| 667 | 4803 /* |
| 4804 * Evaluate the function. | |
| 4805 */ | |
| 4806 if (use_sandbox) | |
| 4807 ++sandbox; | |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4808 r = (int)eval_to_number(fex); |
| 667 | 4809 if (use_sandbox) |
| 4810 --sandbox; | |
| 844 | 4811 |
| 4812 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
|
4813 vim_free(fex); |
| 844 | 4814 |
| 667 | 4815 return r; |
| 4816 } | |
| 4817 #endif | |
| 4818 | |
| 7 | 4819 /* |
| 4820 * Format "line_count" lines, starting at the cursor position. | |
| 4821 * When "line_count" is negative, format until the end of the paragraph. | |
| 4822 * Lines after the cursor line are saved for undo, caller must have saved the | |
| 4823 * first line. | |
| 4824 */ | |
| 4825 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4826 format_lines( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4827 linenr_T line_count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4828 int avoid_fex) /* don't use 'formatexpr' */ |
| 7 | 4829 { |
| 4830 int max_len; | |
| 4831 int is_not_par; /* current line not part of parag. */ | |
| 4832 int next_is_not_par; /* next line not part of paragraph */ | |
| 4833 int is_end_par; /* at end of paragraph */ | |
| 4834 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
| 4835 int next_is_start_par = FALSE; | |
| 4836 #ifdef FEAT_COMMENTS | |
| 4837 int leader_len = 0; /* leader len of current line */ | |
| 4838 int next_leader_len; /* leader len of next line */ | |
| 4839 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
| 4840 char_u *next_leader_flags; /* flags for leader of next line */ | |
| 4841 int do_comments; /* format comments */ | |
| 3584 | 4842 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
| 7 | 4843 #endif |
| 4844 int advance = TRUE; | |
| 3584 | 4845 int second_indent = -1; /* indent for second line (comment |
| 4846 * aware) */ | |
| 7 | 4847 int do_second_indent; |
| 4848 int do_number_indent; | |
| 4849 int do_trail_white; | |
| 4850 int first_par_line = TRUE; | |
| 4851 int smd_save; | |
| 4852 long count; | |
| 4853 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
| 4854 int force_format = FALSE; | |
| 4855 int old_State = State; | |
| 4856 | |
| 4857 /* length of a line to force formatting: 3 * 'tw' */ | |
| 4858 max_len = comp_textwidth(TRUE) * 3; | |
| 4859 | |
| 4860 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
| 4861 #ifdef FEAT_COMMENTS | |
| 4862 do_comments = has_format_option(FO_Q_COMS); | |
| 4863 #endif | |
| 4864 do_second_indent = has_format_option(FO_Q_SECOND); | |
| 4865 do_number_indent = has_format_option(FO_Q_NUMBER); | |
| 4866 do_trail_white = has_format_option(FO_WHITE_PAR); | |
| 4867 | |
| 4868 /* | |
| 4869 * Get info about the previous and current line. | |
| 4870 */ | |
| 4871 if (curwin->w_cursor.lnum > 1) | |
| 4872 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
| 4873 #ifdef FEAT_COMMENTS | |
| 4874 , &leader_len, &leader_flags, do_comments | |
| 4875 #endif | |
| 4876 ); | |
| 4877 else | |
| 4878 is_not_par = TRUE; | |
| 4879 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
| 4880 #ifdef FEAT_COMMENTS | |
| 4881 , &next_leader_len, &next_leader_flags, do_comments | |
| 4882 #endif | |
| 4883 ); | |
| 4884 is_end_par = (is_not_par || next_is_not_par); | |
| 4885 if (!is_end_par && do_trail_white) | |
| 4886 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
| 4887 | |
| 4888 curwin->w_cursor.lnum--; | |
| 4889 for (count = line_count; count != 0 && !got_int; --count) | |
| 4890 { | |
| 4891 /* | |
| 4892 * Advance to next paragraph. | |
| 4893 */ | |
| 4894 if (advance) | |
| 4895 { | |
| 4896 curwin->w_cursor.lnum++; | |
| 4897 prev_is_end_par = is_end_par; | |
| 4898 is_not_par = next_is_not_par; | |
| 4899 #ifdef FEAT_COMMENTS | |
| 4900 leader_len = next_leader_len; | |
| 4901 leader_flags = next_leader_flags; | |
| 4902 #endif | |
| 4903 } | |
| 4904 | |
| 4905 /* | |
| 4906 * The last line to be formatted. | |
| 4907 */ | |
| 4908 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
| 4909 { | |
| 4910 next_is_not_par = TRUE; | |
| 4911 #ifdef FEAT_COMMENTS | |
| 4912 next_leader_len = 0; | |
| 4913 next_leader_flags = NULL; | |
| 4914 #endif | |
| 4915 } | |
| 4916 else | |
| 4917 { | |
| 4918 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
| 4919 #ifdef FEAT_COMMENTS | |
| 4920 , &next_leader_len, &next_leader_flags, do_comments | |
| 4921 #endif | |
| 4922 ); | |
| 4923 if (do_number_indent) | |
| 4924 next_is_start_par = | |
| 4925 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
| 4926 } | |
| 4927 advance = TRUE; | |
| 4928 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
| 4929 if (!is_end_par && do_trail_white) | |
| 4930 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
| 4931 | |
| 4932 /* | |
| 4933 * Skip lines that are not in a paragraph. | |
| 4934 */ | |
| 4935 if (is_not_par) | |
| 4936 { | |
| 4937 if (line_count < 0) | |
| 4938 break; | |
| 4939 } | |
| 4940 else | |
| 4941 { | |
| 4942 /* | |
| 4943 * For the first line of a paragraph, check indent of second line. | |
| 4944 * Don't do this for comments and empty lines. | |
| 4945 */ | |
| 4946 if (first_par_line | |
| 4947 && (do_second_indent || do_number_indent) | |
| 4948 && prev_is_end_par | |
| 3584 | 4949 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
| 4950 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
4951 if (do_second_indent && !LINEEMPTY(curwin->w_cursor.lnum + 1)) |
| 3584 | 4952 { |
| 4953 #ifdef FEAT_COMMENTS | |
| 4954 if (leader_len == 0 && next_leader_len == 0) | |
| 4955 { | |
| 4956 /* no comment found */ | |
| 4957 #endif | |
| 4958 second_indent = | |
| 4959 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
| 7 | 4960 #ifdef FEAT_COMMENTS |
| 3584 | 4961 } |
| 4962 else | |
| 4963 { | |
| 4964 second_indent = next_leader_len; | |
| 4965 do_comments_list = 1; | |
| 4966 } | |
| 4967 #endif | |
| 4968 } | |
| 7 | 4969 else if (do_number_indent) |
| 3584 | 4970 { |
| 4971 #ifdef FEAT_COMMENTS | |
| 4972 if (leader_len == 0 && next_leader_len == 0) | |
| 4973 { | |
| 4974 /* no comment found */ | |
| 4975 #endif | |
| 4976 second_indent = | |
| 4977 get_number_indent(curwin->w_cursor.lnum); | |
| 4978 #ifdef FEAT_COMMENTS | |
| 4979 } | |
| 4980 else | |
| 4981 { | |
| 4982 /* get_number_indent() is now "comment aware"... */ | |
| 4983 second_indent = | |
| 4984 get_number_indent(curwin->w_cursor.lnum); | |
| 4985 do_comments_list = 1; | |
| 4986 } | |
| 4987 #endif | |
| 4988 } | |
| 7 | 4989 } |
| 4990 | |
| 4991 /* | |
| 4992 * When the comment leader changes, it's the end of the paragraph. | |
| 4993 */ | |
| 4994 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
| 4995 #ifdef FEAT_COMMENTS | |
| 4996 || !same_leader(curwin->w_cursor.lnum, | |
| 4997 leader_len, leader_flags, | |
| 4998 next_leader_len, next_leader_flags) | |
| 4999 #endif | |
| 5000 ) | |
| 5001 is_end_par = TRUE; | |
| 5002 | |
| 5003 /* | |
| 5004 * If we have got to the end of a paragraph, or the line is | |
| 5005 * getting long, format it. | |
| 5006 */ | |
| 5007 if (is_end_par || force_format) | |
| 5008 { | |
| 5009 if (need_set_indent) | |
| 5010 /* replace indent in first line with minimal number of | |
| 5011 * tabs and spaces, according to current options */ | |
| 5012 (void)set_indent(get_indent(), SIN_CHANGED); | |
| 5013 | |
| 5014 /* put cursor on last non-space */ | |
| 5015 State = NORMAL; /* don't go past end-of-line */ | |
| 5016 coladvance((colnr_T)MAXCOL); | |
| 5017 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
| 5018 dec_cursor(); | |
| 5019 | |
| 5020 /* do the formatting, without 'showmode' */ | |
| 5021 State = INSERT; /* for open_line() */ | |
| 5022 smd_save = p_smd; | |
| 5023 p_smd = FALSE; | |
| 5024 insertchar(NUL, INSCHAR_FORMAT | |
| 5025 #ifdef FEAT_COMMENTS | |
| 5026 + (do_comments ? INSCHAR_DO_COM : 0) | |
| 3584 | 5027 + (do_comments && do_comments_list |
| 5028 ? INSCHAR_COM_LIST : 0) | |
| 7 | 5029 #endif |
| 1563 | 5030 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
| 7 | 5031 State = old_State; |
| 5032 p_smd = smd_save; | |
| 5033 second_indent = -1; | |
| 5034 /* at end of par.: need to set indent of next par. */ | |
| 5035 need_set_indent = is_end_par; | |
| 5036 if (is_end_par) | |
| 5037 { | |
| 5038 /* When called with a negative line count, break at the | |
| 5039 * end of the paragraph. */ | |
| 5040 if (line_count < 0) | |
| 5041 break; | |
| 5042 first_par_line = TRUE; | |
| 5043 } | |
| 5044 force_format = FALSE; | |
| 5045 } | |
| 5046 | |
| 5047 /* | |
| 5048 * When still in same paragraph, join the lines together. But | |
| 5403 | 5049 * first delete the leader from the second line. |
| 7 | 5050 */ |
| 5051 if (!is_end_par) | |
| 5052 { | |
| 5053 advance = FALSE; | |
| 5054 curwin->w_cursor.lnum++; | |
| 5055 curwin->w_cursor.col = 0; | |
| 5056 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
|
5057 break; |
| 7 | 5058 #ifdef FEAT_COMMENTS |
| 5059 if (next_leader_len > 0) | |
| 5403 | 5060 { |
| 5061 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
| 7 | 5062 mark_col_adjust(curwin->w_cursor.lnum, (colnr_T)0, 0L, |
| 5063 (long)-next_leader_len); | |
| 5403 | 5064 } else |
| 5065 #endif | |
| 5066 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
| 5067 { | |
| 5068 char_u *p = ml_get_curline(); | |
| 5415 | 5069 int indent = (int)(skipwhite(p) - p); |
| 5403 | 5070 |
| 5071 if (indent > 0) | |
| 5072 { | |
| 5073 (void)del_bytes(indent, FALSE, FALSE); | |
| 5074 mark_col_adjust(curwin->w_cursor.lnum, | |
| 5075 (colnr_T)0, 0L, (long)-indent); | |
| 5415 | 5076 } |
| 5403 | 5077 } |
| 7 | 5078 curwin->w_cursor.lnum--; |
| 5848 | 5079 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
| 7 | 5080 { |
| 5081 beep_flush(); | |
| 5082 break; | |
| 5083 } | |
| 5084 first_par_line = FALSE; | |
| 5085 /* If the line is getting long, format it next time */ | |
| 5086 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
| 5087 force_format = TRUE; | |
| 5088 else | |
| 5089 force_format = FALSE; | |
| 5090 } | |
| 5091 } | |
| 5092 line_breakcheck(); | |
| 5093 } | |
| 5094 } | |
| 5095 | |
| 5096 /* | |
| 5097 * Return TRUE if line "lnum" ends in a white character. | |
| 5098 */ | |
| 5099 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5100 ends_in_white(linenr_T lnum) |
| 7 | 5101 { |
| 5102 char_u *s = ml_get(lnum); | |
| 5103 size_t l; | |
| 5104 | |
| 5105 if (*s == NUL) | |
| 5106 return FALSE; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5107 /* Don't use STRLEN() inside VIM_ISWHITE(), SAS/C complains: "macro |
| 7 | 5108 * invocation may call function multiple times". */ |
| 5109 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
|
5110 return VIM_ISWHITE(s[l]); |
| 7 | 5111 } |
| 5112 | |
| 5113 /* | |
| 5114 * Blank lines, and lines containing only the comment leader, are left | |
| 5115 * untouched by the formatting. The function returns TRUE in this | |
| 5116 * case. It also returns TRUE when a line starts with the end of a comment | |
| 5117 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
| 5118 * previous line. A new paragraph starts after a blank line, or when the | |
| 5119 * comment leader changes -- webb. | |
| 5120 */ | |
| 5121 #ifdef FEAT_COMMENTS | |
| 5122 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5123 fmt_check_par( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5124 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5125 int *leader_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5126 char_u **leader_flags, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5127 int do_comments) |
| 7 | 5128 { |
| 5129 char_u *flags = NULL; /* init for GCC */ | |
| 5130 char_u *ptr; | |
| 5131 | |
| 5132 ptr = ml_get(lnum); | |
| 5133 if (do_comments) | |
| 3562 | 5134 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
| 7 | 5135 else |
| 5136 *leader_len = 0; | |
| 5137 | |
| 5138 if (*leader_len > 0) | |
| 5139 { | |
| 5140 /* | |
| 5141 * Search for 'e' flag in comment leader flags. | |
| 5142 */ | |
| 5143 flags = *leader_flags; | |
| 5144 while (*flags && *flags != ':' && *flags != COM_END) | |
| 5145 ++flags; | |
| 5146 } | |
| 5147 | |
| 5148 return (*skipwhite(ptr + *leader_len) == NUL | |
| 5149 || (*leader_len > 0 && *flags == COM_END) | |
| 5150 || startPS(lnum, NUL, FALSE)); | |
| 5151 } | |
| 5152 #else | |
| 5153 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5154 fmt_check_par(linenr_T lnum) |
| 7 | 5155 { |
| 5156 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
| 5157 } | |
| 5158 #endif | |
| 5159 | |
| 5160 /* | |
| 5161 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
| 5162 * previous line is in the same paragraph. Used for auto-formatting. | |
| 5163 */ | |
| 5164 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5165 paragraph_start(linenr_T lnum) |
| 7 | 5166 { |
| 5167 char_u *p; | |
| 5168 #ifdef FEAT_COMMENTS | |
| 5169 int leader_len = 0; /* leader len of current line */ | |
| 5170 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
| 5171 int next_leader_len; /* leader len of next line */ | |
| 5172 char_u *next_leader_flags; /* flags for leader of next line */ | |
| 5173 int do_comments; /* format comments */ | |
| 5174 #endif | |
| 5175 | |
| 5176 if (lnum <= 1) | |
| 5177 return TRUE; /* start of the file */ | |
| 5178 | |
| 5179 p = ml_get(lnum - 1); | |
| 5180 if (*p == NUL) | |
| 5181 return TRUE; /* after empty line */ | |
| 5182 | |
| 5183 #ifdef FEAT_COMMENTS | |
| 5184 do_comments = has_format_option(FO_Q_COMS); | |
| 5185 #endif | |
| 5186 if (fmt_check_par(lnum - 1 | |
| 5187 #ifdef FEAT_COMMENTS | |
| 5188 , &leader_len, &leader_flags, do_comments | |
| 5189 #endif | |
| 5190 )) | |
| 5191 return TRUE; /* after non-paragraph line */ | |
| 5192 | |
| 5193 if (fmt_check_par(lnum | |
| 5194 #ifdef FEAT_COMMENTS | |
| 5195 , &next_leader_len, &next_leader_flags, do_comments | |
| 5196 #endif | |
| 5197 )) | |
| 5198 return TRUE; /* "lnum" is not a paragraph line */ | |
| 5199 | |
| 5200 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
| 5201 return TRUE; /* missing trailing space in previous line. */ | |
| 5202 | |
| 5203 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
| 5204 return TRUE; /* numbered item starts in "lnum". */ | |
| 5205 | |
| 5206 #ifdef FEAT_COMMENTS | |
| 5207 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
| 5208 next_leader_len, next_leader_flags)) | |
| 5209 return TRUE; /* change of comment leader. */ | |
| 5210 #endif | |
| 5211 | |
| 5212 return FALSE; | |
| 5213 } | |
| 5214 | |
| 5215 /* | |
| 5216 * prepare a few things for block mode yank/delete/tilde | |
| 5217 * | |
| 5218 * for delete: | |
| 5219 * - textlen includes the first/last char to be (partly) deleted | |
| 5220 * - start/endspaces is the number of columns that are taken by the | |
| 5221 * first/last deleted char minus the number of columns that have to be | |
| 1839 | 5222 * deleted. |
| 5223 * for yank and tilde: | |
| 7 | 5224 * - textlen includes the first/last char to be wholly yanked |
| 5225 * - start/endspaces is the number of columns of the first/last yanked char | |
| 5226 * that are to be yanked. | |
| 5227 */ | |
| 5228 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5229 block_prep( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5230 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5231 struct block_def *bdp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5232 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5233 int is_del) |
| 7 | 5234 { |
| 5235 int incr = 0; | |
| 5236 char_u *pend; | |
| 5237 char_u *pstart; | |
| 5238 char_u *line; | |
| 5239 char_u *prev_pstart; | |
| 5240 char_u *prev_pend; | |
| 5241 | |
| 5242 bdp->startspaces = 0; | |
| 5243 bdp->endspaces = 0; | |
| 5244 bdp->textlen = 0; | |
| 5245 bdp->start_vcol = 0; | |
| 5246 bdp->end_vcol = 0; | |
| 5247 #ifdef FEAT_VISUALEXTRA | |
| 5248 bdp->is_short = FALSE; | |
| 5249 bdp->is_oneChar = FALSE; | |
| 5250 bdp->pre_whitesp = 0; | |
| 5251 bdp->pre_whitesp_c = 0; | |
| 5252 bdp->end_char_vcols = 0; | |
| 5253 #endif | |
| 5254 bdp->start_char_vcols = 0; | |
| 5255 | |
| 5256 line = ml_get(lnum); | |
| 5257 pstart = line; | |
| 5258 prev_pstart = line; | |
| 5259 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
| 5260 { | |
| 5261 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5995 | 5262 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
| 7 | 5263 bdp->start_vcol += incr; |
| 5264 #ifdef FEAT_VISUALEXTRA | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5265 if (VIM_ISWHITE(*pstart)) |
| 7 | 5266 { |
| 5267 bdp->pre_whitesp += incr; | |
| 5268 bdp->pre_whitesp_c++; | |
| 5269 } | |
| 5270 else | |
| 5271 { | |
| 5272 bdp->pre_whitesp = 0; | |
| 5273 bdp->pre_whitesp_c = 0; | |
| 5274 } | |
| 5275 #endif | |
| 5276 prev_pstart = pstart; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
5277 MB_PTR_ADV(pstart); |
| 7 | 5278 } |
| 5279 bdp->start_char_vcols = incr; | |
| 5280 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
| 5281 { | |
| 5282 bdp->end_vcol = bdp->start_vcol; | |
| 5283 #ifdef FEAT_VISUALEXTRA | |
| 5284 bdp->is_short = TRUE; | |
| 5285 #endif | |
| 5286 if (!is_del || oap->op_type == OP_APPEND) | |
| 5287 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
| 5288 } | |
| 5289 else | |
| 5290 { | |
| 5291 /* notice: this converts partly selected Multibyte characters to | |
| 5292 * spaces, too. */ | |
| 5293 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
| 5294 if (is_del && bdp->startspaces) | |
| 5295 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5296 pend = pstart; | |
| 5297 bdp->end_vcol = bdp->start_vcol; | |
| 5298 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
| 5299 { | |
| 5300 #ifdef FEAT_VISUALEXTRA | |
| 5301 bdp->is_oneChar = TRUE; | |
| 5302 #endif | |
| 5303 if (oap->op_type == OP_INSERT) | |
| 5304 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5305 else if (oap->op_type == OP_APPEND) | |
| 5306 { | |
| 5307 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
| 5308 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5309 } | |
| 5310 else | |
| 5311 { | |
| 5312 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
| 5313 if (is_del && oap->op_type != OP_LSHIFT) | |
| 5314 { | |
| 5315 /* just putting the sum of those two into | |
| 5316 * bdp->startspaces doesn't work for Visual replace, | |
| 5317 * so we have to split the tab in two */ | |
| 5318 bdp->startspaces = bdp->start_char_vcols | |
| 5319 - (bdp->start_vcol - oap->start_vcol); | |
| 5320 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
| 5321 } | |
| 5322 } | |
| 5323 } | |
| 5324 else | |
| 5325 { | |
| 5326 prev_pend = pend; | |
| 5327 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
| 5328 { | |
| 5329 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5330 prev_pend = pend; | |
| 6535 | 5331 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
| 7 | 5332 bdp->end_vcol += incr; |
| 5333 } | |
| 5334 if (bdp->end_vcol <= oap->end_vcol | |
| 5335 && (!is_del | |
| 5336 || oap->op_type == OP_APPEND | |
| 5337 || oap->op_type == OP_REPLACE)) /* line too short */ | |
| 5338 { | |
| 5339 #ifdef FEAT_VISUALEXTRA | |
| 5340 bdp->is_short = TRUE; | |
| 5341 #endif | |
| 5342 /* Alternative: include spaces to fill up the block. | |
| 5343 * Disadvantage: can lead to trailing spaces when the line is | |
| 5344 * short where the text is put */ | |
| 5345 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
| 5346 if (oap->op_type == OP_APPEND || virtual_op) | |
| 5347 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
| 593 | 5348 + oap->inclusive; |
| 7 | 5349 else |
| 5350 bdp->endspaces = 0; /* replace doesn't add characters */ | |
| 5351 } | |
| 5352 else if (bdp->end_vcol > oap->end_vcol) | |
| 5353 { | |
| 5354 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
| 5355 if (!is_del && bdp->endspaces) | |
| 5356 { | |
| 5357 bdp->endspaces = incr - bdp->endspaces; | |
| 5358 if (pend != pstart) | |
| 5359 pend = prev_pend; | |
| 5360 } | |
| 5361 } | |
| 5362 } | |
| 5363 #ifdef FEAT_VISUALEXTRA | |
| 5364 bdp->end_char_vcols = incr; | |
| 5365 #endif | |
| 5366 if (is_del && bdp->startspaces) | |
| 5367 pstart = prev_pstart; | |
| 5368 bdp->textlen = (int)(pend - pstart); | |
| 5369 } | |
| 5370 bdp->textcol = (colnr_T) (pstart - line); | |
| 5371 bdp->textstart = pstart; | |
| 5372 } | |
| 5373 | |
| 5374 /* | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5375 * Handle the add/subtract operator. |
| 7 | 5376 */ |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5377 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5378 op_addsub( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5379 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5380 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
|
5381 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
|
5382 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5383 pos_T pos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5384 struct block_def bd; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5385 int change_cnt = 0; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5386 linenr_T amount = Prenum1; |
|
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 (!VIsual_active) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5389 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5390 pos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5391 if (u_save_cursor() == FAIL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5392 return; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5393 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
|
5394 if (change_cnt) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5395 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
|
5396 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5397 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5398 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5399 int one_change; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5400 int length; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5401 pos_T startpos; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5402 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5403 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
|
5404 (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
|
5405 return; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5406 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5407 pos = oap->start; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5408 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
|
5409 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5410 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
|
5411 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5412 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
|
5413 pos.col = bd.textcol; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5414 length = bd.textlen; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5415 } |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5416 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
|
5417 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5418 curwin->w_cursor.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5419 pos.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5420 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
|
5421 } |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5422 else /* oap->motion_type == MCHAR */ |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5423 { |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5424 if (!oap->inclusive) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5425 dec(&(oap->end)); |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5426 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
|
5427 pos.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5428 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
|
5429 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5430 pos.col += oap->start.col; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5431 length -= oap->start.col; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5432 } |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5433 if (pos.lnum == oap->end.lnum) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5434 { |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5435 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
|
5436 if (oap->end.col >= length) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5437 oap->end.col = length - 1; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5438 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
|
5439 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5440 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5441 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
|
5442 if (one_change) |
|
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 /* 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
|
5445 if (change_cnt == 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5446 startpos = curbuf->b_op_start; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5447 ++change_cnt; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5448 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5449 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5450 #ifdef FEAT_NETBEANS_INTG |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5451 if (netbeans_active() && one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5452 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5453 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
|
5454 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5455 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
|
5456 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
|
5457 &ptr[pos.col], length); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5458 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5459 #endif |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5460 if (g_cmd && one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5461 amount += Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5462 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5463 if (change_cnt) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5464 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
|
5465 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5466 if (!change_cnt && oap->is_VIsual) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5467 /* 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
|
5468 redraw_curbuf_later(INVERTED); |
|
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 /* 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
|
5471 * position from do_addsub(). */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5472 if (change_cnt > 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5473 curbuf->b_op_start = startpos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5474 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5475 if (change_cnt > p_report) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5476 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5477 if (change_cnt == 1) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5478 MSG(_("1 line changed")); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5479 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5480 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
|
5481 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5482 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5483 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5484 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5485 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5486 * 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
|
5487 * 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
|
5488 * |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5489 * 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
|
5490 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5491 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5492 do_addsub( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5493 int op_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5494 pos_T *pos, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5495 int length, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5496 linenr_T Prenum1) |
| 7 | 5497 { |
| 5498 int col; | |
| 5499 char_u *buf1; | |
| 5500 char_u buf2[NUMBUFLEN]; | |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5501 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
| 7 | 5502 static int hexupper = FALSE; /* 0xABC */ |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5503 uvarnumber_T n; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5504 uvarnumber_T oldn; |
| 7 | 5505 char_u *ptr; |
| 5506 int c; | |
| 5507 int todel; | |
| 5508 int dohex; | |
| 5509 int dooct; | |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5510 int dobin; |
| 7 | 5511 int doalp; |
| 5512 int firstdigit; | |
| 5513 int subtract; | |
| 6868 | 5514 int negative = FALSE; |
| 6891 | 5515 int was_positive = TRUE; |
| 6868 | 5516 int visual = VIsual_active; |
| 6921 | 5517 int did_change = FALSE; |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5518 pos_T save_cursor = curwin->w_cursor; |
| 6927 | 5519 int maxlen = 0; |
|
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5520 pos_T startpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5521 pos_T endpos; |
| 7 | 5522 |
| 5523 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
| 5524 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
|
5525 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
| 7 | 5526 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
| 5527 | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5528 curwin->w_cursor = *pos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5529 ptr = ml_get(pos->lnum); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5530 col = pos->col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5531 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5532 if (*ptr == NUL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5533 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5534 |
| 7 | 5535 /* |
| 5536 * First check if we are on a hexadecimal number, after the "0x". | |
| 5537 */ | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5538 if (!VIsual_active) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5539 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5540 if (dobin) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5541 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
|
5542 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5543 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5544 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5545 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5546 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
|
5547 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5548 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5549 |
| 6868 | 5550 if (dohex) |
| 5551 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
|
5552 { |
| 6868 | 5553 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5554 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5555 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5556 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
|
5557 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5558 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5559 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5560 if ( dobin |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5561 && dohex |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5562 && ! ((col > 0 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5563 && (ptr[col] == 'X' |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5564 || ptr[col] == 'x') |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5565 && ptr[col - 1] == '0' |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5566 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5567 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5568 !(*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
|
5569 #endif |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5570 && vim_isxdigit(ptr[col + 1])))) |
|
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 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5573 /* 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
|
5574 |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5575 col = pos->col; |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5576 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5577 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
|
5578 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5579 col--; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5580 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5581 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5582 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
|
5583 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5584 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5585 } |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5586 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5587 if (( dohex |
| 6868 | 5588 && col > 0 |
| 5589 && (ptr[col] == 'X' | |
| 5590 || ptr[col] == 'x') | |
| 5591 && ptr[col - 1] == '0' | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5592 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5593 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5594 !(*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
|
5595 #endif |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5596 && vim_isxdigit(ptr[col + 1])) || |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5597 ( dobin |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5598 && col > 0 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5599 && (ptr[col] == 'B' |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5600 || ptr[col] == 'b') |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5601 && ptr[col - 1] == '0' |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5602 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5603 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5604 !(*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
|
5605 #endif |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5606 && vim_isbdigit(ptr[col + 1]))) |
| 6868 | 5607 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5608 /* Found hexadecimal or binary number, move to its start. */ |
| 7 | 5609 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5610 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5611 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5612 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
|
5613 #endif |
| 6868 | 5614 } |
| 5615 else | |
| 7 | 5616 { |
| 6868 | 5617 /* |
| 5618 * Search forward and then backward to find the start of number. | |
| 5619 */ | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5620 col = pos->col; |
| 6868 | 5621 |
| 5622 while (ptr[col] != NUL | |
| 5623 && !vim_isdigit(ptr[col]) | |
| 5624 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5625 col += MB_PTR2LEN(ptr + col); |
| 6868 | 5626 |
| 5627 while (col > 0 | |
| 5628 && vim_isdigit(ptr[col - 1]) | |
| 5629 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5630 { |
| 6868 | 5631 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5632 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5633 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5634 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
|
5635 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5636 } |
| 6868 | 5637 } |
| 5638 } | |
| 5639 | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5640 if (visual) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5641 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5642 while (ptr[col] != NUL && length > 0 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5643 && !vim_isdigit(ptr[col]) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5644 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5645 { |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5646 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
|
5647 |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5648 col += mb_len; |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5649 length -= mb_len; |
|
7574
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 if (length == 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5653 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5654 |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5655 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
|
5656 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5657 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5658 !(*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
|
5659 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5660 ) |
|
7574
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 negative = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5663 was_positive = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5664 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5665 } |
|
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 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5668 * 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
|
5669 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5670 firstdigit = ptr[col]; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5671 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
|
5672 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5673 beep_flush(); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5674 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5675 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5676 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5677 if (doalp && ASCII_ISALPHA(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5678 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5679 /* decrement or increment alphabetic character */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5680 if (op_type == OP_NR_SUB) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5681 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5682 if (CharOrd(firstdigit) < Prenum1) |
| 6927 | 5683 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5684 if (isupper(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5685 firstdigit = 'A'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5686 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5687 firstdigit = 'a'; |
| 6927 | 5688 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5689 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5690 #ifdef EBCDIC |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5691 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5692 #else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5693 firstdigit -= Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5694 #endif |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5695 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5696 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5697 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5698 if (26 - CharOrd(firstdigit) - 1 < Prenum1) |
| 6927 | 5699 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5700 if (isupper(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5701 firstdigit = 'Z'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5702 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5703 firstdigit = 'z'; |
| 6927 | 5704 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5705 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5706 #ifdef EBCDIC |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5707 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5708 #else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5709 firstdigit += Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5710 #endif |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5711 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5712 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5713 if (!did_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5714 startpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5715 did_change = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5716 (void)del_char(FALSE); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5717 ins_char(firstdigit); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5718 endpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5719 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5720 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5721 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5722 { |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5723 if (col > 0 && ptr[col - 1] == '-' |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5724 #ifdef FEAT_MBYTE |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5725 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5726 !(*mb_head_off)(ptr, ptr + col - 1)) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5727 #endif |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5728 && !visual) |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5729 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5730 /* negative number */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5731 --col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5732 negative = TRUE; |
|
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 /* get the number value (unsigned) */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5735 if (visual && VIsual_mode != 'V') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5736 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
|
5737 ? (int)STRLEN(ptr) - col |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5738 : length); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5739 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5740 vim_str2nr(ptr + col, &pre, &length, |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5741 0 + (dobin ? STR2NR_BIN : 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5742 + (dooct ? STR2NR_OCT : 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5743 + (dohex ? STR2NR_HEX : 0), |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5744 NULL, &n, maxlen); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5745 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5746 /* 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
|
5747 if (pre && negative) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5748 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5749 ++col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5750 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5751 negative = FALSE; |
|
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 /* add or subtract */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5754 subtract = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5755 if (op_type == OP_NR_SUB) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5756 subtract ^= TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5757 if (negative) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5758 subtract ^= TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5759 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5760 oldn = n; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5761 if (subtract) |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5762 n -= (uvarnumber_T)Prenum1; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5763 else |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5764 n += (uvarnumber_T)Prenum1; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5765 /* handle wraparound for decimal numbers */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5766 if (!pre) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5767 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5768 if (subtract) |
| 6927 | 5769 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5770 if (n > oldn) |
| 6868 | 5771 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5772 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
|
5773 negative ^= TRUE; |
| 6868 | 5774 } |
| 7 | 5775 } |
| 5776 else | |
| 6868 | 5777 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5778 /* add */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5779 if (n < oldn) |
| 6868 | 5780 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5781 n = (n ^ (uvarnumber_T)-1); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5782 negative ^= TRUE; |
| 6868 | 5783 } |
| 6927 | 5784 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5785 if (n == 0) |
| 6868 | 5786 negative = FALSE; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5787 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5788 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5789 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
|
5790 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5791 /* need to remove the '-' */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5792 col--; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5793 length++; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5794 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5795 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5796 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5797 * Delete the old number. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5798 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5799 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5800 if (!did_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5801 startpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5802 did_change = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5803 todel = length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5804 c = gchar_cursor(); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5805 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5806 * 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
|
5807 * 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
|
5808 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5809 if (c == '-') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5810 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5811 while (todel-- > 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5812 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5813 if (c < 0x100 && isalpha(c)) |
| 6868 | 5814 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5815 if (isupper(c)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5816 hexupper = TRUE; |
| 6868 | 5817 else |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5818 hexupper = FALSE; |
| 6891 | 5819 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5820 /* 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
|
5821 (void)del_char(FALSE); |
| 6868 | 5822 c = gchar_cursor(); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5823 } |
|
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 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5826 * Prepare the leading characters in buf1[]. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5827 * 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
|
5828 * Allocate a bit too much. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5829 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5830 buf1 = alloc((unsigned)length + NUMBUFLEN); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5831 if (buf1 == NULL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5832 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5833 ptr = buf1; |
|
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
5834 if (negative && (!visual || was_positive)) |
|
7574
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 *ptr++ = '-'; |
|
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) |
|
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 *ptr++ = '0'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5841 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5842 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5843 if (pre == 'b' || pre == 'B' || |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5844 pre == 'x' || pre == 'X') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5845 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5846 *ptr++ = pre; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5847 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5848 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5849 |
|
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 * Put the number characters in buf2[]. |
|
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 if (pre == 'b' || pre == 'B') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5854 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5855 int i; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5856 int bit = 0; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5857 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
|
5858 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5859 /* leading zeros */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5860 for (bit = bits; bit > 0; bit--) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5861 if ((n >> (bit - 1)) & 0x1) break; |
|
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 for (i = 0; bit > 0; bit--) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5864 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
|
5865 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5866 buf2[i] = '\0'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5867 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5868 else if (pre == 0) |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5869 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
|
5870 else if (pre == '0') |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5871 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
|
5872 else if (pre && hexupper) |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5873 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
|
5874 else |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5875 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
|
5876 length -= (int)STRLEN(buf2); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5877 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5878 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5879 * 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
|
5880 * 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
|
5881 * Don't do this when |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5882 * 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
|
5883 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5884 if (firstdigit == '0' && !(dooct && pre == 0)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5885 while (length-- > 0) |
| 6868 | 5886 *ptr++ = '0'; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5887 *ptr = NUL; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5888 STRCAT(buf1, buf2); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5889 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
|
5890 vim_free(buf1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5891 endpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5892 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
|
5893 --curwin->w_cursor.col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5894 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5895 |
|
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5896 if (did_change) |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5897 { |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5898 /* set the '[ and '] marks */ |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5899 curbuf->b_op_start = startpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5900 curbuf->b_op_end = endpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5901 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
|
5902 --curbuf->b_op_end.col; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5903 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5904 |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5905 theend: |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5906 if (visual) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5907 curwin->w_cursor = save_cursor; |
|
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5908 else if (did_change) |
|
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5909 curwin->w_set_curswant = TRUE; |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5910 |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5911 return did_change; |
| 7 | 5912 } |
| 5913 | |
| 5914 #ifdef FEAT_VIMINFO | |
|
9272
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 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
|
5917 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5918 #define REG_PREVIOUS 1 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5919 #define REG_EXEC 2 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5920 |
|
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 * 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
|
5923 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5924 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5925 prepare_viminfo_registers(void) |
|
9272
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 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
|
5928 * (int)sizeof(yankreg_T)); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5929 } |
|
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 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5932 finish_viminfo_registers(void) |
|
9272
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 int i; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5935 int j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5936 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5937 if (y_read_regs != NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5938 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5939 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
|
5940 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
|
5941 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5942 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
|
5943 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
|
5944 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
|
5945 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5946 vim_free(y_read_regs); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5947 y_read_regs = NULL; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5948 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5949 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5950 |
| 7 | 5951 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5952 read_viminfo_register(vir_T *virp, int force) |
| 7 | 5953 { |
| 5954 int eof; | |
| 5955 int do_it = TRUE; | |
| 5956 int size; | |
| 5957 int limit; | |
| 5958 int i; | |
| 5959 int set_prev = FALSE; | |
| 5960 char_u *str; | |
| 5961 char_u **array = NULL; | |
| 6508 | 5962 int new_type = MCHAR; /* init to shut up compiler */ |
| 5963 colnr_T new_width = 0; /* init to shut up compiler */ | |
| 7 | 5964 |
| 5965 /* We only get here (hopefully) if line[0] == '"' */ | |
| 5966 str = virp->vir_line + 1; | |
| 1893 | 5967 |
| 5968 /* If the line starts with "" this is the y_previous register. */ | |
| 7 | 5969 if (*str == '"') |
| 5970 { | |
| 5971 set_prev = TRUE; | |
| 5972 str++; | |
| 5973 } | |
| 1893 | 5974 |
| 7 | 5975 if (!ASCII_ISALNUM(*str) && *str != '-') |
| 5976 { | |
| 5977 if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line)) | |
| 5978 return TRUE; /* too many errors, pretend end-of-file */ | |
| 5979 do_it = FALSE; | |
| 5980 } | |
| 5981 get_yank_register(*str++, FALSE); | |
| 5982 if (!force && y_current->y_array != NULL) | |
| 5983 do_it = FALSE; | |
| 1893 | 5984 |
| 5985 if (*str == '@') | |
| 5986 { | |
| 5987 /* "x@: register x used for @@ */ | |
| 5988 if (force || execreg_lastc == NUL) | |
| 5989 execreg_lastc = str[-1]; | |
| 5990 } | |
| 5991 | |
| 7 | 5992 size = 0; |
| 5993 limit = 100; /* Optimized for registers containing <= 100 lines */ | |
| 5994 if (do_it) | |
| 5995 { | |
| 6462 | 5996 /* |
| 5997 * Build the new register in array[]. | |
| 5998 * y_array is kept as-is until done. | |
| 5999 * The "do_it" flag is reset when something is wrong, in which case | |
| 6000 * array[] needs to be freed. | |
| 6001 */ | |
| 7 | 6002 if (set_prev) |
| 6003 y_previous = y_current; | |
| 6462 | 6004 array = (char_u **)alloc((unsigned)(limit * sizeof(char_u *))); |
| 1893 | 6005 str = skipwhite(skiptowhite(str)); |
| 7 | 6006 if (STRNCMP(str, "CHAR", 4) == 0) |
| 6462 | 6007 new_type = MCHAR; |
| 7 | 6008 else if (STRNCMP(str, "BLOCK", 5) == 0) |
| 6462 | 6009 new_type = MBLOCK; |
| 7 | 6010 else |
| 6462 | 6011 new_type = MLINE; |
| 7 | 6012 /* get the block width; if it's missing we get a zero, which is OK */ |
| 6013 str = skipwhite(skiptowhite(str)); | |
| 6462 | 6014 new_width = getdigits(&str); |
| 7 | 6015 } |
| 6016 | |
| 6017 while (!(eof = viminfo_readline(virp)) | |
| 6018 && (virp->vir_line[0] == TAB || virp->vir_line[0] == '<')) | |
| 6019 { | |
| 6020 if (do_it) | |
| 6021 { | |
| 6462 | 6022 if (size == limit) |
| 7 | 6023 { |
| 6462 | 6024 char_u **new_array = (char_u **) |
| 7 | 6025 alloc((unsigned)(limit * 2 * sizeof(char_u *))); |
| 6462 | 6026 |
| 6027 if (new_array == NULL) | |
| 6028 { | |
| 6029 do_it = FALSE; | |
| 6030 break; | |
| 6031 } | |
| 7 | 6032 for (i = 0; i < limit; i++) |
| 6462 | 6033 new_array[i] = array[i]; |
| 7 | 6034 vim_free(array); |
| 6462 | 6035 array = new_array; |
| 7 | 6036 limit *= 2; |
| 6037 } | |
| 6038 str = viminfo_readstring(virp, 1, TRUE); | |
| 6039 if (str != NULL) | |
| 6040 array[size++] = str; | |
| 6041 else | |
| 6462 | 6042 /* error, don't store the result */ |
| 7 | 6043 do_it = FALSE; |
| 6044 } | |
| 6045 } | |
| 6508 | 6046 |
| 7 | 6047 if (do_it) |
| 6048 { | |
| 6462 | 6049 /* free y_array[] */ |
| 6050 for (i = 0; i < y_current->y_size; i++) | |
| 6051 vim_free(y_current->y_array[i]); | |
| 6052 vim_free(y_current->y_array); | |
| 6053 | |
| 6054 y_current->y_type = new_type; | |
| 6055 y_current->y_width = new_width; | |
| 6056 y_current->y_size = size; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6057 y_current->y_time_set = 0; |
| 7 | 6058 if (size == 0) |
| 6059 { | |
| 6060 y_current->y_array = NULL; | |
| 6061 } | |
| 6462 | 6062 else |
| 7 | 6063 { |
| 6462 | 6064 /* Move the lines from array[] to y_array[]. */ |
| 7 | 6065 y_current->y_array = |
| 6066 (char_u **)alloc((unsigned)(size * sizeof(char_u *))); | |
| 6067 for (i = 0; i < size; i++) | |
| 6462 | 6068 { |
| 6069 if (y_current->y_array == NULL) | |
| 6070 vim_free(array[i]); | |
| 6071 else | |
| 6072 y_current->y_array[i] = array[i]; | |
| 6073 } | |
| 7 | 6074 } |
| 6462 | 6075 } |
| 6076 else | |
| 6077 { | |
| 6078 /* Free array[] if it was filled. */ | |
| 6079 for (i = 0; i < size; i++) | |
| 6080 vim_free(array[i]); | |
| 6081 } | |
| 6082 vim_free(array); | |
| 6083 | |
| 7 | 6084 return eof; |
| 6085 } | |
| 6086 | |
|
9272
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 * 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
|
6089 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6090 void |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6091 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
|
6092 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6093 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
|
6094 int flags; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6095 int name; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6096 int type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6097 int linecount; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6098 int width; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6099 time_t timestamp; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6100 yankreg_T *y_ptr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6101 int i; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6102 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6103 /* Check the format: |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6104 * |{bartype},{flags},{name},{type}, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6105 * {linecount},{width},{timestamp},"line1","line2" |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6106 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6107 if (values->ga_len < 6 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6108 || vp[0].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6109 || vp[1].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6110 || vp[2].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6111 || vp[3].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6112 || vp[4].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6113 || vp[5].bv_type != BVAL_NR) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6114 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6115 flags = vp[0].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6116 name = vp[1].bv_nr; |
|
9307
eb52a2670c96
commit https://github.com/vim/vim/commit/67e3720a9ddd8a9d2e8344358c28fa1f4196db0d
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
6117 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
|
6118 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6119 type = vp[2].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6120 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
|
6121 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6122 linecount = vp[3].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6123 if (values->ga_len < 6 + linecount) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6124 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6125 width = vp[4].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6126 if (width < 0) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6127 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6128 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6129 if (y_read_regs != NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6130 /* 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
|
6131 * 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
|
6132 y_ptr = &y_read_regs[name]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6133 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6134 y_ptr = &y_regs[name]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6135 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6136 /* 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
|
6137 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
|
6138 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
|
6139 && (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
|
6140 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6141 |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6142 if (y_ptr->y_array != NULL) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6143 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
|
6144 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
|
6145 vim_free(y_ptr->y_array); |
|
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 if (y_read_regs == NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6148 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6149 if (flags & REG_PREVIOUS) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6150 y_previous = y_ptr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6151 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
|
6152 execreg_lastc = get_register_name(name); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6153 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6154 y_ptr->y_type = type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6155 y_ptr->y_width = width; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6156 y_ptr->y_size = linecount; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6157 y_ptr->y_time_set = timestamp; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6158 if (linecount == 0) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6159 y_ptr->y_array = NULL; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6160 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6161 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6162 y_ptr->y_array = |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6163 (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
|
6164 for (i = 0; i < linecount; i++) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6165 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6166 if (vp[i + 6].bv_allocated) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6167 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6168 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
|
6169 vp[i + 6].bv_string = NULL; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6170 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6171 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6172 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
|
6173 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6174 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6175 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6176 |
| 7 | 6177 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6178 write_viminfo_registers(FILE *fp) |
| 7 | 6179 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6180 int i, j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6181 char_u *type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6182 char_u c; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6183 int num_lines; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6184 int max_num_lines; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6185 int max_kbyte; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6186 long len; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6187 yankreg_T *y_ptr; |
| 7 | 6188 |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
6189 fputs(_("\n# Registers:\n"), fp); |
| 7 | 6190 |
| 6191 /* Get '<' value, use old '"' value if '<' is not found. */ | |
| 6192 max_num_lines = get_viminfo_parameter('<'); | |
| 6193 if (max_num_lines < 0) | |
| 6194 max_num_lines = get_viminfo_parameter('"'); | |
| 6195 if (max_num_lines == 0) | |
| 6196 return; | |
| 6197 max_kbyte = get_viminfo_parameter('s'); | |
| 6198 if (max_kbyte == 0) | |
| 6199 return; | |
| 1893 | 6200 |
| 7 | 6201 for (i = 0; i < NUM_REGISTERS; i++) |
| 6202 { | |
| 6203 #ifdef FEAT_CLIPBOARD | |
| 6204 /* Skip '*'/'+' register, we don't want them back next time */ | |
| 6205 if (i == STAR_REGISTER || i == PLUS_REGISTER) | |
| 6206 continue; | |
| 6207 #endif | |
| 6208 #ifdef FEAT_DND | |
| 6209 /* Neither do we want the '~' register */ | |
| 6210 if (i == TILDE_REGISTER) | |
| 6211 continue; | |
| 6212 #endif | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6213 /* 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
|
6214 * viminfo if it's newer. */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6215 if (y_read_regs != NULL |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6216 && 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
|
6217 && (y_regs[i].y_array == NULL || |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6218 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
|
6219 y_ptr = &y_read_regs[i]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6220 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
|
6221 continue; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6222 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6223 y_ptr = &y_regs[i]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6224 |
| 55 | 6225 /* Skip empty registers. */ |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6226 num_lines = y_ptr->y_size; |
| 55 | 6227 if (num_lines == 0 |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6228 || (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
|
6229 && *y_ptr->y_array[0] == NUL)) |
| 55 | 6230 continue; |
| 6231 | |
| 7 | 6232 if (max_kbyte > 0) |
| 6233 { | |
| 6234 /* Skip register if there is more text than the maximum size. */ | |
| 6235 len = 0; | |
| 6236 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
|
6237 len += (long)STRLEN(y_ptr->y_array[j]) + 1L; |
| 7 | 6238 if (len > (long)max_kbyte * 1024L) |
| 6239 continue; | |
| 6240 } | |
| 6241 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6242 switch (y_ptr->y_type) |
| 7 | 6243 { |
| 6244 case MLINE: | |
| 6245 type = (char_u *)"LINE"; | |
| 6246 break; | |
| 6247 case MCHAR: | |
| 6248 type = (char_u *)"CHAR"; | |
| 6249 break; | |
| 6250 case MBLOCK: | |
| 6251 type = (char_u *)"BLOCK"; | |
| 6252 break; | |
| 6253 default: | |
| 6254 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
|
6255 y_ptr->y_type); |
| 7 | 6256 emsg(IObuff); |
| 6257 type = (char_u *)"LINE"; | |
| 6258 break; | |
| 6259 } | |
| 6260 if (y_previous == &y_regs[i]) | |
| 6261 fprintf(fp, "\""); | |
| 6262 c = get_register_name(i); | |
| 1893 | 6263 fprintf(fp, "\"%c", c); |
| 6264 if (c == execreg_lastc) | |
| 6265 fprintf(fp, "@"); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6266 fprintf(fp, "\t%s\t%d\n", type, (int)y_ptr->y_width); |
| 7 | 6267 |
| 6268 /* If max_num_lines < 0, then we save ALL the lines in the register */ | |
| 6269 if (max_num_lines > 0 && num_lines > max_num_lines) | |
| 6270 num_lines = max_num_lines; | |
| 6271 for (j = 0; j < num_lines; j++) | |
| 6272 { | |
| 6273 putc('\t', fp); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6274 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
|
6275 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6276 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6277 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6278 int flags = 0; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6279 int remaining; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6280 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6281 /* 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
|
6282 * |{bartype},{flags},{name},{type}, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6283 * {linecount},{width},{timestamp},"line1","line2" |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6284 * 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
|
6285 * REG_EXEC - used for @@ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6286 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6287 if (y_previous == &y_regs[i]) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6288 flags |= REG_PREVIOUS; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6289 if (c == execreg_lastc) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6290 flags |= REG_EXEC; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6291 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
|
6292 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
|
6293 (long)y_ptr->y_time_set); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6294 /* 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
|
6295 remaining = LSIZE - 71; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6296 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
|
6297 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6298 putc(',', fp); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6299 --remaining; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6300 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
|
6301 remaining); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6302 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6303 putc('\n', fp); |
| 7 | 6304 } |
| 6305 } | |
| 6306 } | |
| 6307 #endif /* FEAT_VIMINFO */ | |
| 6308 | |
| 6309 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
| 6310 /* | |
| 6311 * SELECTION / PRIMARY ('*') | |
| 6312 * | |
| 6313 * Text selection stuff that uses the GUI selection register '*'. When using a | |
| 6314 * GUI this may be text from another window, otherwise it is the last text we | |
| 6315 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
| 6316 * button performs the paste, otherwise you will need to do <"*p>. " | |
| 6317 * If not under X, it is synonymous with the clipboard register '+'. | |
| 6318 * | |
| 6319 * X CLIPBOARD ('+') | |
| 6320 * | |
| 6321 * Text selection stuff that uses the GUI clipboard register '+'. | |
| 6322 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
| 6323 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
| 6324 * otherwise you will need to do <"+p>. " | |
| 6325 * If not under X, it is synonymous with the selection register '*'. | |
| 6326 */ | |
| 6327 | |
| 6328 /* | |
| 6329 * 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
|
6330 * so that the text is still available after Vim has exited. X selections |
| 7 | 6331 * only exist while the owning application exists, so we write to the |
| 6332 * permanent (while X runs) store CUT_BUFFER0. | |
| 6333 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
| 6334 * 'permanent' of the two), otherwise the PRIMARY one. | |
| 6335 * For now, use a hard-coded sanity limit of 1Mb of data. | |
| 6336 */ | |
|
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
6337 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
| 7 | 6338 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6339 x11_export_final_selection(void) |
| 7 | 6340 { |
| 6341 Display *dpy; | |
| 6342 char_u *str = NULL; | |
| 6343 long_u len = 0; | |
| 6344 int motion_type = -1; | |
| 6345 | |
| 6346 # ifdef FEAT_GUI | |
| 6347 if (gui.in_use) | |
| 6348 dpy = X_DISPLAY; | |
| 6349 else | |
| 6350 # endif | |
| 6351 # ifdef FEAT_XCLIPBOARD | |
| 6352 dpy = xterm_dpy; | |
| 6353 # else | |
| 6354 return; | |
| 6355 # endif | |
| 6356 | |
| 6357 /* Get selection to export */ | |
| 6358 if (clip_plus.owned) | |
| 6359 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
| 6360 else if (clip_star.owned) | |
| 6361 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
| 6362 | |
| 6363 /* Check it's OK */ | |
| 6364 if (dpy != NULL && str != NULL && motion_type >= 0 | |
| 6365 && len < 1024*1024 && len > 0) | |
| 6366 { | |
| 1924 | 6367 #ifdef FEAT_MBYTE |
| 4201 | 6368 int ok = TRUE; |
| 6369 | |
| 1924 | 6370 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
| 6371 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
| 6372 * encoding conversion usually doesn't work, so keep the text as-is. | |
| 6373 */ | |
| 6374 if (has_mbyte) | |
| 6375 { | |
| 6376 vimconv_T vc; | |
| 6377 | |
| 6378 vc.vc_type = CONV_NONE; | |
| 6379 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
| 6380 { | |
|
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6381 int intlen = len; |
|
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6382 char_u *conv_str; |
| 2007 | 6383 |
| 4201 | 6384 vc.vc_fail = TRUE; |
| 2007 | 6385 conv_str = string_convert(&vc, str, &intlen); |
| 6386 len = intlen; | |
| 1924 | 6387 if (conv_str != NULL) |
| 6388 { | |
| 6389 vim_free(str); | |
| 6390 str = conv_str; | |
| 6391 } | |
| 4201 | 6392 else |
| 6393 { | |
| 6394 ok = FALSE; | |
| 6395 } | |
| 1924 | 6396 convert_setup(&vc, NULL, NULL); |
| 6397 } | |
| 4201 | 6398 else |
| 6399 { | |
| 6400 ok = FALSE; | |
| 6401 } | |
| 1924 | 6402 } |
| 4201 | 6403 |
| 6404 /* Do not store the string if conversion failed. Better to use any | |
| 6405 * other selection than garbled text. */ | |
| 6406 if (ok) | |
| 6407 #endif | |
| 6408 { | |
| 6409 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
| 6410 XFlush(dpy); | |
| 6411 } | |
| 7 | 6412 } |
| 6413 | |
| 6414 vim_free(str); | |
| 6415 } | |
| 6416 #endif | |
| 6417 | |
| 6418 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6419 clip_free_selection(VimClipboard *cbd) |
| 7 | 6420 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6421 yankreg_T *y_ptr = y_current; |
| 7 | 6422 |
| 6423 if (cbd == &clip_plus) | |
| 6424 y_current = &y_regs[PLUS_REGISTER]; | |
| 6425 else | |
| 6426 y_current = &y_regs[STAR_REGISTER]; | |
| 6427 free_yank_all(); | |
| 6428 y_current->y_size = 0; | |
| 6429 y_current = y_ptr; | |
| 6430 } | |
| 6431 | |
| 6432 /* | |
| 6433 * Get the selected text and put it in the gui selection register '*' or '+'. | |
| 6434 */ | |
| 6435 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6436 clip_get_selection(VimClipboard *cbd) |
| 7 | 6437 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6438 yankreg_T *old_y_previous, *old_y_current; |
| 7 | 6439 pos_T old_cursor; |
| 6440 pos_T old_visual; | |
| 6441 int old_visual_mode; | |
| 6442 colnr_T old_curswant; | |
| 6443 int old_set_curswant; | |
| 6444 pos_T old_op_start, old_op_end; | |
| 6445 oparg_T oa; | |
| 6446 cmdarg_T ca; | |
| 6447 | |
| 6448 if (cbd->owned) | |
| 6449 { | |
| 6450 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
| 6451 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
| 6452 return; | |
| 6453 | |
| 6454 /* Get the text between clip_star.start & clip_star.end */ | |
| 6455 old_y_previous = y_previous; | |
| 6456 old_y_current = y_current; | |
| 6457 old_cursor = curwin->w_cursor; | |
| 6458 old_curswant = curwin->w_curswant; | |
| 6459 old_set_curswant = curwin->w_set_curswant; | |
| 6460 old_op_start = curbuf->b_op_start; | |
| 6461 old_op_end = curbuf->b_op_end; | |
| 6462 old_visual = VIsual; | |
| 6463 old_visual_mode = VIsual_mode; | |
| 6464 clear_oparg(&oa); | |
| 6465 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
| 6466 oa.op_type = OP_YANK; | |
| 6467 vim_memset(&ca, 0, sizeof(ca)); | |
| 6468 ca.oap = &oa; | |
| 6469 ca.cmdchar = 'y'; | |
| 6470 ca.count1 = 1; | |
| 6471 ca.retval = CA_NO_ADJ_OP_END; | |
| 6472 do_pending_operator(&ca, 0, TRUE); | |
| 6473 y_previous = old_y_previous; | |
| 6474 y_current = old_y_current; | |
| 6475 curwin->w_cursor = old_cursor; | |
| 688 | 6476 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
| 7 | 6477 curwin->w_curswant = old_curswant; |
| 6478 curwin->w_set_curswant = old_set_curswant; | |
| 6479 curbuf->b_op_start = old_op_start; | |
| 6480 curbuf->b_op_end = old_op_end; | |
| 6481 VIsual = old_visual; | |
| 6482 VIsual_mode = old_visual_mode; | |
| 6483 } | |
|
11273
96d83cd2904a
patch 8.0.0522: Win32: when 'clipboard' is "unnamed" yyp does not work
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
6484 else if (!is_clipboard_needs_update()) |
| 7 | 6485 { |
| 6486 clip_free_selection(cbd); | |
| 6487 | |
| 6488 /* Try to get selected text from another window */ | |
| 6489 clip_gen_request_selection(cbd); | |
| 6490 } | |
| 6491 } | |
| 6492 | |
| 2896 | 6493 /* |
| 6494 * Convert from the GUI selection string into the '*'/'+' register. | |
| 6495 */ | |
| 7 | 6496 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6497 clip_yank_selection( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6498 int type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6499 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6500 long len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6501 VimClipboard *cbd) |
| 7 | 6502 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6503 yankreg_T *y_ptr; |
| 7 | 6504 |
| 6505 if (cbd == &clip_plus) | |
| 6506 y_ptr = &y_regs[PLUS_REGISTER]; | |
| 6507 else | |
| 6508 y_ptr = &y_regs[STAR_REGISTER]; | |
| 6509 | |
| 6510 clip_free_selection(cbd); | |
| 6511 | |
| 5798 | 6512 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
| 7 | 6513 } |
| 6514 | |
| 6515 /* | |
| 6516 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
| 6517 * with length *len. | |
| 6518 * Returns the motion type, or -1 for failure. | |
| 6519 */ | |
| 6520 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6521 clip_convert_selection(char_u **str, long_u *len, VimClipboard *cbd) |
| 7 | 6522 { |
| 6523 char_u *p; | |
| 6524 int lnum; | |
| 6525 int i, j; | |
| 6526 int_u eolsize; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6527 yankreg_T *y_ptr; |
| 7 | 6528 |
| 6529 if (cbd == &clip_plus) | |
| 6530 y_ptr = &y_regs[PLUS_REGISTER]; | |
| 6531 else | |
| 6532 y_ptr = &y_regs[STAR_REGISTER]; | |
| 6533 | |
| 6534 #ifdef USE_CRNL | |
| 6535 eolsize = 2; | |
| 6536 #else | |
| 6537 eolsize = 1; | |
| 6538 #endif | |
| 6539 | |
| 6540 *str = NULL; | |
| 6541 *len = 0; | |
| 6542 if (y_ptr->y_array == NULL) | |
| 6543 return -1; | |
| 6544 | |
| 6545 for (i = 0; i < y_ptr->y_size; i++) | |
| 6546 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
| 6547 | |
| 6548 /* | |
| 6549 * Don't want newline character at end of last line if we're in MCHAR mode. | |
| 6550 */ | |
| 6551 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
| 6552 *len -= eolsize; | |
| 6553 | |
| 6554 p = *str = lalloc(*len + 1, TRUE); /* add one to avoid zero */ | |
| 6555 if (p == NULL) | |
| 6556 return -1; | |
| 6557 lnum = 0; | |
| 6558 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
| 6559 { | |
| 6560 if (y_ptr->y_array[lnum][j] == '\n') | |
| 6561 p[i] = NUL; | |
| 6562 else if (y_ptr->y_array[lnum][j] == NUL) | |
| 6563 { | |
| 6564 #ifdef USE_CRNL | |
| 6565 p[i++] = '\r'; | |
| 6566 #endif | |
| 6567 #ifdef USE_CR | |
| 6568 p[i] = '\r'; | |
| 6569 #else | |
| 6570 p[i] = '\n'; | |
| 6571 #endif | |
| 6572 lnum++; | |
| 6573 j = -1; | |
| 6574 } | |
| 6575 else | |
| 6576 p[i] = y_ptr->y_array[lnum][j]; | |
| 6577 } | |
| 6578 return y_ptr->y_type; | |
| 6579 } | |
| 6580 | |
| 6581 | |
| 6582 /* | |
| 6583 * If we have written to a clipboard register, send the text to the clipboard. | |
| 6584 */ | |
| 6585 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6586 may_set_selection(void) |
| 7 | 6587 { |
| 6588 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
| 6589 { | |
| 6590 clip_own_selection(&clip_star); | |
| 6591 clip_gen_set_selection(&clip_star); | |
| 6592 } | |
| 6593 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
| 6594 { | |
| 6595 clip_own_selection(&clip_plus); | |
| 6596 clip_gen_set_selection(&clip_plus); | |
| 6597 } | |
| 6598 } | |
| 6599 | |
| 6600 #endif /* FEAT_CLIPBOARD || PROTO */ | |
| 6601 | |
| 6602 | |
| 6603 #if defined(FEAT_DND) || defined(PROTO) | |
| 6604 /* | |
| 6605 * Replace the contents of the '~' register with str. | |
| 6606 */ | |
| 6607 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6608 dnd_yank_drag_data(char_u *str, long len) |
| 7 | 6609 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6610 yankreg_T *curr; |
| 7 | 6611 |
| 6612 curr = y_current; | |
| 6613 y_current = &y_regs[TILDE_REGISTER]; | |
| 6614 free_yank_all(); | |
| 5798 | 6615 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
| 7 | 6616 y_current = curr; |
| 6617 } | |
| 6618 #endif | |
| 6619 | |
| 6620 | |
| 6621 #if defined(FEAT_EVAL) || defined(PROTO) | |
| 6622 /* | |
| 6623 * Return the type of a register. | |
| 6624 * Used for getregtype() | |
| 6625 * Returns MAUTO for error. | |
| 6626 */ | |
| 6627 char_u | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6628 get_reg_type(int regname, long *reglen) |
| 7 | 6629 { |
| 6630 switch (regname) | |
| 6631 { | |
| 6632 case '%': /* file name */ | |
| 6633 case '#': /* alternate file name */ | |
| 6634 case '=': /* expression */ | |
| 6635 case ':': /* last command line */ | |
| 6636 case '/': /* last search-pattern */ | |
| 6637 case '.': /* last inserted text */ | |
| 6638 #ifdef FEAT_SEARCHPATH | |
| 6639 case Ctrl_F: /* Filename under cursor */ | |
| 6640 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
| 6641 #endif | |
| 6642 case Ctrl_W: /* word under cursor */ | |
| 6643 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
| 6644 case '_': /* black hole: always empty */ | |
| 6645 return MCHAR; | |
| 6646 } | |
| 6647 | |
| 6648 #ifdef FEAT_CLIPBOARD | |
| 6649 regname = may_get_selection(regname); | |
| 6650 #endif | |
| 6651 | |
| 5596 | 6652 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
|
6653 return MAUTO; |
| 5596 | 6654 |
| 7 | 6655 get_yank_register(regname, FALSE); |
| 6656 | |
| 6657 if (y_current->y_array != NULL) | |
| 6658 { | |
| 6659 if (reglen != NULL && y_current->y_type == MBLOCK) | |
| 6660 *reglen = y_current->y_width; | |
| 6661 return y_current->y_type; | |
| 6662 } | |
| 6663 return MAUTO; | |
| 6664 } | |
| 6665 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
6666 static char_u *getreg_wrap_one_line(char_u *s, int flags); |
| 5796 | 6667 |
| 6668 /* | |
| 6669 * When "flags" has GREG_LIST return a list with text "s". | |
| 6670 * Otherwise just return "s". | |
| 6671 */ | |
| 6672 static char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6673 getreg_wrap_one_line(char_u *s, int flags) |
| 5796 | 6674 { |
| 6675 if (flags & GREG_LIST) | |
| 6676 { | |
| 6677 list_T *list = list_alloc(); | |
| 6678 | |
| 6679 if (list != NULL) | |
| 6680 { | |
| 6681 if (list_append_string(list, NULL, -1) == FAIL) | |
| 6682 { | |
|
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6683 list_free(list); |
| 5796 | 6684 return NULL; |
| 6685 } | |
| 6686 list->lv_first->li_tv.vval.v_string = s; | |
| 6687 } | |
| 6688 return (char_u *)list; | |
| 6689 } | |
| 6690 return s; | |
| 6691 } | |
| 6692 | |
| 7 | 6693 /* |
| 6694 * Return the contents of a register as a single allocated string. | |
| 6695 * Used for "@r" in expressions and for getreg(). | |
| 6696 * Returns NULL for error. | |
| 5796 | 6697 * Flags: |
| 6698 * GREG_NO_EXPR Do not allow expression register | |
| 6699 * GREG_EXPR_SRC For the expression register: return expression itself, | |
| 6700 * not the result of its evaluation. | |
| 6701 * GREG_LIST Return a list of lines in place of a single string. | |
| 7 | 6702 */ |
| 6703 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6704 get_reg_contents(int regname, int flags) |
| 7 | 6705 { |
| 6706 long i; | |
| 6707 char_u *retval; | |
| 6708 int allocated; | |
| 6709 long len; | |
| 6710 | |
| 6711 /* Don't allow using an expression register inside an expression */ | |
| 6712 if (regname == '=') | |
| 6713 { | |
| 5796 | 6714 if (flags & GREG_NO_EXPR) |
| 6715 return NULL; | |
| 6716 if (flags & GREG_EXPR_SRC) | |
| 6717 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
| 6718 return getreg_wrap_one_line(get_expr_line(), flags); | |
| 7 | 6719 } |
| 6720 | |
| 6721 if (regname == '@') /* "@@" is used for unnamed register */ | |
| 6722 regname = '"'; | |
| 6723 | |
| 6724 /* check for valid regname */ | |
| 6725 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
| 6726 return NULL; | |
| 6727 | |
| 6728 #ifdef FEAT_CLIPBOARD | |
| 6729 regname = may_get_selection(regname); | |
| 6730 #endif | |
| 6731 | |
| 6732 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
| 6733 { | |
| 6734 if (retval == NULL) | |
| 6735 return NULL; | |
| 5796 | 6736 if (allocated) |
| 6737 return getreg_wrap_one_line(retval, flags); | |
| 6738 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
| 7 | 6739 } |
| 6740 | |
| 6741 get_yank_register(regname, FALSE); | |
| 6742 if (y_current->y_array == NULL) | |
| 6743 return NULL; | |
| 6744 | |
| 5796 | 6745 if (flags & GREG_LIST) |
| 6746 { | |
| 6747 list_T *list = list_alloc(); | |
| 6748 int error = FALSE; | |
| 6749 | |
| 6750 if (list == NULL) | |
| 6751 return NULL; | |
| 6752 for (i = 0; i < y_current->y_size; ++i) | |
| 6753 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
| 6754 error = TRUE; | |
| 6755 if (error) | |
| 6756 { | |
|
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6757 list_free(list); |
| 5796 | 6758 return NULL; |
| 6759 } | |
| 6760 return (char_u *)list; | |
| 6761 } | |
| 6762 | |
| 7 | 6763 /* |
| 6764 * Compute length of resulting string. | |
| 6765 */ | |
| 6766 len = 0; | |
| 6767 for (i = 0; i < y_current->y_size; ++i) | |
| 6768 { | |
| 6769 len += (long)STRLEN(y_current->y_array[i]); | |
| 6770 /* | |
| 6771 * Insert a newline between lines and after last line if | |
| 6772 * y_type is MLINE. | |
| 6773 */ | |
| 6774 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 6775 ++len; | |
| 6776 } | |
| 6777 | |
| 6778 retval = lalloc(len + 1, TRUE); | |
| 6779 | |
| 6780 /* | |
| 6781 * Copy the lines of the yank register into the string. | |
| 6782 */ | |
| 6783 if (retval != NULL) | |
| 6784 { | |
| 6785 len = 0; | |
| 6786 for (i = 0; i < y_current->y_size; ++i) | |
| 6787 { | |
| 6788 STRCPY(retval + len, y_current->y_array[i]); | |
| 6789 len += (long)STRLEN(retval + len); | |
| 6790 | |
| 6791 /* | |
| 6792 * Insert a NL between lines and after the last line if y_type is | |
| 6793 * MLINE. | |
| 6794 */ | |
| 6795 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 6796 retval[len++] = '\n'; | |
| 6797 } | |
| 6798 retval[len] = NUL; | |
| 6799 } | |
| 6800 | |
| 6801 return retval; | |
| 6802 } | |
| 6803 | |
| 5798 | 6804 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6805 init_write_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6806 int name, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6807 yankreg_T **old_y_previous, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6808 yankreg_T **old_y_current, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6809 int must_append, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6810 int *yank_type UNUSED) |
| 5798 | 6811 { |
| 6812 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
| 6813 { | |
| 6814 emsg_invreg(name); | |
| 6815 return FAIL; | |
| 6816 } | |
| 6817 | |
| 6818 /* Don't want to change the current (unnamed) register */ | |
| 6819 *old_y_previous = y_previous; | |
| 6820 *old_y_current = y_current; | |
| 6821 | |
| 6822 get_yank_register(name, TRUE); | |
| 6823 if (!y_append && !must_append) | |
| 6824 free_yank_all(); | |
| 6825 return OK; | |
| 6826 } | |
| 6827 | |
| 6828 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6829 finish_write_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6830 int name, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6831 yankreg_T *old_y_previous, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6832 yankreg_T *old_y_current) |
| 5798 | 6833 { |
| 6834 # ifdef FEAT_CLIPBOARD | |
| 6835 /* Send text of clipboard register to the clipboard. */ | |
| 6836 may_set_selection(); | |
| 6837 # endif | |
| 6838 | |
| 6839 /* ':let @" = "val"' should change the meaning of the "" register */ | |
| 6840 if (name != '"') | |
| 6841 y_previous = old_y_previous; | |
| 6842 y_current = old_y_current; | |
| 6843 } | |
| 6844 | |
| 7 | 6845 /* |
| 6846 * Store string "str" in register "name". | |
| 6847 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
| 6848 * If "must_append" is TRUE, always append to the register. Otherwise append | |
| 6849 * if "name" is an uppercase letter. | |
| 6850 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
| 6851 * Careful: 'str' is modified, you may have to use a copy! | |
| 6852 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
| 6853 */ | |
| 6854 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6855 write_reg_contents( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6856 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6857 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6858 int maxlen, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6859 int must_append) |
| 7 | 6860 { |
| 6861 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
| 6862 } | |
| 6863 | |
| 6864 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6865 write_reg_contents_lst( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6866 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6867 char_u **strings, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6868 int maxlen UNUSED, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6869 int must_append, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6870 int yank_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6871 long block_len) |
| 5798 | 6872 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6873 yankreg_T *old_y_previous, *old_y_current; |
| 5798 | 6874 |
| 6875 if (name == '/' | |
| 6876 #ifdef FEAT_EVAL | |
| 6877 || name == '=' | |
| 6878 #endif | |
| 6879 ) | |
| 6880 { | |
| 6881 char_u *s; | |
| 6882 | |
| 6883 if (strings[0] == NULL) | |
| 6884 s = (char_u *)""; | |
| 6885 else if (strings[1] != NULL) | |
| 6886 { | |
| 6887 EMSG(_("E883: search pattern and expression register may not " | |
| 6888 "contain two or more lines")); | |
| 6889 return; | |
| 6890 } | |
| 6891 else | |
| 6892 s = strings[0]; | |
| 6893 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
| 6894 return; | |
| 6895 } | |
| 6896 | |
| 6897 if (name == '_') /* black hole: nothing to do */ | |
| 6898 return; | |
| 6899 | |
| 6900 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
| 6901 &yank_type) == FAIL) | |
| 6902 return; | |
| 6903 | |
| 6904 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
| 6905 | |
| 6906 finish_write_reg(name, old_y_previous, old_y_current); | |
| 6907 } | |
| 6908 | |
| 6909 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6910 write_reg_contents_ex( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6911 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6912 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6913 int maxlen, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6914 int must_append, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6915 int yank_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6916 long block_len) |
| 7 | 6917 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6918 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
|
6919 long len; |
| 7 | 6920 |
| 336 | 6921 if (maxlen >= 0) |
| 6922 len = maxlen; | |
| 6923 else | |
| 6924 len = (long)STRLEN(str); | |
| 6925 | |
| 7 | 6926 /* Special case: '/' search pattern */ |
| 6927 if (name == '/') | |
| 6928 { | |
| 6929 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
| 6930 return; | |
| 6931 } | |
| 6932 | |
| 6557 | 6933 if (name == '#') |
| 6934 { | |
| 6935 buf_T *buf; | |
| 6936 | |
| 6937 if (VIM_ISDIGIT(*str)) | |
| 6938 { | |
| 6939 int num = atoi((char *)str); | |
| 6940 | |
| 6941 buf = buflist_findnr(num); | |
| 6942 if (buf == NULL) | |
| 6943 EMSGN(_(e_nobufnr), (long)num); | |
| 6944 } | |
| 6945 else | |
| 6946 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
| 6947 TRUE, FALSE, FALSE)); | |
| 6948 if (buf == NULL) | |
| 6949 return; | |
| 6950 curwin->w_alt_fnum = buf->b_fnum; | |
| 6951 return; | |
| 6952 } | |
| 6953 | |
| 336 | 6954 #ifdef FEAT_EVAL |
| 6955 if (name == '=') | |
| 6956 { | |
| 6957 char_u *p, *s; | |
| 6958 | |
| 6959 p = vim_strnsave(str, (int)len); | |
| 6960 if (p == NULL) | |
| 6961 return; | |
| 6962 if (must_append) | |
| 6963 { | |
| 6964 s = concat_str(get_expr_line_src(), p); | |
| 6965 vim_free(p); | |
| 6966 p = s; | |
| 6967 } | |
| 6968 set_expr_line(p); | |
| 6969 return; | |
| 6970 } | |
| 6971 #endif | |
| 6972 | |
| 7 | 6973 if (name == '_') /* black hole: nothing to do */ |
| 6974 return; | |
| 6975 | |
| 5798 | 6976 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
| 6977 &yank_type) == FAIL) | |
| 6978 return; | |
| 6979 | |
| 6980 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
| 6981 | |
| 6982 finish_write_reg(name, old_y_previous, old_y_current); | |
| 7 | 6983 } |
| 6984 #endif /* FEAT_EVAL */ | |
| 6985 | |
| 6986 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
| 6987 /* | |
| 6988 * Put a string into a register. When the register is not empty, the string | |
| 6989 * is appended. | |
| 6990 */ | |
| 6991 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6992 str_to_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6993 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
|
6994 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
|
6995 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
|
6996 long len, /* length of string */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6997 long blocklen, /* width of Visual block */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6998 int str_list) /* TRUE if str is char_u ** */ |
| 7 | 6999 { |
| 2896 | 7000 int type; /* MCHAR, MLINE or MBLOCK */ |
| 7 | 7001 int lnum; |
| 7002 long start; | |
| 7003 long i; | |
| 7004 int extra; | |
| 7005 int newlines; /* number of lines added */ | |
| 7006 int extraline = 0; /* extra line at the end */ | |
| 7007 int append = FALSE; /* append to last line in register */ | |
| 7008 char_u *s; | |
| 5798 | 7009 char_u **ss; |
| 7 | 7010 char_u **pp; |
| 7011 long maxlen; | |
| 7012 | |
| 2000 | 7013 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
| 7 | 7014 y_ptr->y_size = 0; |
| 7015 | |
| 2896 | 7016 if (yank_type == MAUTO) |
| 5798 | 7017 type = ((str_list || (len > 0 && (str[len - 1] == NL |
| 7018 || str[len - 1] == CAR))) | |
| 2896 | 7019 ? MLINE : MCHAR); |
| 7020 else | |
| 7021 type = yank_type; | |
| 7022 | |
| 7 | 7023 /* |
| 7024 * Count the number of lines within the string | |
| 7025 */ | |
| 7026 newlines = 0; | |
| 5798 | 7027 if (str_list) |
| 7028 { | |
| 7029 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
| 7 | 7030 ++newlines; |
| 5798 | 7031 } |
| 7032 else | |
| 7033 { | |
| 7034 for (i = 0; i < len; i++) | |
| 7035 if (str[i] == '\n') | |
| 7036 ++newlines; | |
| 7037 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
| 7038 { | |
| 7039 extraline = 1; | |
| 7040 ++newlines; /* count extra newline at the end */ | |
| 7041 } | |
| 7042 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
| 7043 { | |
| 7044 append = TRUE; | |
| 7045 --newlines; /* uncount newline when appending first line */ | |
| 7046 } | |
| 7 | 7047 } |
| 7048 | |
| 6807 | 7049 /* Without any lines make the register empty. */ |
| 7050 if (y_ptr->y_size + newlines == 0) | |
| 7051 { | |
| 7052 vim_free(y_ptr->y_array); | |
| 7053 y_ptr->y_array = NULL; | |
| 7054 return; | |
| 7055 } | |
| 7056 | |
| 7 | 7057 /* |
| 7058 * Allocate an array to hold the pointers to the new register lines. | |
| 7059 * If the register was not empty, move the existing lines to the new array. | |
| 7060 */ | |
| 7061 pp = (char_u **)lalloc_clear((y_ptr->y_size + newlines) | |
| 7062 * sizeof(char_u *), TRUE); | |
| 7063 if (pp == NULL) /* out of memory */ | |
| 7064 return; | |
| 7065 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
| 7066 pp[lnum] = y_ptr->y_array[lnum]; | |
| 7067 vim_free(y_ptr->y_array); | |
| 7068 y_ptr->y_array = pp; | |
| 7069 maxlen = 0; | |
| 7070 | |
| 7071 /* | |
| 7072 * Find the end of each line and save it into the array. | |
| 7073 */ | |
| 5798 | 7074 if (str_list) |
| 7075 { | |
| 7076 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
| 7 | 7077 { |
| 5856 | 7078 i = (long)STRLEN(*ss); |
| 5798 | 7079 pp[lnum] = vim_strnsave(*ss, i); |
| 7080 if (i > maxlen) | |
| 7081 maxlen = i; | |
| 7 | 7082 } |
| 5798 | 7083 } |
| 7084 else | |
| 7085 { | |
| 7086 for (start = 0; start < len + extraline; start += i + 1) | |
| 7 | 7087 { |
| 5798 | 7088 for (i = start; i < len; ++i) /* find the end of the line */ |
| 7089 if (str[i] == '\n') | |
| 7090 break; | |
| 7091 i -= start; /* i is now length of line */ | |
| 7092 if (i > maxlen) | |
| 7093 maxlen = i; | |
| 7094 if (append) | |
| 7095 { | |
| 7096 --lnum; | |
| 7097 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
| 7098 } | |
| 7099 else | |
| 7100 extra = 0; | |
| 7101 s = alloc((unsigned)(i + extra + 1)); | |
| 7102 if (s == NULL) | |
| 7103 break; | |
| 7104 if (extra) | |
| 7105 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
| 7106 if (append) | |
| 7107 vim_free(y_ptr->y_array[lnum]); | |
| 7108 if (i) | |
| 7109 mch_memmove(s + extra, str + start, (size_t)i); | |
| 7110 extra += i; | |
| 7111 s[extra] = NUL; | |
| 7112 y_ptr->y_array[lnum++] = s; | |
| 7113 while (--extra >= 0) | |
| 7114 { | |
| 7115 if (*s == NUL) | |
| 7116 *s = '\n'; /* replace NUL with newline */ | |
| 7117 ++s; | |
| 7118 } | |
| 7119 append = FALSE; /* only first line is appended */ | |
| 7 | 7120 } |
| 7121 } | |
| 7122 y_ptr->y_type = type; | |
| 7123 y_ptr->y_size = lnum; | |
| 7124 if (type == MBLOCK) | |
| 7125 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
| 7126 else | |
| 7127 y_ptr->y_width = 0; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7128 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7129 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
|
7130 #endif |
| 7 | 7131 } |
| 7132 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
| 7133 | |
| 7134 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7135 clear_oparg(oparg_T *oap) |
| 7 | 7136 { |
| 7137 vim_memset(oap, 0, sizeof(oparg_T)); | |
| 7138 } | |
| 7139 | |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7140 static varnumber_T line_count_info(char_u *line, varnumber_T *wc, varnumber_T *cc, varnumber_T limit, int eol_size); |
| 7 | 7141 |
| 7142 /* | |
| 161 | 7143 * Count the number of bytes, characters and "words" in a line. |
| 7 | 7144 * |
| 7145 * "Words" are counted by looking for boundaries between non-space and | |
| 7146 * space characters. (it seems to produce results that match 'wc'.) | |
| 7147 * | |
| 161 | 7148 * Return value is byte count; word count for the line is added to "*wc". |
| 7149 * Char count is added to "*cc". | |
| 7 | 7150 * |
| 7151 * The function will only examine the first "limit" characters in the | |
| 7152 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
| 7153 * case, eol_size will be added to the character count to account for | |
| 7154 * the size of the EOL character. | |
| 7155 */ | |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7156 static varnumber_T |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7157 line_count_info( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7158 char_u *line, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7159 varnumber_T *wc, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7160 varnumber_T *cc, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7161 varnumber_T limit, |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7162 int eol_size) |
| 7 | 7163 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7164 varnumber_T i; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7165 varnumber_T words = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7166 varnumber_T chars = 0; |
| 7 | 7167 int is_word = 0; |
| 7168 | |
| 3626 | 7169 for (i = 0; i < limit && line[i] != NUL; ) |
| 7 | 7170 { |
| 7171 if (is_word) | |
| 7172 { | |
| 7173 if (vim_isspace(line[i])) | |
| 7174 { | |
| 7175 words++; | |
| 7176 is_word = 0; | |
| 7177 } | |
| 7178 } | |
| 7179 else if (!vim_isspace(line[i])) | |
| 7180 is_word = 1; | |
| 161 | 7181 ++chars; |
| 7182 #ifdef FEAT_MBYTE | |
| 474 | 7183 i += (*mb_ptr2len)(line + i); |
| 161 | 7184 #else |
| 7185 ++i; | |
| 7186 #endif | |
| 7 | 7187 } |
| 7188 | |
| 7189 if (is_word) | |
| 7190 words++; | |
| 7191 *wc += words; | |
| 7192 | |
| 7193 /* Add eol_size if the end of line was reached before hitting limit. */ | |
| 2996 | 7194 if (i < limit && line[i] == NUL) |
| 161 | 7195 { |
| 7 | 7196 i += eol_size; |
| 161 | 7197 chars += eol_size; |
| 7198 } | |
| 7199 *cc += chars; | |
| 7 | 7200 return i; |
| 7201 } | |
| 7202 | |
| 7203 /* | |
| 7204 * Give some info about the position of the cursor (for "g CTRL-G"). | |
| 7205 * In Visual mode, give some info about the selected region. (In this case, | |
| 7206 * 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
|
7207 * When "dict" is not NULL store the info there instead of showing it. |
| 7 | 7208 */ |
| 7209 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7210 cursor_pos_info(dict_T *dict) |
| 7 | 7211 { |
| 7212 char_u *p; | |
| 274 | 7213 char_u buf1[50]; |
| 7214 char_u buf2[40]; | |
| 7 | 7215 linenr_T lnum; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7216 varnumber_T byte_count = 0; |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7217 #ifdef FEAT_MBYTE |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7218 varnumber_T bom_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7219 #endif |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7220 varnumber_T byte_count_cursor = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7221 varnumber_T char_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7222 varnumber_T char_count_cursor = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7223 varnumber_T word_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7224 varnumber_T word_count_cursor = 0; |
| 7 | 7225 int eol_size; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7226 varnumber_T last_check = 100000L; |
| 7 | 7227 long line_count_selected = 0; |
| 7228 pos_T min_pos, max_pos; | |
| 7229 oparg_T oparg; | |
| 7230 struct block_def bd; | |
| 7231 | |
| 7232 /* | |
| 7233 * Compute the length of the file in characters. | |
| 7234 */ | |
| 7235 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
| 7236 { | |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7237 if (dict == NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7238 { |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7239 MSG(_(no_lines_msg)); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7240 return; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7241 } |
| 7 | 7242 } |
| 7243 else | |
| 7244 { | |
| 7245 if (get_fileformat(curbuf) == EOL_DOS) | |
| 7246 eol_size = 2; | |
| 7247 else | |
| 7248 eol_size = 1; | |
| 7249 | |
| 7250 if (VIsual_active) | |
| 7251 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
7252 if (LT_POS(VIsual, curwin->w_cursor)) |
| 7 | 7253 { |
| 7254 min_pos = VIsual; | |
| 7255 max_pos = curwin->w_cursor; | |
| 7256 } | |
| 7257 else | |
| 7258 { | |
| 7259 min_pos = curwin->w_cursor; | |
| 7260 max_pos = VIsual; | |
| 7261 } | |
| 7262 if (*p_sel == 'e' && max_pos.col > 0) | |
| 7263 --max_pos.col; | |
| 7264 | |
| 7265 if (VIsual_mode == Ctrl_V) | |
| 7266 { | |
| 1866 | 7267 #ifdef FEAT_LINEBREAK |
| 7268 char_u * saved_sbr = p_sbr; | |
| 7269 | |
| 7270 /* Make 'sbr' empty for a moment to get the correct size. */ | |
| 7271 p_sbr = empty_option; | |
| 7272 #endif | |
| 7 | 7273 oparg.is_VIsual = 1; |
| 7274 oparg.block_mode = TRUE; | |
| 7275 oparg.op_type = OP_NOP; | |
| 7276 getvcols(curwin, &min_pos, &max_pos, | |
| 688 | 7277 &oparg.start_vcol, &oparg.end_vcol); |
| 1866 | 7278 #ifdef FEAT_LINEBREAK |
| 7279 p_sbr = saved_sbr; | |
| 7280 #endif | |
| 688 | 7281 if (curwin->w_curswant == MAXCOL) |
| 7282 oparg.end_vcol = MAXCOL; | |
| 7 | 7283 /* Swap the start, end vcol if needed */ |
| 7284 if (oparg.end_vcol < oparg.start_vcol) | |
| 7285 { | |
| 7286 oparg.end_vcol += oparg.start_vcol; | |
| 7287 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
| 7288 oparg.end_vcol -= oparg.start_vcol; | |
| 7289 } | |
| 7290 } | |
| 7291 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
| 7292 } | |
| 7293 | |
| 7294 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
| 7295 { | |
| 7296 /* Check for a CTRL-C every 100000 characters. */ | |
| 161 | 7297 if (byte_count > last_check) |
| 7 | 7298 { |
| 7299 ui_breakcheck(); | |
| 7300 if (got_int) | |
| 7301 return; | |
| 161 | 7302 last_check = byte_count + 100000L; |
| 7 | 7303 } |
| 7304 | |
| 7305 /* Do extra processing for VIsual mode. */ | |
| 7306 if (VIsual_active | |
| 7307 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
| 7308 { | |
| 45 | 7309 char_u *s = NULL; |
| 7310 long len = 0L; | |
| 7311 | |
| 7 | 7312 switch (VIsual_mode) |
| 7313 { | |
| 7314 case Ctrl_V: | |
| 5735 | 7315 #ifdef FEAT_VIRTUALEDIT |
| 7 | 7316 virtual_op = virtual_active(); |
| 5735 | 7317 #endif |
| 7 | 7318 block_prep(&oparg, &bd, lnum, 0); |
| 5735 | 7319 #ifdef FEAT_VIRTUALEDIT |
| 7 | 7320 virtual_op = MAYBE; |
| 5735 | 7321 #endif |
| 45 | 7322 s = bd.textstart; |
| 7323 len = (long)bd.textlen; | |
| 7 | 7324 break; |
| 7325 case 'V': | |
| 45 | 7326 s = ml_get(lnum); |
| 7327 len = MAXCOL; | |
| 7 | 7328 break; |
| 7329 case 'v': | |
| 7330 { | |
| 7331 colnr_T start_col = (lnum == min_pos.lnum) | |
| 7332 ? min_pos.col : 0; | |
| 7333 colnr_T end_col = (lnum == max_pos.lnum) | |
| 7334 ? max_pos.col - start_col + 1 : MAXCOL; | |
| 7335 | |
| 45 | 7336 s = ml_get(lnum) + start_col; |
| 7337 len = end_col; | |
| 7 | 7338 } |
| 7339 break; | |
| 7340 } | |
| 45 | 7341 if (s != NULL) |
| 7342 { | |
| 161 | 7343 byte_count_cursor += line_count_info(s, &word_count_cursor, |
| 7344 &char_count_cursor, len, eol_size); | |
| 45 | 7345 if (lnum == curbuf->b_ml.ml_line_count |
| 7346 && !curbuf->b_p_eol | |
| 6933 | 7347 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
| 50 | 7348 && (long)STRLEN(s) < len) |
| 161 | 7349 byte_count_cursor -= eol_size; |
| 45 | 7350 } |
| 7 | 7351 } |
| 7352 else | |
| 7353 { | |
| 7354 /* In non-visual mode, check for the line the cursor is on */ | |
| 7355 if (lnum == curwin->w_cursor.lnum) | |
| 7356 { | |
| 7357 word_count_cursor += word_count; | |
| 161 | 7358 char_count_cursor += char_count; |
| 7359 byte_count_cursor = byte_count + | |
| 7360 line_count_info(ml_get(lnum), | |
| 7361 &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
|
7362 (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
|
7363 eol_size); |
| 7 | 7364 } |
| 7365 } | |
| 7366 /* Add to the running totals */ | |
| 161 | 7367 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
|
7368 &char_count, (varnumber_T)MAXCOL, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7369 eol_size); |
| 7 | 7370 } |
| 7371 | |
| 7372 /* Correction for when last line doesn't have an EOL. */ | |
| 6933 | 7373 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
| 161 | 7374 byte_count -= eol_size; |
| 7 | 7375 |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7376 if (dict == NULL) |
| 7 | 7377 { |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7378 if (VIsual_active) |
| 7 | 7379 { |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7380 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
|
7381 { |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7382 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
|
7383 &max_pos.col); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7384 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
|
7385 (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
|
7386 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7387 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7388 buf1[0] = NUL; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7389 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7390 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
|
7391 && char_count == byte_count) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7392 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7393 _("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
|
7394 buf1, line_count_selected, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7395 (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
|
7396 word_count_cursor, word_count, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7397 byte_count_cursor, byte_count); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7398 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7399 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7400 _("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
|
7401 buf1, line_count_selected, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7402 (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
|
7403 word_count_cursor, word_count, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7404 char_count_cursor, char_count, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7405 byte_count_cursor, byte_count); |
| 7 | 7406 } |
| 7407 else | |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7408 { |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7409 p = ml_get_curline(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7410 validate_virtcol(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7411 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
|
7412 (int)curwin->w_virtcol + 1); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7413 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
|
7414 linetabsize(p)); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7415 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7416 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
|
7417 && char_count == byte_count) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7418 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7419 _("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
|
7420 (char *)buf1, (char *)buf2, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7421 (long)curwin->w_cursor.lnum, |
| 7 | 7422 (long)curbuf->b_ml.ml_line_count, |
| 7423 word_count_cursor, word_count, | |
| 161 | 7424 byte_count_cursor, byte_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7425 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7426 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7427 _("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
|
7428 (char *)buf1, (char *)buf2, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7429 (long)curwin->w_cursor.lnum, |
| 161 | 7430 (long)curbuf->b_ml.ml_line_count, |
| 7431 word_count_cursor, word_count, | |
| 7432 char_count_cursor, char_count, | |
| 7433 byte_count_cursor, byte_count); | |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7434 } |
|
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 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7437 #ifdef FEAT_MBYTE |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7438 bom_count = bomb_size(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7439 if (bom_count > 0) |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7440 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
|
7441 _("(+%ld for BOM)"), bom_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7442 #endif |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7443 if (dict == NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7444 { |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7445 /* 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
|
7446 p = p_shm; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7447 p_shm = (char_u *)""; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7448 msg(IObuff); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7449 p_shm = p; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7450 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7451 } |
|
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7452 #if defined(FEAT_EVAL) |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7453 if (dict != NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7454 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7455 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
|
7456 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
|
7457 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
|
7458 # ifdef FEAT_MBYTE |
|
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7459 + bom_count |
|
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7460 # endif |
|
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7461 , NULL); |
|
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7462 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
|
7463 byte_count_cursor, NULL); |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7464 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
|
7465 char_count_cursor, NULL); |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7466 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
|
7467 word_count_cursor, NULL); |
| 7 | 7468 } |
|
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7469 #endif |
| 7 | 7470 } |