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