Mercurial > vim
annotate src/ops.c @ 16680:c263acbbd961 v8.1.1342
patch 8.1.1342: using freed memory when joining line with text property
commit https://github.com/vim/vim/commit/787880a86dbcb79cdf6e8241b1d99ac4a7acbc09
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri May 17 20:17:40 2019 +0200
patch 8.1.1342: using freed memory when joining line with text property
Problem: Using freed memory when joining line with text property.
Solution: Use already computed length.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 17 May 2019 20:30:06 +0200 |
| parents | 6f453673eb19 |
| children | 7847d281cbbf |
| 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 int is_short; /* TRUE if line is too short to fit in block */ | |
| 86 int is_MAX; /* TRUE if curswant==MAXCOL when starting */ | |
| 87 int is_oneChar; /* TRUE if block within one character */ | |
| 88 int pre_whitesp; /* screen cols of ws before block */ | |
| 89 int pre_whitesp_c; /* chars of ws before block */ | |
| 90 colnr_T end_char_vcols; /* number of vcols of post-block char */ | |
| 91 colnr_T start_char_vcols; /* number of vcols of pre-block char */ | |
| 92 }; | |
| 93 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
94 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
|
95 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
|
96 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
|
97 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
|
98 int silent); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
99 static void stuffescaped(char_u *arg, int literally); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
100 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
|
101 static void free_yank_all(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
102 static int yank_copy_line(struct block_def *bd, long y_idx); |
| 7 | 103 #ifdef FEAT_CLIPBOARD |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
104 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
|
105 static void may_set_selection(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
106 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
107 static void dis_msg(char_u *p, int skip_esc); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
108 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
|
109 static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1); |
| 7 | 110 #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
|
111 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
|
112 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
113 static int ends_in_white(linenr_T lnum); |
| 7 | 114 #ifdef FEAT_COMMENTS |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
115 static int fmt_check_par(linenr_T, int *, char_u **, int do_comments); |
| 7 | 116 #else |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
117 static int fmt_check_par(linenr_T); |
| 7 | 118 #endif |
| 119 | |
|
14019
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
120 // Flags for third item in "opchars". |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
121 #define OPF_LINES 1 // operator always works on lines |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
122 #define OPF_CHANGE 2 // operator changes text |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
123 |
| 7 | 124 /* |
| 125 * The names of operators. | |
| 126 * IMPORTANT: Index must correspond with defines in vim.h!!! | |
|
14019
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
127 * The third field holds OPF_ flags. |
| 7 | 128 */ |
| 129 static char opchars[][3] = | |
| 130 { | |
|
14019
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
131 {NUL, NUL, 0}, // OP_NOP |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
132 {'d', NUL, OPF_CHANGE}, // OP_DELETE |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
133 {'y', NUL, 0}, // OP_YANK |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
134 {'c', NUL, OPF_CHANGE}, // OP_CHANGE |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
135 {'<', NUL, OPF_LINES | OPF_CHANGE}, // OP_LSHIFT |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
136 {'>', NUL, OPF_LINES | OPF_CHANGE}, // OP_RSHIFT |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
137 {'!', NUL, OPF_LINES | OPF_CHANGE}, // OP_FILTER |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
138 {'g', '~', OPF_CHANGE}, // OP_TILDE |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
139 {'=', NUL, OPF_LINES | OPF_CHANGE}, // OP_INDENT |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
140 {'g', 'q', OPF_LINES | OPF_CHANGE}, // OP_FORMAT |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
141 {':', NUL, OPF_LINES}, // OP_COLON |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
142 {'g', 'U', OPF_CHANGE}, // OP_UPPER |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
143 {'g', 'u', OPF_CHANGE}, // OP_LOWER |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
144 {'J', NUL, OPF_LINES | OPF_CHANGE}, // DO_JOIN |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
145 {'g', 'J', OPF_LINES | OPF_CHANGE}, // DO_JOIN_NS |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
146 {'g', '?', OPF_CHANGE}, // OP_ROT13 |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
147 {'r', NUL, OPF_CHANGE}, // OP_REPLACE |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
148 {'I', NUL, OPF_CHANGE}, // OP_INSERT |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
149 {'A', NUL, OPF_CHANGE}, // OP_APPEND |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
150 {'z', 'f', OPF_LINES}, // OP_FOLD |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
151 {'z', 'o', OPF_LINES}, // OP_FOLDOPEN |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
152 {'z', 'O', OPF_LINES}, // OP_FOLDOPENREC |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
153 {'z', 'c', OPF_LINES}, // OP_FOLDCLOSE |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
154 {'z', 'C', OPF_LINES}, // OP_FOLDCLOSEREC |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
155 {'z', 'd', OPF_LINES}, // OP_FOLDDEL |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
156 {'z', 'D', OPF_LINES}, // OP_FOLDDELREC |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
157 {'g', 'w', OPF_LINES | OPF_CHANGE}, // OP_FORMAT2 |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
158 {'g', '@', OPF_CHANGE}, // OP_FUNCTION |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
159 {Ctrl_A, NUL, OPF_CHANGE}, // OP_NR_ADD |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
160 {Ctrl_X, NUL, OPF_CHANGE}, // OP_NR_SUB |
| 7 | 161 }; |
| 162 | |
| 163 /* | |
| 164 * Translate a command name into an operator type. | |
| 165 * Must only be called with a valid operator name! | |
| 166 */ | |
| 167 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
168 get_op_type(int char1, int char2) |
| 7 | 169 { |
| 170 int i; | |
| 171 | |
| 172 if (char1 == 'r') /* ignore second character */ | |
| 173 return OP_REPLACE; | |
| 174 if (char1 == '~') /* when tilde is an operator */ | |
| 175 return OP_TILDE; | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
176 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
|
177 return OP_NR_ADD; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
178 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
|
179 return OP_NR_SUB; |
| 7 | 180 for (i = 0; ; ++i) |
|
13072
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
181 { |
| 7 | 182 if (opchars[i][0] == char1 && opchars[i][1] == char2) |
| 183 break; | |
|
13072
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
184 if (i == (int)(sizeof(opchars) / sizeof(char [3]) - 1)) |
|
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
185 { |
|
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
186 internal_error("get_op_type()"); |
|
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
187 break; |
|
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
188 } |
|
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
189 } |
| 7 | 190 return i; |
| 191 } | |
| 192 | |
| 193 /* | |
| 194 * Return TRUE if operator "op" always works on whole lines. | |
| 195 */ | |
| 196 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
197 op_on_lines(int op) |
| 7 | 198 { |
|
14019
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
199 return opchars[op][2] & OPF_LINES; |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
200 } |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
201 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
202 #if defined(FEAT_JOB_CHANNEL) || defined(PROTO) |
|
14019
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
203 /* |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
204 * Return TRUE if operator "op" changes text. |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
205 */ |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
206 int |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
207 op_is_change(int op) |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
208 { |
|
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
209 return opchars[op][2] & OPF_CHANGE; |
| 7 | 210 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
211 #endif |
| 7 | 212 |
| 213 /* | |
| 214 * Get first operator command character. | |
| 215 * Returns 'g' or 'z' if there is another command character. | |
| 216 */ | |
| 217 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
218 get_op_char(int optype) |
| 7 | 219 { |
| 220 return opchars[optype][0]; | |
| 221 } | |
| 222 | |
| 223 /* | |
| 224 * Get second operator command character. | |
| 225 */ | |
| 226 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
227 get_extra_op_char(int optype) |
| 7 | 228 { |
| 229 return opchars[optype][1]; | |
| 230 } | |
| 231 | |
| 232 /* | |
| 233 * op_shift - handle a shift operation | |
| 234 */ | |
| 235 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
236 op_shift(oparg_T *oap, int curs_top, int amount) |
| 7 | 237 { |
| 238 long i; | |
| 239 int first_char; | |
| 240 int block_col = 0; | |
| 241 | |
| 242 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 243 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 244 return; | |
| 245 | |
| 246 if (oap->block_mode) | |
| 247 block_col = curwin->w_cursor.col; | |
| 248 | |
| 249 for (i = oap->line_count; --i >= 0; ) | |
| 250 { | |
| 251 first_char = *ml_get_curline(); | |
| 252 if (first_char == NUL) /* empty line */ | |
| 253 curwin->w_cursor.col = 0; | |
| 254 else if (oap->block_mode) | |
| 255 shift_block(oap, amount); | |
| 256 else | |
| 257 /* Move the line right if it doesn't start with '#', 'smartindent' | |
| 258 * isn't set or 'cindent' isn't set or '#' isn't in 'cino'. */ | |
| 259 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
| 260 if (first_char != '#' || !preprocs_left()) | |
| 261 #endif | |
| 1516 | 262 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE); |
| 7 | 263 ++curwin->w_cursor.lnum; |
| 264 } | |
| 265 | |
| 266 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
| 267 if (oap->block_mode) | |
| 268 { | |
| 269 curwin->w_cursor.lnum = oap->start.lnum; | |
| 270 curwin->w_cursor.col = block_col; | |
| 271 } | |
| 5735 | 272 else if (curs_top) /* put cursor on first line, for ">>" */ |
| 7 | 273 { |
| 274 curwin->w_cursor.lnum = oap->start.lnum; | |
| 275 beginline(BL_SOL | BL_FIX); /* shift_line() may have set cursor.col */ | |
| 276 } | |
| 277 else | |
| 278 --curwin->w_cursor.lnum; /* put cursor on last line, for ":>" */ | |
| 279 | |
|
10486
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
280 #ifdef FEAT_FOLDING |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
281 /* 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
|
282 foldOpenCursor(); |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
283 #endif |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
284 |
|
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
285 |
| 7 | 286 if (oap->line_count > p_report) |
| 287 { | |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
288 char *op; |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
289 char *msg_line_single; |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
290 char *msg_line_plural; |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
291 |
| 7 | 292 if (oap->op_type == OP_RSHIFT) |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
293 op = ">"; |
| 7 | 294 else |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
295 op = "<"; |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
296 msg_line_single = NGETTEXT("%ld line %sed %d time", |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
297 "%ld line %sed %d times", amount); |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
298 msg_line_plural = NGETTEXT("%ld lines %sed %d time", |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
299 "%ld lines %sed %d times", amount); |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
300 vim_snprintf((char *)IObuff, IOSIZE, |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
301 NGETTEXT(msg_line_single, msg_line_plural, oap->line_count), |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
302 oap->line_count, op, amount); |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
303 msg((char *)IObuff); |
| 7 | 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 /* | |
|
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
317 * Shift the current line one shiftwidth left (if left != 0) or right |
|
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
318 * leaves cursor on first blank in the line. |
| 7 | 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; | |
|
15062
3a94f7918980
patch 8.1.0542: shiftwidth() does not take 'vartabstop' into account
Bram Moolenaar <Bram@vim.org>
parents:
15048
diff
changeset
|
329 int p_sw = (int)get_sw_value_indent(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 if (State & VREPLACE_FLAG) | |
| 1516 | 363 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes); |
| 7 | 364 else |
| 1516 | 365 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0); |
| 7 | 366 } |
| 367 | |
| 368 /* | |
| 369 * Shift one line of the current block one shiftwidth right or left. | |
| 370 * Leaves cursor on first character in block. | |
| 371 */ | |
| 372 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
373 shift_block(oparg_T *oap, int amount) |
| 7 | 374 { |
| 375 int left = (oap->op_type == OP_LSHIFT); | |
| 376 int oldstate = State; | |
| 1839 | 377 int total; |
| 378 char_u *newp, *oldp; | |
| 7 | 379 int oldcol = curwin->w_cursor.col; |
|
15062
3a94f7918980
patch 8.1.0542: shiftwidth() does not take 'vartabstop' into account
Bram Moolenaar <Bram@vim.org>
parents:
15048
diff
changeset
|
380 int p_sw = (int)get_sw_value_indent(curbuf); |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
381 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
382 int *p_vts = curbuf->b_p_vts_array; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
383 #endif |
| 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 */ | |
|
11997
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
402 total = (int)((unsigned)amount * (unsigned)p_sw); |
|
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
403 if ((total / p_sw) != amount) |
|
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
404 return; /* multiplication overflow */ |
|
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
405 |
| 7 | 406 oldp = ml_get_curline(); |
| 407 | |
| 408 if (!left) | |
| 409 { | |
| 410 /* | |
| 411 * 1. Get start vcol | |
| 412 * 2. Total ws vcols | |
| 413 * 3. Divvy into TABs & spp | |
| 414 * 4. Construct new string | |
| 415 */ | |
| 416 total += bd.pre_whitesp; /* all virtual WS upto & incl a split TAB */ | |
| 417 ws_vcol = bd.start_vcol - bd.pre_whitesp; | |
| 418 if (bd.startspaces) | |
| 419 { | |
| 420 if (has_mbyte) | |
|
8399
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
421 { |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
422 if ((*mb_ptr2len)(bd.textstart) == 1) |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
423 ++bd.textstart; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
424 else |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
425 { |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
426 ws_vcol = 0; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
427 bd.startspaces = 0; |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
428 } |
|
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
429 } |
| 1995 | 430 else |
| 431 ++bd.textstart; | |
| 7 | 432 } |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
433 for ( ; VIM_ISWHITE(*bd.textstart); ) |
| 7 | 434 { |
| 5995 | 435 /* TODO: is passing bd.textstart for start of the line OK? */ |
| 436 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, | |
| 437 (colnr_T)(bd.start_vcol)); | |
| 7 | 438 total += incr; |
| 439 bd.start_vcol += incr; | |
| 440 } | |
| 441 /* OK, now total=all the VWS reqd, and textstart points at the 1st | |
| 442 * non-ws char in the block. */ | |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
443 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
444 if (!curbuf->b_p_et) |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
445 tabstop_fromto(ws_vcol, ws_vcol + total, p_ts, p_vts, &i, &j); |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
446 else |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
447 j = total; |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
448 #else |
| 7 | 449 if (!curbuf->b_p_et) |
| 450 i = ((ws_vcol % p_ts) + total) / p_ts; /* number of tabs */ | |
| 451 if (i) | |
| 452 j = ((ws_vcol % p_ts) + total) % p_ts; /* number of spp */ | |
| 453 else | |
| 454 j = total; | |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
455 #endif |
| 7 | 456 /* if we're splitting a TAB, allow for it */ |
| 457 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0); | |
| 458 len = (int)STRLEN(bd.textstart) + 1; | |
| 459 newp = alloc_check((unsigned)(bd.textcol + i + j + len)); | |
| 460 if (newp == NULL) | |
| 461 return; | |
| 462 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len)); | |
| 463 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 6929 | 464 vim_memset(newp + bd.textcol, TAB, (size_t)i); |
| 465 vim_memset(newp + bd.textcol + i, ' ', (size_t)j); | |
| 7 | 466 /* the end */ |
| 467 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len); | |
| 468 } | |
| 469 else /* left */ | |
| 470 { | |
| 1839 | 471 colnr_T destination_col; /* column to which text in block will |
| 472 be shifted */ | |
| 473 char_u *verbatim_copy_end; /* end of the part of the line which is | |
| 474 copied verbatim */ | |
| 475 colnr_T verbatim_copy_width;/* the (displayed) width of this part | |
| 476 of line */ | |
| 477 unsigned fill; /* nr of spaces that replace a TAB */ | |
| 478 unsigned new_line_len; /* the length of the line after the | |
| 479 block shift */ | |
| 480 size_t block_space_width; | |
| 481 size_t shift_amount; | |
| 482 char_u *non_white = bd.textstart; | |
| 483 colnr_T non_white_col; | |
| 484 | |
| 485 /* | |
| 486 * Firstly, let's find the first non-whitespace character that is | |
| 487 * displayed after the block's start column and the character's column | |
| 488 * number. Also, let's calculate the width of all the whitespace | |
| 489 * characters that are displayed in the block and precede the searched | |
| 490 * non-whitespace character. | |
| 491 */ | |
| 492 | |
| 493 /* If "bd.startspaces" is set, "bd.textstart" points to the character, | |
| 494 * the part of which is displayed at the block's beginning. Let's start | |
| 495 * searching from the next character. */ | |
| 496 if (bd.startspaces) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
497 MB_PTR_ADV(non_white); |
| 1839 | 498 |
| 499 /* The character's column is in "bd.start_vcol". */ | |
| 500 non_white_col = bd.start_vcol; | |
| 501 | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
502 while (VIM_ISWHITE(*non_white)) |
| 7 | 503 { |
| 5995 | 504 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col); |
| 1839 | 505 non_white_col += incr; |
| 7 | 506 } |
| 1839 | 507 |
| 508 block_space_width = non_white_col - oap->start_vcol; | |
| 509 /* We will shift by "total" or "block_space_width", whichever is less. | |
| 510 */ | |
| 1860 | 511 shift_amount = (block_space_width < (size_t)total |
| 512 ? block_space_width : (size_t)total); | |
| 1839 | 513 |
| 514 /* The column to which we will shift the text. */ | |
| 1860 | 515 destination_col = (colnr_T)(non_white_col - shift_amount); |
| 1839 | 516 |
| 517 /* Now let's find out how much of the beginning of the line we can | |
| 518 * reuse without modification. */ | |
| 519 verbatim_copy_end = bd.textstart; | |
| 520 verbatim_copy_width = bd.start_vcol; | |
| 521 | |
| 522 /* If "bd.startspaces" is set, "bd.textstart" points to the character | |
| 523 * preceding the block. We have to subtract its width to obtain its | |
| 524 * column number. */ | |
| 525 if (bd.startspaces) | |
| 526 verbatim_copy_width -= bd.start_char_vcols; | |
| 527 while (verbatim_copy_width < destination_col) | |
| 7 | 528 { |
| 5995 | 529 char_u *line = verbatim_copy_end; |
| 530 | |
| 531 /* TODO: is passing verbatim_copy_end for start of the line OK? */ | |
| 532 incr = lbr_chartabsize(line, verbatim_copy_end, | |
| 533 verbatim_copy_width); | |
| 1839 | 534 if (verbatim_copy_width + incr > destination_col) |
| 535 break; | |
| 536 verbatim_copy_width += incr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
537 MB_PTR_ADV(verbatim_copy_end); |
| 7 | 538 } |
| 539 | |
| 1839 | 540 /* If "destination_col" is different from the width of the initial |
| 541 * part of the line that will be copied, it means we encountered a tab | |
| 542 * character, which we will have to partly replace with spaces. */ | |
| 543 fill = destination_col - verbatim_copy_width; | |
| 544 | |
| 545 /* The replacement line will consist of: | |
| 546 * - the beginning of the original line up to "verbatim_copy_end", | |
| 547 * - "fill" number of spaces, | |
| 548 * - the rest of the line, pointed to by non_white. */ | |
| 549 new_line_len = (unsigned)(verbatim_copy_end - oldp) | |
| 550 + fill | |
| 551 + (unsigned)STRLEN(non_white) + 1; | |
| 552 | |
| 553 newp = alloc_check(new_line_len); | |
| 7 | 554 if (newp == NULL) |
| 555 return; | |
| 1839 | 556 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); |
| 6929 | 557 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill); |
| 1839 | 558 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); |
| 7 | 559 } |
| 560 /* replace the line */ | |
| 561 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 562 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol); | |
| 563 State = oldstate; | |
| 564 curwin->w_cursor.col = oldcol; | |
| 565 #ifdef FEAT_RIGHTLEFT | |
| 566 p_ri = old_p_ri; | |
| 567 #endif | |
| 568 } | |
|
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
569 |
| 7 | 570 /* |
| 571 * Insert string "s" (b_insert ? before : after) block :AKelly | |
| 572 * Caller must prepare for undo. | |
| 573 */ | |
| 574 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
575 block_insert( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
576 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
577 char_u *s, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
578 int b_insert, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
579 struct block_def *bdp) |
| 7 | 580 { |
| 581 int p_ts; | |
| 582 int count = 0; /* extra spaces to replace a cut TAB */ | |
| 583 int spaces = 0; /* non-zero if cutting a TAB */ | |
| 584 colnr_T offset; /* pointer along new line */ | |
| 585 unsigned s_len; /* STRLEN(s) */ | |
| 586 char_u *newp, *oldp; /* new, old lines */ | |
| 587 linenr_T lnum; /* loop var */ | |
| 588 int oldstate = State; | |
| 589 | |
| 590 State = INSERT; /* don't want REPLACE for State */ | |
| 591 s_len = (unsigned)STRLEN(s); | |
| 592 | |
| 593 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) | |
| 594 { | |
| 595 block_prep(oap, bdp, lnum, TRUE); | |
| 596 if (bdp->is_short && b_insert) | |
| 597 continue; /* OP_INSERT, line ends before block start */ | |
| 598 | |
| 599 oldp = ml_get(lnum); | |
| 600 | |
| 601 if (b_insert) | |
| 602 { | |
| 603 p_ts = bdp->start_char_vcols; | |
| 604 spaces = bdp->startspaces; | |
| 605 if (spaces != 0) | |
| 606 count = p_ts - 1; /* we're cutting a TAB */ | |
| 607 offset = bdp->textcol; | |
| 608 } | |
| 609 else /* append */ | |
| 610 { | |
| 611 p_ts = bdp->end_char_vcols; | |
| 612 if (!bdp->is_short) /* spaces = padding after block */ | |
| 613 { | |
| 614 spaces = (bdp->endspaces ? p_ts - bdp->endspaces : 0); | |
| 615 if (spaces != 0) | |
| 616 count = p_ts - 1; /* we're cutting a TAB */ | |
| 617 offset = bdp->textcol + bdp->textlen - (spaces != 0); | |
| 618 } | |
| 619 else /* spaces = padding to block edge */ | |
| 620 { | |
| 621 /* if $ used, just append to EOL (ie spaces==0) */ | |
| 622 if (!bdp->is_MAX) | |
| 623 spaces = (oap->end_vcol - bdp->end_vcol) + 1; | |
| 624 count = spaces; | |
| 625 offset = bdp->textcol + bdp->textlen; | |
| 626 } | |
| 627 } | |
| 628 | |
| 6140 | 629 if (has_mbyte && spaces > 0) |
| 630 { | |
| 6460 | 631 int off; |
| 632 | |
| 6140 | 633 /* Avoid starting halfway a multi-byte character. */ |
| 634 if (b_insert) | |
| 635 { | |
| 6460 | 636 off = (*mb_head_off)(oldp, oldp + offset + spaces); |
| 6140 | 637 } |
| 638 else | |
| 639 { | |
| 6460 | 640 off = (*mb_off_next)(oldp, oldp + offset); |
| 6140 | 641 offset += off; |
| 642 } | |
| 6460 | 643 spaces -= off; |
| 644 count -= off; | |
| 6140 | 645 } |
| 646 | |
| 7 | 647 newp = alloc_check((unsigned)(STRLEN(oldp)) + s_len + count + 1); |
| 648 if (newp == NULL) | |
| 649 continue; | |
| 650 | |
| 651 /* copy up to shifted part */ | |
| 652 mch_memmove(newp, oldp, (size_t)(offset)); | |
| 653 oldp += offset; | |
| 654 | |
| 655 /* insert pre-padding */ | |
| 6929 | 656 vim_memset(newp + offset, ' ', (size_t)spaces); |
| 7 | 657 |
| 658 /* copy the new text */ | |
| 659 mch_memmove(newp + offset + spaces, s, (size_t)s_len); | |
| 660 offset += s_len; | |
| 661 | |
| 662 if (spaces && !bdp->is_short) | |
| 663 { | |
| 664 /* insert post-padding */ | |
| 6929 | 665 vim_memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces)); |
| 7 | 666 /* We're splitting a TAB, don't copy it. */ |
| 667 oldp++; | |
| 668 /* We allowed for that TAB, remember this now */ | |
| 669 count++; | |
| 670 } | |
| 671 | |
| 672 if (spaces > 0) | |
| 673 offset += count; | |
| 1622 | 674 STRMOVE(newp + offset, oldp); |
| 7 | 675 |
| 676 ml_replace(lnum, newp, FALSE); | |
| 677 | |
| 678 if (lnum == oap->end.lnum) | |
| 679 { | |
| 680 /* Set "']" mark to the end of the block instead of the end of | |
| 681 * the insert in the first line. */ | |
| 682 curbuf->b_op_end.lnum = oap->end.lnum; | |
| 683 curbuf->b_op_end.col = offset; | |
| 684 } | |
| 685 } /* for all lnum */ | |
| 686 | |
| 687 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
| 688 | |
| 689 State = oldstate; | |
| 690 } | |
| 691 | |
| 692 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(PROTO) | |
| 693 /* | |
| 694 * op_reindent - handle reindenting a block of lines. | |
| 695 */ | |
| 696 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
697 op_reindent(oparg_T *oap, int (*how)(void)) |
| 7 | 698 { |
| 699 long i; | |
| 700 char_u *l; | |
| 6971 | 701 int amount; |
| 7 | 702 linenr_T first_changed = 0; |
| 703 linenr_T last_changed = 0; | |
| 704 linenr_T start_lnum = curwin->w_cursor.lnum; | |
| 705 | |
| 216 | 706 /* Don't even try when 'modifiable' is off. */ |
| 707 if (!curbuf->b_p_ma) | |
| 708 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
709 emsg(_(e_modifiable)); |
| 216 | 710 return; |
| 711 } | |
| 712 | |
| 7 | 713 for (i = oap->line_count; --i >= 0 && !got_int; ) |
| 714 { | |
| 715 /* it's a slow thing to do, so give feedback so there's no worry that | |
| 716 * the computer's just hung. */ | |
| 717 | |
| 718 if (i > 1 | |
| 719 && (i % 50 == 0 || i == oap->line_count - 1) | |
| 720 && oap->line_count > p_report) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
721 smsg(_("%ld lines to indent... "), i); |
| 7 | 722 |
| 723 /* | |
| 724 * Be vi-compatible: For lisp indenting the first line is not | |
| 725 * indented, unless there is only one line. | |
| 726 */ | |
| 727 #ifdef FEAT_LISP | |
| 728 if (i != oap->line_count - 1 || oap->line_count == 1 | |
| 729 || how != get_lisp_indent) | |
| 730 #endif | |
| 731 { | |
| 732 l = skipwhite(ml_get_curline()); | |
| 733 if (*l == NUL) /* empty or blank line */ | |
| 6971 | 734 amount = 0; |
| 7 | 735 else |
| 6971 | 736 amount = how(); /* get the indent for this line */ |
| 737 | |
| 738 if (amount >= 0 && set_indent(amount, SIN_UNDO)) | |
| 7 | 739 { |
| 740 /* did change the indent, call changed_lines() later */ | |
| 741 if (first_changed == 0) | |
| 742 first_changed = curwin->w_cursor.lnum; | |
| 743 last_changed = curwin->w_cursor.lnum; | |
| 744 } | |
| 745 } | |
| 746 ++curwin->w_cursor.lnum; | |
| 1550 | 747 curwin->w_cursor.col = 0; /* make sure it's valid */ |
| 7 | 748 } |
| 749 | |
| 750 /* put cursor on first non-blank of indented line */ | |
| 751 curwin->w_cursor.lnum = start_lnum; | |
| 752 beginline(BL_SOL | BL_FIX); | |
| 753 | |
| 754 /* Mark changed lines so that they will be redrawn. When Visual | |
| 755 * highlighting was present, need to continue until the last line. When | |
| 756 * there is no change still need to remove the Visual highlighting. */ | |
| 757 if (last_changed != 0) | |
| 758 changed_lines(first_changed, 0, | |
| 759 oap->is_VIsual ? start_lnum + oap->line_count : | |
| 760 last_changed + 1, 0L); | |
| 761 else if (oap->is_VIsual) | |
| 762 redraw_curbuf_later(INVERTED); | |
| 763 | |
| 764 if (oap->line_count > p_report) | |
| 765 { | |
| 766 i = oap->line_count - (i + 1); | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
767 smsg(NGETTEXT("%ld line indented ", |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
768 "%ld lines indented ", i), i); |
| 7 | 769 } |
| 770 /* set '[ and '] marks */ | |
| 771 curbuf->b_op_start = oap->start; | |
| 772 curbuf->b_op_end = oap->end; | |
| 773 } | |
| 774 #endif /* defined(FEAT_LISP) || defined(FEAT_CINDENT) */ | |
| 775 | |
| 776 #if defined(FEAT_EVAL) || defined(PROTO) | |
| 777 /* | |
| 778 * Keep the last expression line here, for repeating. | |
| 779 */ | |
| 780 static char_u *expr_line = NULL; | |
| 781 | |
| 782 /* | |
| 783 * Get an expression for the "\"=expr1" or "CTRL-R =expr1" | |
| 784 * Returns '=' when OK, NUL otherwise. | |
| 785 */ | |
| 786 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
787 get_expr_register(void) |
| 7 | 788 { |
| 789 char_u *new_line; | |
| 790 | |
| 791 new_line = getcmdline('=', 0L, 0); | |
| 792 if (new_line == NULL) | |
| 793 return NUL; | |
| 794 if (*new_line == NUL) /* use previous line */ | |
| 795 vim_free(new_line); | |
| 796 else | |
| 797 set_expr_line(new_line); | |
| 798 return '='; | |
| 799 } | |
| 800 | |
| 801 /* | |
| 802 * Set the expression for the '=' register. | |
| 803 * Argument must be an allocated string. | |
| 804 */ | |
| 805 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
806 set_expr_line(char_u *new_line) |
| 7 | 807 { |
| 808 vim_free(expr_line); | |
| 809 expr_line = new_line; | |
| 810 } | |
| 811 | |
| 812 /* | |
| 813 * Get the result of the '=' register expression. | |
| 814 * Returns a pointer to allocated memory, or NULL for failure. | |
| 815 */ | |
| 816 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
817 get_expr_line(void) |
| 7 | 818 { |
| 819 char_u *expr_copy; | |
| 820 char_u *rv; | |
| 994 | 821 static int nested = 0; |
| 7 | 822 |
| 823 if (expr_line == NULL) | |
| 824 return NULL; | |
| 825 | |
| 826 /* Make a copy of the expression, because evaluating it may cause it to be | |
| 827 * changed. */ | |
| 828 expr_copy = vim_strsave(expr_line); | |
| 829 if (expr_copy == NULL) | |
| 830 return NULL; | |
| 831 | |
| 994 | 832 /* When we are invoked recursively limit the evaluation to 10 levels. |
| 833 * Then return the string as-is. */ | |
| 834 if (nested >= 10) | |
| 835 return expr_copy; | |
| 836 | |
| 837 ++nested; | |
| 714 | 838 rv = eval_to_string(expr_copy, NULL, TRUE); |
| 994 | 839 --nested; |
| 7 | 840 vim_free(expr_copy); |
| 841 return rv; | |
| 842 } | |
| 283 | 843 |
| 844 /* | |
| 845 * Get the '=' register expression itself, without evaluating it. | |
| 846 */ | |
| 847 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
848 get_expr_line_src(void) |
| 283 | 849 { |
| 850 if (expr_line == NULL) | |
| 851 return NULL; | |
| 852 return vim_strsave(expr_line); | |
| 853 } | |
| 7 | 854 #endif /* FEAT_EVAL */ |
| 855 | |
| 856 /* | |
| 857 * Check if 'regname' is a valid name of a yank register. | |
| 858 * Note: There is no check for 0 (default register), caller should do this | |
| 859 */ | |
| 860 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
861 valid_yank_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
862 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
863 int writing) /* if TRUE check for writable registers */ |
| 7 | 864 { |
| 865 if ( (regname > 0 && ASCII_ISALNUM(regname)) | |
| 866 || (!writing && vim_strchr((char_u *) | |
| 867 #ifdef FEAT_EVAL | |
| 6557 | 868 "/.%:=" |
| 7 | 869 #else |
| 6557 | 870 "/.%:" |
| 7 | 871 #endif |
| 872 , regname) != NULL) | |
| 6557 | 873 || regname == '#' |
| 7 | 874 || regname == '"' |
| 875 || regname == '-' | |
| 876 || regname == '_' | |
| 877 #ifdef FEAT_CLIPBOARD | |
| 878 || regname == '*' | |
| 879 || regname == '+' | |
| 880 #endif | |
| 881 #ifdef FEAT_DND | |
| 882 || (!writing && regname == '~') | |
| 883 #endif | |
| 884 ) | |
| 885 return TRUE; | |
| 886 return FALSE; | |
| 887 } | |
| 888 | |
| 889 /* | |
| 890 * Set y_current and y_append, according to the value of "regname". | |
| 891 * Cannot handle the '_' register. | |
| 140 | 892 * Must only be called with a valid register name! |
| 7 | 893 * |
| 894 * If regname is 0 and writing, use register 0 | |
| 895 * If regname is 0 and reading, use previous register | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
896 * |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
897 * Return TRUE when the register should be inserted literally (selection or |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
898 * clipboard). |
| 7 | 899 */ |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
900 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
901 get_yank_register(int regname, int writing) |
| 7 | 902 { |
| 903 int i; | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
904 int ret = FALSE; |
| 7 | 905 |
| 906 y_append = FALSE; | |
| 907 if ((regname == 0 || regname == '"') && !writing && y_previous != NULL) | |
| 908 { | |
| 909 y_current = y_previous; | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
910 return ret; |
| 7 | 911 } |
| 912 i = regname; | |
| 913 if (VIM_ISDIGIT(i)) | |
| 914 i -= '0'; | |
| 915 else if (ASCII_ISLOWER(i)) | |
| 916 i = CharOrdLow(i) + 10; | |
| 917 else if (ASCII_ISUPPER(i)) | |
| 918 { | |
| 919 i = CharOrdUp(i) + 10; | |
| 920 y_append = TRUE; | |
| 921 } | |
| 922 else if (regname == '-') | |
| 923 i = DELETION_REGISTER; | |
| 924 #ifdef FEAT_CLIPBOARD | |
| 925 /* When selection is not available, use register 0 instead of '*' */ | |
| 926 else if (clip_star.available && regname == '*') | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
927 { |
| 7 | 928 i = STAR_REGISTER; |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
929 ret = TRUE; |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
930 } |
| 7 | 931 /* When clipboard is not available, use register 0 instead of '+' */ |
| 932 else if (clip_plus.available && regname == '+') | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
933 { |
| 7 | 934 i = PLUS_REGISTER; |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
935 ret = TRUE; |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
936 } |
| 7 | 937 #endif |
| 938 #ifdef FEAT_DND | |
| 939 else if (!writing && regname == '~') | |
| 940 i = TILDE_REGISTER; | |
| 941 #endif | |
| 942 else /* not 0-9, a-z, A-Z or '-': use register 0 */ | |
| 943 i = 0; | |
| 944 y_current = &(y_regs[i]); | |
| 945 if (writing) /* remember the register we write into for do_put() */ | |
| 946 y_previous = y_current; | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
947 return ret; |
| 7 | 948 } |
| 949 | |
| 15 | 950 #if defined(FEAT_CLIPBOARD) || defined(PROTO) |
| 7 | 951 /* |
| 952 * When "regname" is a clipboard register, obtain the selection. If it's not | |
| 953 * available return zero, otherwise return "regname". | |
| 954 */ | |
| 15 | 955 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
956 may_get_selection(int regname) |
| 7 | 957 { |
| 958 if (regname == '*') | |
| 959 { | |
| 960 if (!clip_star.available) | |
| 961 regname = 0; | |
| 962 else | |
| 963 clip_get_selection(&clip_star); | |
| 964 } | |
| 965 else if (regname == '+') | |
| 966 { | |
| 967 if (!clip_plus.available) | |
| 968 regname = 0; | |
| 969 else | |
| 970 clip_get_selection(&clip_plus); | |
| 971 } | |
| 972 return regname; | |
| 973 } | |
| 974 #endif | |
| 975 | |
| 976 /* | |
| 977 * Obtain the contents of a "normal" register. The register is made empty. | |
| 978 * The returned pointer has allocated memory, use put_register() later. | |
| 979 */ | |
| 980 void * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
981 get_register( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
982 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
983 int copy) /* make a copy, if FALSE make register empty. */ |
| 7 | 984 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
985 yankreg_T *reg; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
986 int i; |
| 7 | 987 |
| 988 #ifdef FEAT_CLIPBOARD | |
| 989 /* When Visual area changed, may have to update selection. Obtain the | |
| 990 * selection too. */ | |
| 1435 | 991 if (name == '*' && clip_star.available) |
| 7 | 992 { |
| 3674 | 993 if (clip_isautosel_star()) |
| 994 clip_update_selection(&clip_star); | |
| 995 may_get_selection(name); | |
| 996 } | |
| 997 if (name == '+' && clip_plus.available) | |
| 998 { | |
| 999 if (clip_isautosel_plus()) | |
| 1000 clip_update_selection(&clip_plus); | |
| 7 | 1001 may_get_selection(name); |
| 1002 } | |
| 1003 #endif | |
| 1004 | |
| 1005 get_yank_register(name, 0); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1006 reg = (yankreg_T *)alloc((unsigned)sizeof(yankreg_T)); |
| 7 | 1007 if (reg != NULL) |
| 1008 { | |
| 1009 *reg = *y_current; | |
| 1010 if (copy) | |
| 1011 { | |
| 1012 /* If we run out of memory some or all of the lines are empty. */ | |
| 1013 if (reg->y_size == 0) | |
| 1014 reg->y_array = NULL; | |
| 1015 else | |
| 1016 reg->y_array = (char_u **)alloc((unsigned)(sizeof(char_u *) | |
| 1017 * reg->y_size)); | |
| 1018 if (reg->y_array != NULL) | |
| 1019 { | |
| 1020 for (i = 0; i < reg->y_size; ++i) | |
| 1021 reg->y_array[i] = vim_strsave(y_current->y_array[i]); | |
| 1022 } | |
| 1023 } | |
| 1024 else | |
| 1025 y_current->y_array = NULL; | |
| 1026 } | |
| 1027 return (void *)reg; | |
| 1028 } | |
| 1029 | |
| 1030 /* | |
| 1451 | 1031 * Put "reg" into register "name". Free any previous contents and "reg". |
| 7 | 1032 */ |
| 1033 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1034 put_register(int name, void *reg) |
| 7 | 1035 { |
| 1036 get_yank_register(name, 0); | |
| 1037 free_yank_all(); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1038 *y_current = *(yankreg_T *)reg; |
| 1451 | 1039 vim_free(reg); |
| 7 | 1040 |
| 5735 | 1041 #ifdef FEAT_CLIPBOARD |
| 7 | 1042 /* Send text written to clipboard register to the clipboard. */ |
| 1043 may_set_selection(); | |
| 5735 | 1044 #endif |
| 7 | 1045 } |
| 4209 | 1046 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1047 #if (defined(FEAT_CLIPBOARD) && defined(FEAT_X11) && defined(USE_SYSTEM)) \ |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1048 || defined(PROTO) |
| 4209 | 1049 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1050 free_register(void *reg) |
| 4209 | 1051 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1052 yankreg_T tmp; |
| 4209 | 1053 |
| 1054 tmp = *y_current; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1055 *y_current = *(yankreg_T *)reg; |
| 4209 | 1056 free_yank_all(); |
| 1057 vim_free(reg); | |
| 1058 *y_current = tmp; | |
| 1059 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
1060 #endif |
| 7 | 1061 |
| 1062 #if defined(FEAT_MOUSE) || defined(PROTO) | |
| 1063 /* | |
| 1064 * return TRUE if the current yank register has type MLINE | |
| 1065 */ | |
| 1066 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1067 yank_register_mline(int regname) |
| 7 | 1068 { |
| 1069 if (regname != 0 && !valid_yank_reg(regname, FALSE)) | |
| 1070 return FALSE; | |
| 1071 if (regname == '_') /* black hole is always empty */ | |
| 1072 return FALSE; | |
| 1073 get_yank_register(regname, FALSE); | |
| 1074 return (y_current->y_type == MLINE); | |
| 1075 } | |
| 1076 #endif | |
| 1077 | |
| 1078 /* | |
| 1157 | 1079 * Start or stop recording into a yank register. |
| 7 | 1080 * |
| 1157 | 1081 * Return FAIL for failure, OK otherwise. |
| 7 | 1082 */ |
| 1083 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1084 do_record(int c) |
| 7 | 1085 { |
| 1157 | 1086 char_u *p; |
| 1087 static int regname; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1088 yankreg_T *old_y_previous, *old_y_current; |
| 1157 | 1089 int retval; |
| 7 | 1090 |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1091 if (reg_recording == 0) /* start recording */ |
| 7 | 1092 { |
|
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
1093 /* registers 0-9, a-z and " are allowed */ |
| 7 | 1094 if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) |
| 1095 retval = FAIL; | |
| 1096 else | |
| 1097 { | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1098 reg_recording = c; |
| 7 | 1099 showmode(); |
| 1100 regname = c; | |
| 1101 retval = OK; | |
| 1102 } | |
| 1103 } | |
| 1104 else /* stop recording */ | |
| 1105 { | |
| 1106 /* | |
| 1157 | 1107 * Get the recorded key hits. K_SPECIAL and CSI will be escaped, this |
| 1108 * needs to be removed again to put it in a register. exec_reg then | |
| 1109 * adds the escaping back later. | |
| 7 | 1110 */ |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1111 reg_recording = 0; |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
1112 msg(""); |
| 7 | 1113 p = get_recorded(); |
| 1114 if (p == NULL) | |
| 1115 retval = FAIL; | |
| 1116 else | |
| 1117 { | |
| 1081 | 1118 /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ |
| 1119 vim_unescape_csi(p); | |
| 1120 | |
| 7 | 1121 /* |
| 1122 * We don't want to change the default register here, so save and | |
| 1123 * restore the current register name. | |
| 1124 */ | |
| 1125 old_y_previous = y_previous; | |
| 1126 old_y_current = y_current; | |
| 1127 | |
| 1128 retval = stuff_yank(regname, p); | |
| 1129 | |
| 1130 y_previous = old_y_previous; | |
| 1131 y_current = old_y_current; | |
| 1132 } | |
| 1133 } | |
| 1134 return retval; | |
| 1135 } | |
| 1136 | |
| 1137 /* | |
| 1138 * Stuff string "p" into yank register "regname" as a single line (append if | |
| 1139 * uppercase). "p" must have been alloced. | |
| 1140 * | |
| 1141 * return FAIL for failure, OK otherwise | |
| 1142 */ | |
| 1143 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1144 stuff_yank(int regname, char_u *p) |
| 7 | 1145 { |
| 1146 char_u *lp; | |
| 1147 char_u **pp; | |
| 1148 | |
| 1149 /* check for read-only register */ | |
| 1150 if (regname != 0 && !valid_yank_reg(regname, TRUE)) | |
| 1151 { | |
| 1152 vim_free(p); | |
| 1153 return FAIL; | |
| 1154 } | |
| 1155 if (regname == '_') /* black hole: don't do anything */ | |
| 1156 { | |
| 1157 vim_free(p); | |
| 1158 return OK; | |
| 1159 } | |
| 1160 get_yank_register(regname, TRUE); | |
| 1161 if (y_append && y_current->y_array != NULL) | |
| 1162 { | |
| 1163 pp = &(y_current->y_array[y_current->y_size - 1]); | |
| 1164 lp = lalloc((long_u)(STRLEN(*pp) + STRLEN(p) + 1), TRUE); | |
| 1165 if (lp == NULL) | |
| 1166 { | |
| 1167 vim_free(p); | |
| 1168 return FAIL; | |
| 1169 } | |
| 1170 STRCPY(lp, *pp); | |
| 1171 STRCAT(lp, p); | |
| 1172 vim_free(p); | |
| 1173 vim_free(*pp); | |
| 1174 *pp = lp; | |
| 1175 } | |
| 1176 else | |
| 1177 { | |
| 1178 free_yank_all(); | |
| 1179 if ((y_current->y_array = | |
| 1180 (char_u **)alloc((unsigned)sizeof(char_u *))) == NULL) | |
| 1181 { | |
| 1182 vim_free(p); | |
| 1183 return FAIL; | |
| 1184 } | |
| 1185 y_current->y_array[0] = p; | |
| 1186 y_current->y_size = 1; | |
| 1187 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
|
1188 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1189 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
|
1190 #endif |
| 7 | 1191 } |
| 1192 return OK; | |
| 1193 } | |
| 1194 | |
| 1893 | 1195 static int execreg_lastc = NUL; |
| 1196 | |
| 7 | 1197 /* |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1198 * Execute a yank register: copy it into the stuff buffer. |
| 7 | 1199 * |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1200 * Return FAIL for failure, OK otherwise. |
| 7 | 1201 */ |
| 1202 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1203 do_execreg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1204 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1205 int colon, /* insert ':' before each line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1206 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
|
1207 int silent) /* set "silent" flag in typeahead buffer */ |
| 7 | 1208 { |
| 1209 long i; | |
| 1210 char_u *p; | |
| 1211 int retval = OK; | |
| 1212 int remap; | |
| 1213 | |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1214 // repeat previous one |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1215 if (regname == '@') |
| 168 | 1216 { |
| 1893 | 1217 if (execreg_lastc == NUL) |
| 168 | 1218 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1219 emsg(_("E748: No previously used register")); |
| 168 | 1220 return FAIL; |
| 1221 } | |
| 1893 | 1222 regname = execreg_lastc; |
| 168 | 1223 } |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1224 // check for valid regname |
| 7 | 1225 if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) |
| 168 | 1226 { |
| 1227 emsg_invreg(regname); | |
| 7 | 1228 return FAIL; |
| 168 | 1229 } |
| 1893 | 1230 execreg_lastc = regname; |
| 7 | 1231 |
| 1232 #ifdef FEAT_CLIPBOARD | |
| 1233 regname = may_get_selection(regname); | |
| 1234 #endif | |
| 1235 | |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1236 // black hole: don't stuff anything |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1237 if (regname == '_') |
| 7 | 1238 return OK; |
| 1239 | |
| 1240 #ifdef FEAT_CMDHIST | |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1241 // use last command line |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
1242 if (regname == ':') |
| 7 | 1243 { |
| 1244 if (last_cmdline == NULL) | |
| 1245 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1246 emsg(_(e_nolastcmd)); |
| 7 | 1247 return FAIL; |
| 1248 } | |
|
15989
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1249 // don't keep the cmdline containing @: |
|
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1250 VIM_CLEAR(new_last_cmdline); |
|
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1251 // Escape all control characters with a CTRL-V |
| 16 | 1252 p = vim_strsave_escaped_ext(last_cmdline, |
|
15989
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1253 (char_u *)"\001\002\003\004\005\006\007" |
|
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1254 "\010\011\012\013\014\015\016\017" |
|
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1255 "\020\021\022\023\024\025\026\027" |
|
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1256 "\030\031\032\033\034\035\036\037", |
|
a14d8b4ef2b0
patch 8.1.1000: indenting is off
Bram Moolenaar <Bram@vim.org>
parents:
15987
diff
changeset
|
1257 Ctrl_V, FALSE); |
| 16 | 1258 if (p != NULL) |
| 480 | 1259 { |
| 1260 /* When in Visual mode "'<,'>" will be prepended to the command. | |
| 1261 * Remove it when it's already there. */ | |
| 1262 if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) | |
| 1077 | 1263 retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); |
| 480 | 1264 else |
| 1077 | 1265 retval = put_in_typebuf(p, TRUE, TRUE, silent); |
| 480 | 1266 } |
| 16 | 1267 vim_free(p); |
| 7 | 1268 } |
| 1269 #endif | |
| 1270 #ifdef FEAT_EVAL | |
| 1271 else if (regname == '=') | |
| 1272 { | |
| 1273 p = get_expr_line(); | |
| 1274 if (p == NULL) | |
| 1275 return FAIL; | |
| 1077 | 1276 retval = put_in_typebuf(p, TRUE, colon, silent); |
| 7 | 1277 vim_free(p); |
| 1278 } | |
| 1279 #endif | |
| 1280 else if (regname == '.') /* use last inserted text */ | |
| 1281 { | |
| 1282 p = get_last_insert_save(); | |
| 1283 if (p == NULL) | |
| 1284 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1285 emsg(_(e_noinstext)); |
| 7 | 1286 return FAIL; |
| 1287 } | |
| 1077 | 1288 retval = put_in_typebuf(p, FALSE, colon, silent); |
| 7 | 1289 vim_free(p); |
| 1290 } | |
| 1291 else | |
| 1292 { | |
| 1293 get_yank_register(regname, FALSE); | |
| 1294 if (y_current->y_array == NULL) | |
| 1295 return FAIL; | |
| 1296 | |
| 1297 /* Disallow remaping for ":@r". */ | |
| 1298 remap = colon ? REMAP_NONE : REMAP_YES; | |
| 1299 | |
| 1300 /* | |
| 1301 * Insert lines into typeahead buffer, from last one to first one. | |
| 1302 */ | |
| 1034 | 1303 put_reedit_in_typebuf(silent); |
| 7 | 1304 for (i = y_current->y_size; --i >= 0; ) |
| 1305 { | |
| 1077 | 1306 char_u *escaped; |
| 1307 | |
| 7 | 1308 /* insert NL between lines and after last line if type is MLINE */ |
| 1309 if (y_current->y_type == MLINE || i < y_current->y_size - 1 | |
| 1310 || addcr) | |
| 1311 { | |
| 1034 | 1312 if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) |
| 7 | 1313 return FAIL; |
| 1314 } | |
| 1077 | 1315 escaped = vim_strsave_escape_csi(y_current->y_array[i]); |
| 1316 if (escaped == NULL) | |
| 1317 return FAIL; | |
| 1318 retval = ins_typebuf(escaped, remap, 0, TRUE, silent); | |
| 1319 vim_free(escaped); | |
| 1320 if (retval == FAIL) | |
| 7 | 1321 return FAIL; |
| 1034 | 1322 if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) |
| 7 | 1323 == FAIL) |
| 1324 return FAIL; | |
| 1325 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1326 reg_executing = regname == 0 ? '"' : regname; // disable "q" command |
| 7 | 1327 } |
| 1328 return retval; | |
| 1329 } | |
| 1330 | |
| 1331 /* | |
| 1332 * If "restart_edit" is not zero, put it in the typeahead buffer, so that it's | |
| 1333 * used only after other typeahead has been processed. | |
| 1334 */ | |
| 1335 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1336 put_reedit_in_typebuf(int silent) |
| 7 | 1337 { |
| 1338 char_u buf[3]; | |
| 1339 | |
| 1340 if (restart_edit != NUL) | |
| 1341 { | |
| 1342 if (restart_edit == 'V') | |
| 1343 { | |
| 1344 buf[0] = 'g'; | |
| 1345 buf[1] = 'R'; | |
| 1346 buf[2] = NUL; | |
| 1347 } | |
| 1348 else | |
| 1349 { | |
| 1350 buf[0] = restart_edit == 'I' ? 'i' : restart_edit; | |
| 1351 buf[1] = NUL; | |
| 1352 } | |
| 1034 | 1353 if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK) |
| 7 | 1354 restart_edit = NUL; |
| 1355 } | |
| 1356 } | |
| 1357 | |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1358 /* |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1359 * 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
|
1360 * executed again. |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1361 * 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
|
1362 * no remapping. |
|
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1363 */ |
| 7 | 1364 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1365 put_in_typebuf( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1366 char_u *s, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1367 int esc, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1368 int colon, /* add ':' before the line */ |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1369 int silent) |
| 7 | 1370 { |
| 1371 int retval = OK; | |
| 1372 | |
| 1034 | 1373 put_reedit_in_typebuf(silent); |
| 7 | 1374 if (colon) |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1375 retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent); |
| 7 | 1376 if (retval == OK) |
| 1077 | 1377 { |
| 1378 char_u *p; | |
| 1379 | |
| 1380 if (esc) | |
| 1381 p = vim_strsave_escape_csi(s); | |
| 1382 else | |
| 1383 p = s; | |
| 1384 if (p == NULL) | |
| 1385 retval = FAIL; | |
| 1386 else | |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1387 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
|
1388 0, TRUE, silent); |
| 1077 | 1389 if (esc) |
| 1390 vim_free(p); | |
| 1391 } | |
| 7 | 1392 if (colon && retval == OK) |
|
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1393 retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent); |
| 7 | 1394 return retval; |
| 1395 } | |
| 1396 | |
| 1397 /* | |
| 1398 * Insert a yank register: copy it into the Read buffer. | |
| 1399 * Used by CTRL-R command and middle mouse button in insert mode. | |
| 1400 * | |
| 1401 * return FAIL for failure, OK otherwise | |
| 1402 */ | |
| 1403 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1404 insert_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1405 int regname, |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1406 int literally_arg) /* insert literally, not as if typed */ |
| 7 | 1407 { |
| 1408 long i; | |
| 1409 int retval = OK; | |
| 1410 char_u *arg; | |
| 1411 int allocated; | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1412 int literally = literally_arg; |
| 7 | 1413 |
| 1414 /* | |
| 1415 * It is possible to get into an endless loop by having CTRL-R a in | |
| 1416 * register a and then, in insert mode, doing CTRL-R a. | |
| 1417 * If you hit CTRL-C, the loop will be broken here. | |
| 1418 */ | |
| 1419 ui_breakcheck(); | |
| 1420 if (got_int) | |
| 1421 return FAIL; | |
| 1422 | |
| 1423 /* check for valid regname */ | |
| 1424 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
| 1425 return FAIL; | |
| 1426 | |
| 1427 #ifdef FEAT_CLIPBOARD | |
| 1428 regname = may_get_selection(regname); | |
| 1429 #endif | |
| 1430 | |
| 1431 if (regname == '.') /* insert last inserted text */ | |
| 1432 retval = stuff_inserted(NUL, 1L, TRUE); | |
| 1433 else if (get_spec_reg(regname, &arg, &allocated, TRUE)) | |
| 1434 { | |
| 1435 if (arg == NULL) | |
| 1436 return FAIL; | |
| 1437 stuffescaped(arg, literally); | |
| 1438 if (allocated) | |
| 1439 vim_free(arg); | |
| 1440 } | |
| 1441 else /* name or number register */ | |
| 1442 { | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1443 if (get_yank_register(regname, FALSE)) |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1444 literally = TRUE; |
| 7 | 1445 if (y_current->y_array == NULL) |
| 1446 retval = FAIL; | |
| 1447 else | |
| 1448 { | |
| 1449 for (i = 0; i < y_current->y_size; ++i) | |
| 1450 { | |
| 1451 stuffescaped(y_current->y_array[i], literally); | |
| 1452 /* | |
| 1453 * Insert a newline between lines and after last line if | |
| 1454 * y_type is MLINE. | |
| 1455 */ | |
| 1456 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 1457 stuffcharReadbuff('\n'); | |
| 1458 } | |
| 1459 } | |
| 1460 } | |
| 1461 | |
| 1462 return retval; | |
| 1463 } | |
| 1464 | |
| 1465 /* | |
| 1466 * Stuff a string into the typeahead buffer, such that edit() will insert it | |
| 1467 * literally ("literally" TRUE) or interpret is as typed characters. | |
| 1468 */ | |
| 1469 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1470 stuffescaped(char_u *arg, int literally) |
| 7 | 1471 { |
| 1472 int c; | |
| 1473 char_u *start; | |
| 1474 | |
| 1475 while (*arg != NUL) | |
| 1476 { | |
| 1477 /* Stuff a sequence of normal ASCII characters, that's fast. Also | |
| 1478 * stuff K_SPECIAL to get the effect of a special key when "literally" | |
| 1479 * is TRUE. */ | |
| 1480 start = arg; | |
| 1481 while ((*arg >= ' ' | |
| 1482 #ifndef EBCDIC | |
| 1483 && *arg < DEL /* EBCDIC: chars above space are normal */ | |
| 1484 #endif | |
| 1485 ) | |
| 1486 || (*arg == K_SPECIAL && !literally)) | |
| 1487 ++arg; | |
| 1488 if (arg > start) | |
| 1489 stuffReadbuffLen(start, (long)(arg - start)); | |
| 1490 | |
| 1491 /* stuff a single special character */ | |
| 1492 if (*arg != NUL) | |
| 1493 { | |
| 1494 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
|
1495 c = mb_cptr2char_adv(&arg); |
| 7 | 1496 else |
| 1497 c = *arg++; | |
| 1498 if (literally && ((c < ' ' && c != TAB) || c == DEL)) | |
| 1499 stuffcharReadbuff(Ctrl_V); | |
| 1500 stuffcharReadbuff(c); | |
| 1501 } | |
| 1502 } | |
| 1503 } | |
| 1504 | |
| 1505 /* | |
| 1157 | 1506 * If "regname" is a special register, return TRUE and store a pointer to its |
| 1507 * value in "argp". | |
| 7 | 1508 */ |
| 15 | 1509 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1510 get_spec_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1511 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1512 char_u **argp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1513 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
|
1514 int errmsg) /* give error message when failing */ |
| 7 | 1515 { |
| 1516 int cnt; | |
| 1517 | |
| 1518 *argp = NULL; | |
| 1519 *allocated = FALSE; | |
| 1520 switch (regname) | |
| 1521 { | |
| 1522 case '%': /* file name */ | |
| 1523 if (errmsg) | |
| 1524 check_fname(); /* will give emsg if not set */ | |
| 1525 *argp = curbuf->b_fname; | |
| 1526 return TRUE; | |
| 1527 | |
| 1528 case '#': /* alternate file name */ | |
| 1529 *argp = getaltfname(errmsg); /* may give emsg if not set */ | |
| 1530 return TRUE; | |
| 1531 | |
| 1532 #ifdef FEAT_EVAL | |
| 1533 case '=': /* result of expression */ | |
| 1534 *argp = get_expr_line(); | |
| 1535 *allocated = TRUE; | |
| 1536 return TRUE; | |
| 1537 #endif | |
| 1538 | |
| 1539 case ':': /* last command line */ | |
| 1540 if (last_cmdline == NULL && errmsg) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1541 emsg(_(e_nolastcmd)); |
| 7 | 1542 *argp = last_cmdline; |
| 1543 return TRUE; | |
| 1544 | |
| 1545 case '/': /* last search-pattern */ | |
| 1546 if (last_search_pat() == NULL && errmsg) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1547 emsg(_(e_noprevre)); |
| 7 | 1548 *argp = last_search_pat(); |
| 1549 return TRUE; | |
| 1550 | |
| 1551 case '.': /* last inserted text */ | |
| 1552 *argp = get_last_insert_save(); | |
| 1553 *allocated = TRUE; | |
| 1554 if (*argp == NULL && errmsg) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1555 emsg(_(e_noinstext)); |
| 7 | 1556 return TRUE; |
| 1557 | |
| 1558 #ifdef FEAT_SEARCHPATH | |
| 1559 case Ctrl_F: /* Filename under cursor */ | |
| 1560 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
| 1561 if (!errmsg) | |
| 1562 return FALSE; | |
| 1563 *argp = file_name_at_cursor(FNAME_MESS | FNAME_HYP | |
| 681 | 1564 | (regname == Ctrl_P ? FNAME_EXP : 0), 1L, NULL); |
| 7 | 1565 *allocated = TRUE; |
| 1566 return TRUE; | |
| 1567 #endif | |
| 1568 | |
| 1569 case Ctrl_W: /* word under cursor */ | |
| 1570 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
| 1571 if (!errmsg) | |
| 1572 return FALSE; | |
| 1573 cnt = find_ident_under_cursor(argp, regname == Ctrl_W | |
| 1574 ? (FIND_IDENT|FIND_STRING) : FIND_STRING); | |
| 1575 *argp = cnt ? vim_strnsave(*argp, cnt) : NULL; | |
| 1576 *allocated = TRUE; | |
| 1577 return TRUE; | |
| 1578 | |
|
13831
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1579 case Ctrl_L: /* Line under cursor */ |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1580 if (!errmsg) |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1581 return FALSE; |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1582 |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1583 *argp = ml_get_buf(curwin->w_buffer, |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1584 curwin->w_cursor.lnum, FALSE); |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1585 return TRUE; |
|
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1586 |
| 7 | 1587 case '_': /* black hole: always empty */ |
| 1588 *argp = (char_u *)""; | |
| 1589 return TRUE; | |
| 1590 } | |
| 1591 | |
| 1592 return FALSE; | |
| 1593 } | |
| 1594 | |
| 1595 /* | |
| 15 | 1596 * Paste a yank register into the command line. |
| 1597 * Only for non-special registers. | |
| 1598 * Used by CTRL-R command in command-line mode | |
| 7 | 1599 * insert_reg() can't be used here, because special characters from the |
| 1600 * register contents will be interpreted as commands. | |
| 1601 * | |
| 1602 * return FAIL for failure, OK otherwise | |
| 1603 */ | |
| 1604 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1605 cmdline_paste_reg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1606 int regname, |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1607 int literally_arg, /* Insert text literally instead of "as typed" */ |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1608 int remcr) /* don't add CR characters */ |
| 7 | 1609 { |
| 1610 long i; | |
|
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1611 int literally = literally_arg; |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1612 |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1613 if (get_yank_register(regname, FALSE)) |
|
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1614 literally = TRUE; |
| 7 | 1615 if (y_current->y_array == NULL) |
| 1616 return FAIL; | |
| 1617 | |
| 1618 for (i = 0; i < y_current->y_size; ++i) | |
| 1619 { | |
| 1620 cmdline_paste_str(y_current->y_array[i], literally); | |
| 1621 | |
| 1015 | 1622 /* 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
|
1623 * 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
|
1624 if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr) |
| 7 | 1625 cmdline_paste_str((char_u *)"\r", literally); |
| 1626 | |
| 1627 /* Check for CTRL-C, in case someone tries to paste a few thousand | |
| 1628 * lines and gets bored. */ | |
| 1629 ui_breakcheck(); | |
| 1630 if (got_int) | |
| 1631 return FAIL; | |
| 1632 } | |
| 1633 return OK; | |
| 1634 } | |
| 1635 | |
| 1636 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
| 1637 /* | |
| 1638 * Adjust the register name pointed to with "rp" for the clipboard being | |
| 1639 * used always and the clipboard being available. | |
| 1640 */ | |
| 1641 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1642 adjust_clip_reg(int *rp) |
| 7 | 1643 { |
| 2654 | 1644 /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', |
| 1645 * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ | |
| 6116 | 1646 if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0)) |
| 1647 { | |
| 1648 if (clip_unnamed != 0) | |
| 1649 *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
| 2654 | 1650 ? '+' : '*'; |
| 6116 | 1651 else |
| 1652 *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
| 1653 ? '+' : '*'; | |
| 1654 } | |
| 7 | 1655 if (!clip_star.available && *rp == '*') |
| 1656 *rp = 0; | |
| 1657 if (!clip_plus.available && *rp == '+') | |
| 1658 *rp = 0; | |
| 1659 } | |
| 1660 #endif | |
| 1661 | |
| 1662 /* | |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1663 * Shift the delete registers: "9 is cleared, "8 becomes "9, etc. |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1664 */ |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1665 void |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1666 shift_delete_registers() |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1667 { |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1668 int n; |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1669 |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1670 y_current = &y_regs[9]; |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1671 free_yank_all(); /* free register nine */ |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1672 for (n = 9; n > 1; --n) |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1673 y_regs[n] = y_regs[n - 1]; |
|
11597
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1674 y_current = &y_regs[1]; |
|
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1675 if (!y_append) |
|
72b20190dce6
patch 8.0.0681: unnamed register only contains the last deleted text
Christian Brabandt <cb@256bit.org>
parents:
11273
diff
changeset
|
1676 y_previous = y_current; |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1677 y_regs[1].y_array = NULL; /* set register one to empty */ |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1678 } |
|
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1679 |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1680 #if defined(FEAT_EVAL) |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1681 static void |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1682 yank_do_autocmd(oparg_T *oap, yankreg_T *reg) |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1683 { |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1684 static int recursive = FALSE; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1685 dict_T *v_event; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1686 list_T *list; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1687 int n; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1688 char_u buf[NUMBUFLEN + 2]; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1689 long reglen = 0; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1690 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1691 if (recursive) |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1692 return; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1693 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1694 v_event = get_vim_var_dict(VV_EVENT); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1695 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1696 list = list_alloc(); |
|
13254
88cc06dc1a50
patch 8.0.1501: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1697 if (list == NULL) |
|
88cc06dc1a50
patch 8.0.1501: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1698 return; |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1699 for (n = 0; n < reg->y_size; n++) |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1700 list_append_string(list, reg->y_array[n], -1); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1701 list->lv_lock = VAR_FIXED; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1702 dict_add_list(v_event, "regcontents", list); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1703 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1704 buf[0] = (char_u)oap->regname; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1705 buf[1] = NUL; |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
1706 dict_add_string(v_event, "regname", buf); |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1707 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1708 buf[0] = get_op_char(oap->op_type); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1709 buf[1] = get_extra_op_char(oap->op_type); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1710 buf[2] = NUL; |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
1711 dict_add_string(v_event, "operator", buf); |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1712 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1713 buf[0] = NUL; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1714 buf[1] = NUL; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1715 switch (get_reg_type(oap->regname, ®len)) |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1716 { |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1717 case MLINE: buf[0] = 'V'; break; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1718 case MCHAR: buf[0] = 'v'; break; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1719 case MBLOCK: |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1720 vim_snprintf((char *)buf, sizeof(buf), "%c%ld", Ctrl_V, |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1721 reglen + 1); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1722 break; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1723 } |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
1724 dict_add_string(v_event, "regtype", buf); |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1725 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1726 /* Lock the dictionary and its keys */ |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1727 dict_set_items_ro(v_event); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1728 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1729 recursive = TRUE; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1730 textlock++; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1731 apply_autocmds(EVENT_TEXTYANKPOST, NULL, NULL, FALSE, curbuf); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1732 textlock--; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1733 recursive = FALSE; |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1734 |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1735 /* Empty the dictionary, v:event is still valid */ |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1736 dict_free_contents(v_event); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1737 hash_init(&v_event->dv_hashtab); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1738 } |
|
13047
669c4f75a69e
patch 8.0.1399: warnings and errors when building tiny version
Christian Brabandt <cb@256bit.org>
parents:
13037
diff
changeset
|
1739 #endif |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1740 |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1741 /* |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1742 * Handle a delete operation. |
| 7 | 1743 * |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1744 * Return FAIL if undo failed, OK otherwise. |
| 7 | 1745 */ |
| 1746 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1747 op_delete(oparg_T *oap) |
| 7 | 1748 { |
| 1749 int n; | |
| 1750 linenr_T lnum; | |
| 1751 char_u *ptr; | |
| 1752 char_u *newp, *oldp; | |
| 1753 struct block_def bd; | |
| 1754 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
| 1755 int did_yank = FALSE; | |
| 1756 | |
| 1757 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
| 1758 return OK; | |
| 1759 | |
| 1760 /* Nothing to delete, return here. Do prepare undo, for op_change(). */ | |
| 1761 if (oap->empty) | |
| 1762 return u_save_cursor(); | |
| 1763 | |
| 1764 if (!curbuf->b_p_ma) | |
| 1765 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1766 emsg(_(e_modifiable)); |
| 7 | 1767 return FAIL; |
| 1768 } | |
| 1769 | |
| 1770 #ifdef FEAT_CLIPBOARD | |
| 1771 adjust_clip_reg(&oap->regname); | |
| 1772 #endif | |
| 1773 | |
| 1774 if (has_mbyte) | |
| 1775 mb_adjust_opend(oap); | |
| 1776 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1777 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1778 * 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
|
1779 * 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
|
1780 * 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
|
1781 */ |
| 7 | 1782 if ( oap->motion_type == MCHAR |
| 1783 && !oap->is_VIsual | |
| 50 | 1784 && !oap->block_mode |
| 7 | 1785 && oap->line_count > 1 |
| 3254 | 1786 && oap->motion_force == NUL |
| 7 | 1787 && oap->op_type == OP_DELETE) |
| 1788 { | |
| 2957 | 1789 ptr = ml_get(oap->end.lnum) + oap->end.col; |
| 1790 if (*ptr != NUL) | |
| 1791 ptr += oap->inclusive; | |
| 7 | 1792 ptr = skipwhite(ptr); |
| 1793 if (*ptr == NUL && inindent(0)) | |
| 1794 oap->motion_type = MLINE; | |
| 1795 } | |
| 1796 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1797 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1798 * 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
|
1799 * 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
|
1800 */ |
| 7 | 1801 if ( oap->motion_type == MCHAR |
| 1802 && oap->line_count == 1 | |
| 1803 && oap->op_type == OP_DELETE | |
| 1804 && *ml_get(oap->start.lnum) == NUL) | |
| 1805 { | |
| 1806 /* | |
| 446 | 1807 * It's an error to operate on an empty region, when 'E' included in |
| 7 | 1808 * 'cpoptions' (Vi compatible). |
| 1809 */ | |
| 446 | 1810 if (virtual_op) |
| 1811 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
| 1812 * marks as if it happened. */ | |
| 1813 goto setmarks; | |
| 7 | 1814 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
| 1815 beep_flush(); | |
| 1816 return OK; | |
| 1817 } | |
| 1818 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1819 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1820 * 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
|
1821 * 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
|
1822 * 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
|
1823 */ |
| 7 | 1824 if (oap->regname != '_') |
| 1825 { | |
| 1826 if (oap->regname != 0) | |
| 1827 { | |
| 1828 /* check for read-only register */ | |
| 1829 if (!valid_yank_reg(oap->regname, TRUE)) | |
| 1830 { | |
| 1831 beep_flush(); | |
| 1832 return OK; | |
| 1833 } | |
| 1834 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
| 1835 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
| 1836 did_yank = TRUE; | |
| 1837 } | |
| 1838 | |
| 1839 /* | |
| 1840 * Put deleted text into register 1 and shift number registers if the | |
|
15987
29de75f53b1a
patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents:
15967
diff
changeset
|
1841 * delete contains a line break, or when using a specific operator (Vi |
|
29de75f53b1a
patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents:
15967
diff
changeset
|
1842 * compatible) |
| 3782 | 1843 * Use the register name from before adjust_clip_reg() may have |
| 1844 * changed it. | |
| 7 | 1845 */ |
|
15987
29de75f53b1a
patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents:
15967
diff
changeset
|
1846 if (oap->motion_type == MLINE || oap->line_count > 1 |
|
29de75f53b1a
patch 8.1.0999: use register one too often and not properly tested
Bram Moolenaar <Bram@vim.org>
parents:
15967
diff
changeset
|
1847 || oap->use_reg_one) |
| 7 | 1848 { |
|
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1849 shift_delete_registers(); |
| 7 | 1850 if (op_yank(oap, TRUE, FALSE) == OK) |
| 1851 did_yank = TRUE; | |
| 1852 } | |
| 1853 | |
| 3468 | 1854 /* Yank into small delete register when no named register specified |
| 1855 * and the delete is within one line. */ | |
| 1856 if (( | |
| 1857 #ifdef FEAT_CLIPBOARD | |
| 3584 | 1858 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
| 1859 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
| 3468 | 1860 #endif |
| 1861 oap->regname == 0) && oap->motion_type != MLINE | |
| 7 | 1862 && oap->line_count == 1) |
| 1863 { | |
| 1864 oap->regname = '-'; | |
| 1865 get_yank_register(oap->regname, TRUE); | |
| 1866 if (op_yank(oap, TRUE, FALSE) == OK) | |
| 1867 did_yank = TRUE; | |
| 1868 oap->regname = 0; | |
| 1869 } | |
| 1870 | |
| 1871 /* | |
| 1872 * If there's too much stuff to fit in the yank register, then get a | |
| 1873 * confirmation before doing the delete. This is crude, but simple. | |
| 1874 * And it avoids doing a delete of something we can't put back if we | |
| 1875 * want. | |
| 1876 */ | |
| 1877 if (!did_yank) | |
| 1878 { | |
| 1879 int msg_silent_save = msg_silent; | |
| 1880 | |
| 1881 msg_silent = 0; /* must display the prompt */ | |
| 1882 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
| 1883 msg_silent = msg_silent_save; | |
| 1884 if (n != 'y') | |
| 1885 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
1886 emsg(_(e_abort)); |
| 7 | 1887 return FAIL; |
| 1888 } | |
| 1889 } | |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1890 |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1891 #if defined(FEAT_EVAL) |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1892 if (did_yank && has_textyankpost()) |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1893 yank_do_autocmd(oap, y_current); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1894 #endif |
| 7 | 1895 } |
| 1896 | |
|
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1897 /* |
|
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1898 * 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
|
1899 */ |
| 7 | 1900 if (oap->block_mode) |
| 1901 { | |
| 1902 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 1903 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 1904 return FAIL; | |
| 1905 | |
| 1906 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
| 1907 { | |
| 1908 block_prep(oap, &bd, lnum, TRUE); | |
| 1909 if (bd.textlen == 0) /* nothing to delete */ | |
| 1910 continue; | |
| 1911 | |
| 1912 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
| 1913 if (lnum == curwin->w_cursor.lnum) | |
| 1914 { | |
| 1915 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
| 1916 curwin->w_cursor.coladd = 0; | |
| 1917 } | |
| 1918 | |
| 1919 /* n == number of chars deleted | |
| 1920 * If we delete a TAB, it may be replaced by several characters. | |
| 1921 * Thus the number of characters may increase! | |
| 1922 */ | |
| 1923 n = bd.textlen - bd.startspaces - bd.endspaces; | |
| 1924 oldp = ml_get(lnum); | |
| 1925 newp = alloc_check((unsigned)STRLEN(oldp) + 1 - n); | |
| 1926 if (newp == NULL) | |
| 1927 continue; | |
| 1928 /* copy up to deleted part */ | |
| 1929 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 1930 /* insert spaces */ | |
| 6929 | 1931 vim_memset(newp + bd.textcol, ' ', |
| 7 | 1932 (size_t)(bd.startspaces + bd.endspaces)); |
| 1933 /* copy the part after the deleted part */ | |
| 1934 oldp += bd.textcol + bd.textlen; | |
| 1622 | 1935 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
| 7 | 1936 /* replace the line */ |
| 1937 ml_replace(lnum, newp, FALSE); | |
| 1938 } | |
| 1939 | |
| 1940 check_cursor_col(); | |
| 1941 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
| 1942 oap->end.lnum + 1, 0L); | |
| 1943 oap->line_count = 0; /* no lines deleted */ | |
| 1944 } | |
| 5735 | 1945 else if (oap->motion_type == MLINE) |
| 7 | 1946 { |
| 1947 if (oap->op_type == OP_CHANGE) | |
| 1948 { | |
| 1949 /* Delete the lines except the first one. Temporarily move the | |
| 1950 * cursor to the next line. Save the current line number, if the | |
| 1951 * last line is deleted it may be changed. | |
| 1952 */ | |
| 1953 if (oap->line_count > 1) | |
| 1954 { | |
| 1955 lnum = curwin->w_cursor.lnum; | |
| 1956 ++curwin->w_cursor.lnum; | |
| 1957 del_lines((long)(oap->line_count - 1), TRUE); | |
| 1958 curwin->w_cursor.lnum = lnum; | |
| 1959 } | |
| 1960 if (u_save_cursor() == FAIL) | |
| 1961 return FAIL; | |
| 1962 if (curbuf->b_p_ai) /* don't delete indent */ | |
| 1963 { | |
| 1964 beginline(BL_WHITE); /* cursor on first non-white */ | |
| 1965 did_ai = TRUE; /* delete the indent when ESC hit */ | |
| 1966 ai_col = curwin->w_cursor.col; | |
| 1967 } | |
| 1968 else | |
| 1969 beginline(0); /* cursor in column 0 */ | |
| 1970 truncate_line(FALSE); /* delete the rest of the line */ | |
| 1971 /* leave cursor past last char in line */ | |
| 1972 if (oap->line_count > 1) | |
| 1973 u_clearline(); /* "U" command not possible after "2cc" */ | |
| 1974 } | |
| 1975 else | |
| 1976 { | |
| 1977 del_lines(oap->line_count, TRUE); | |
| 1978 beginline(BL_WHITE | BL_FIX); | |
| 1979 u_clearline(); /* "U" command not possible after "dd" */ | |
| 1980 } | |
| 1981 } | |
| 1982 else | |
| 1983 { | |
| 1984 if (virtual_op) | |
| 1985 { | |
| 1986 int endcol = 0; | |
| 1987 | |
| 1988 /* For virtualedit: break the tabs that are partly included. */ | |
| 1989 if (gchar_pos(&oap->start) == '\t') | |
| 1990 { | |
| 1991 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
| 1992 return FAIL; | |
| 1993 if (oap->line_count == 1) | |
| 1994 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
| 1995 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
| 1996 oap->start = curwin->w_cursor; | |
| 1997 if (oap->line_count == 1) | |
| 1998 { | |
| 1999 coladvance(endcol); | |
| 2000 oap->end.col = curwin->w_cursor.col; | |
| 2001 oap->end.coladd = curwin->w_cursor.coladd; | |
| 2002 curwin->w_cursor = oap->start; | |
| 2003 } | |
| 2004 } | |
| 2005 | |
| 2006 /* Break a tab only when it's included in the area. */ | |
| 2007 if (gchar_pos(&oap->end) == '\t' | |
| 2008 && (int)oap->end.coladd < oap->inclusive) | |
| 2009 { | |
| 2010 /* save last line for undo */ | |
| 2011 if (u_save((linenr_T)(oap->end.lnum - 1), | |
| 2012 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 2013 return FAIL; | |
| 2014 curwin->w_cursor = oap->end; | |
| 2015 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
| 2016 oap->end = curwin->w_cursor; | |
| 2017 curwin->w_cursor = oap->start; | |
| 2018 } | |
| 2019 } | |
| 2020 | |
| 2021 if (oap->line_count == 1) /* delete characters within one line */ | |
| 2022 { | |
| 2023 if (u_save_cursor() == FAIL) /* save line for undo */ | |
| 2024 return FAIL; | |
| 2025 | |
| 2026 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
| 5735 | 2027 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
| 7 | 2028 && oap->op_type == OP_CHANGE |
| 2029 && oap->end.lnum == curwin->w_cursor.lnum | |
| 5735 | 2030 && !oap->is_VIsual) |
| 7 | 2031 display_dollar(oap->end.col - !oap->inclusive); |
| 2032 | |
| 2033 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
| 2034 | |
| 2035 if (virtual_op) | |
| 2036 { | |
| 2037 /* fix up things for virtualedit-delete: | |
| 2038 * break the tabs which are going to get in our way | |
| 2039 */ | |
| 2040 char_u *curline = ml_get_curline(); | |
| 2041 int len = (int)STRLEN(curline); | |
| 2042 | |
| 2043 if (oap->end.coladd != 0 | |
| 2044 && (int)oap->end.col >= len - 1 | |
| 2045 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
| 2046 n++; | |
| 2047 /* Delete at least one char (e.g, when on a control char). */ | |
| 2048 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
| 2049 n = 1; | |
| 2050 | |
| 2051 /* When deleted a char in the line, reset coladd. */ | |
| 2052 if (gchar_cursor() != NUL) | |
| 2053 curwin->w_cursor.coladd = 0; | |
| 2054 } | |
| 6826 | 2055 (void)del_bytes((long)n, !virtual_op, |
| 2056 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
| 7 | 2057 } |
| 2058 else /* delete characters between lines */ | |
| 2059 { | |
| 2060 pos_T curpos; | |
| 2061 | |
| 2062 /* save deleted and changed lines for undo */ | |
| 2063 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
| 2064 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
| 2065 return FAIL; | |
| 2066 | |
| 2067 truncate_line(TRUE); /* delete from cursor to end of line */ | |
| 2068 | |
| 2069 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
| 2070 ++curwin->w_cursor.lnum; | |
| 2071 del_lines((long)(oap->line_count - 2), FALSE); | |
| 2072 | |
| 6826 | 2073 /* delete from start of line until op_end */ |
| 2957 | 2074 n = (oap->end.col + 1 - !oap->inclusive); |
| 6826 | 2075 curwin->w_cursor.col = 0; |
| 2076 (void)del_bytes((long)n, !virtual_op, | |
| 2077 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
| 2078 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
| 2079 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
| 7 | 2080 } |
| 2081 } | |
| 2082 | |
| 2083 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
| 2084 | |
| 446 | 2085 setmarks: |
| 7 | 2086 if (oap->block_mode) |
| 2087 { | |
| 2088 curbuf->b_op_end.lnum = oap->end.lnum; | |
| 2089 curbuf->b_op_end.col = oap->start.col; | |
| 2090 } | |
| 2091 else | |
| 2092 curbuf->b_op_end = oap->start; | |
| 2093 curbuf->b_op_start = oap->start; | |
| 2094 | |
| 2095 return OK; | |
| 2096 } | |
| 2097 | |
| 2098 /* | |
| 2099 * Adjust end of operating area for ending on a multi-byte character. | |
| 2100 * Used for deletion. | |
| 2101 */ | |
| 2102 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2103 mb_adjust_opend(oparg_T *oap) |
| 7 | 2104 { |
| 2105 char_u *p; | |
| 2106 | |
| 2107 if (oap->inclusive) | |
| 2108 { | |
| 2109 p = ml_get(oap->end.lnum); | |
| 2110 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
| 2111 } | |
| 2112 } | |
|
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
2113 |
|
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2114 /* |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2115 * Replace the character under the cursor with "c". |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2116 * This takes care of multi-byte characters. |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2117 */ |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2118 static void |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2119 replace_character(int c) |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2120 { |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2121 int n = State; |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2122 |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2123 State = REPLACE; |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2124 ins_char(c); |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2125 State = n; |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2126 /* Backup to the replaced character. */ |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2127 dec_cursor(); |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2128 } |
|
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2129 |
| 7 | 2130 /* |
| 2131 * Replace a whole area with one character. | |
| 2132 */ | |
| 2133 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2134 op_replace(oparg_T *oap, int c) |
| 7 | 2135 { |
| 2136 int n, numc; | |
| 2137 int num_chars; | |
| 2138 char_u *newp, *oldp; | |
| 2139 size_t oldlen; | |
| 2140 struct block_def bd; | |
| 5428 | 2141 char_u *after_p = NULL; |
|
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2142 int had_ctrl_v_cr = FALSE; |
| 7 | 2143 |
| 2144 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
| 2145 return OK; /* nothing to do */ | |
| 2146 | |
|
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2147 if (c == REPLACE_CR_NCHAR) |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2148 { |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2149 had_ctrl_v_cr = TRUE; |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2150 c = CAR; |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2151 } |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2152 else if (c == REPLACE_NL_NCHAR) |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2153 { |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2154 had_ctrl_v_cr = TRUE; |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2155 c = NL; |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2156 } |
| 5428 | 2157 |
| 7 | 2158 if (has_mbyte) |
| 2159 mb_adjust_opend(oap); | |
| 2160 | |
| 2161 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 2162 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 2163 return FAIL; | |
| 2164 | |
| 2165 /* | |
| 2166 * block mode replace | |
| 2167 */ | |
| 2168 if (oap->block_mode) | |
| 2169 { | |
| 2170 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
| 2171 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
| 2172 { | |
| 1982 | 2173 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
| 7 | 2174 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
| 2175 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
| 2176 continue; /* nothing to replace */ | |
| 2177 | |
| 2178 /* n == number of extra chars required | |
| 2179 * If we split a TAB, it may be replaced by several characters. | |
| 2180 * Thus the number of characters may increase! | |
| 2181 */ | |
| 2182 /* If the range starts in virtual space, count the initial | |
| 2183 * coladd offset as part of "startspaces" */ | |
| 2184 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
| 2185 { | |
| 2186 pos_T vpos; | |
| 2187 | |
| 1982 | 2188 vpos.lnum = curwin->w_cursor.lnum; |
| 7 | 2189 getvpos(&vpos, oap->start_vcol); |
| 2190 bd.startspaces += vpos.coladd; | |
| 2191 n = bd.startspaces; | |
| 2192 } | |
| 2193 else | |
| 2194 /* allow for pre spaces */ | |
| 2195 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
| 2196 | |
| 2197 /* allow for post spp */ | |
| 2198 n += (bd.endspaces | |
| 2199 && !bd.is_oneChar | |
| 2200 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
| 2201 /* Figure out how many characters to replace. */ | |
| 2202 numc = oap->end_vcol - oap->start_vcol + 1; | |
| 2203 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
| 2204 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
| 2205 | |
| 2206 /* A double-wide character can be replaced only up to half the | |
| 2207 * times. */ | |
| 2208 if ((*mb_char2cells)(c) > 1) | |
| 2209 { | |
| 2210 if ((numc & 1) && !bd.is_short) | |
| 2211 { | |
| 2212 ++bd.endspaces; | |
| 2213 ++n; | |
| 2214 } | |
| 2215 numc = numc / 2; | |
| 2216 } | |
| 2217 | |
| 2218 /* Compute bytes needed, move character count to num_chars. */ | |
| 2219 num_chars = numc; | |
| 2220 numc *= (*mb_char2len)(c); | |
| 2221 /* oldlen includes textlen, so don't double count */ | |
| 2222 n += numc - bd.textlen; | |
| 2223 | |
| 2224 oldp = ml_get_curline(); | |
| 2225 oldlen = STRLEN(oldp); | |
| 2226 newp = alloc_check((unsigned)oldlen + 1 + n); | |
| 2227 if (newp == NULL) | |
| 2228 continue; | |
| 2229 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
| 2230 /* copy up to deleted part */ | |
| 2231 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 2232 oldp += bd.textcol + bd.textlen; | |
| 2233 /* insert pre-spaces */ | |
| 6929 | 2234 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
| 7 | 2235 /* insert replacement chars CHECK FOR ALLOCATED SPACE */ |
|
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2236 /* REPLACE_CR_NCHAR/REPLACE_NL_NCHAR is used for entering CR |
|
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2237 * literally. */ |
| 5428 | 2238 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) |
| 7 | 2239 { |
| 5428 | 2240 if (has_mbyte) |
| 2241 { | |
| 2242 n = (int)STRLEN(newp); | |
| 2243 while (--num_chars >= 0) | |
| 2244 n += (*mb_char2bytes)(c, newp + n); | |
| 2245 } | |
| 2246 else | |
| 6929 | 2247 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
| 5428 | 2248 if (!bd.is_short) |
| 2249 { | |
| 2250 /* insert post-spaces */ | |
| 6929 | 2251 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
| 5428 | 2252 /* copy the part after the changed part */ |
| 2253 STRMOVE(newp + STRLEN(newp), oldp); | |
| 2254 } | |
| 7 | 2255 } |
| 2256 else | |
| 2257 { | |
| 5428 | 2258 /* Replacing with \r or \n means splitting the line. */ |
| 5475 | 2259 after_p = alloc_check( |
| 2260 (unsigned)(oldlen + 1 + n - STRLEN(newp))); | |
| 5428 | 2261 if (after_p != NULL) |
| 2262 STRMOVE(after_p, oldp); | |
| 7 | 2263 } |
| 2264 /* replace the line */ | |
| 2265 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 5428 | 2266 if (after_p != NULL) |
| 2267 { | |
| 2268 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
| 2269 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
| 2270 oap->end.lnum++; | |
| 2271 vim_free(after_p); | |
| 2272 } | |
| 7 | 2273 } |
| 2274 } | |
| 2275 else | |
| 2276 { | |
| 2277 /* | |
| 2278 * MCHAR and MLINE motion replace. | |
| 2279 */ | |
| 2280 if (oap->motion_type == MLINE) | |
| 2281 { | |
| 2282 oap->start.col = 0; | |
| 2283 curwin->w_cursor.col = 0; | |
| 2284 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
| 2285 if (oap->end.col) | |
| 2286 --oap->end.col; | |
| 2287 } | |
| 2288 else if (!oap->inclusive) | |
| 2289 dec(&(oap->end)); | |
| 2290 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2291 while (LTOREQ_POS(curwin->w_cursor, oap->end)) |
| 7 | 2292 { |
| 2293 n = gchar_cursor(); | |
| 2294 if (n != NUL) | |
| 2295 { | |
| 2296 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
| 2297 { | |
| 2298 /* This is slow, but it handles replacing a single-byte | |
| 2299 * with a multi-byte and the other way around. */ | |
| 4203 | 2300 if (curwin->w_cursor.lnum == oap->end.lnum) |
| 2301 oap->end.col += (*mb_char2len)(c) - (*mb_char2len)(n); | |
|
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2302 replace_character(c); |
| 7 | 2303 } |
| 2304 else | |
| 2305 { | |
| 2306 if (n == TAB) | |
| 2307 { | |
| 2308 int end_vcol = 0; | |
| 2309 | |
| 2310 if (curwin->w_cursor.lnum == oap->end.lnum) | |
| 2311 { | |
| 2312 /* oap->end has to be recalculated when | |
| 2313 * the tab breaks */ | |
| 2314 end_vcol = getviscol2(oap->end.col, | |
| 2315 oap->end.coladd); | |
| 2316 } | |
| 2317 coladvance_force(getviscol()); | |
| 2318 if (curwin->w_cursor.lnum == oap->end.lnum) | |
| 2319 getvpos(&oap->end, end_vcol); | |
| 2320 } | |
|
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2321 PBYTE(curwin->w_cursor, c); |
| 7 | 2322 } |
| 2323 } | |
| 2324 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
| 2325 { | |
| 2326 int virtcols = oap->end.coladd; | |
| 2327 | |
| 2328 if (curwin->w_cursor.lnum == oap->start.lnum | |
| 2329 && oap->start.col == oap->end.col && oap->start.coladd) | |
| 2330 virtcols -= oap->start.coladd; | |
| 2331 | |
| 2332 /* oap->end has been trimmed so it's effectively inclusive; | |
| 2333 * as a result an extra +1 must be counted so we don't | |
| 2334 * trample the NUL byte. */ | |
| 2335 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
| 2336 curwin->w_cursor.col -= (virtcols + 1); | |
| 2337 for (; virtcols >= 0; virtcols--) | |
| 2338 { | |
|
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2339 if ((*mb_char2len)(c) > 1) |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2340 replace_character(c); |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2341 else |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2342 PBYTE(curwin->w_cursor, c); |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2343 if (inc(&curwin->w_cursor) == -1) |
|
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2344 break; |
| 7 | 2345 } |
| 2346 } | |
| 2347 | |
| 2348 /* Advance to next character, stop at the end of the file. */ | |
| 2349 if (inc_cursor() == -1) | |
| 2350 break; | |
| 2351 } | |
| 2352 } | |
| 2353 | |
| 2354 curwin->w_cursor = oap->start; | |
| 2355 check_cursor(); | |
| 2356 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
| 2357 | |
| 2358 /* Set "'[" and "']" marks. */ | |
| 2359 curbuf->b_op_start = oap->start; | |
| 2360 curbuf->b_op_end = oap->end; | |
| 2361 | |
| 2362 return OK; | |
| 2363 } | |
| 2364 | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2365 static int swapchars(int op_type, pos_T *pos, int length); |
| 1525 | 2366 |
| 7 | 2367 /* |
| 2368 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
| 2369 */ | |
| 2370 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2371 op_tilde(oparg_T *oap) |
| 7 | 2372 { |
| 2373 pos_T pos; | |
| 2374 struct block_def bd; | |
| 1528 | 2375 int did_change = FALSE; |
| 7 | 2376 |
| 2377 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 2378 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 2379 return; | |
| 2380 | |
| 2381 pos = oap->start; | |
| 2382 if (oap->block_mode) /* Visual block mode */ | |
| 2383 { | |
| 2384 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
| 2385 { | |
| 1766 | 2386 int one_change; |
| 2387 | |
| 7 | 2388 block_prep(oap, &bd, pos.lnum, FALSE); |
| 2389 pos.col = bd.textcol; | |
| 1766 | 2390 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
| 2391 did_change |= one_change; | |
| 1525 | 2392 |
| 5735 | 2393 #ifdef FEAT_NETBEANS_INTG |
| 2210 | 2394 if (netbeans_active() && one_change) |
| 7 | 2395 { |
| 2396 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 2397 | |
| 33 | 2398 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
| 2399 (long)bd.textlen); | |
| 7 | 2400 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
| 2210 | 2401 &ptr[bd.textcol], bd.textlen); |
| 7 | 2402 } |
| 5735 | 2403 #endif |
| 7 | 2404 } |
| 2405 if (did_change) | |
| 2406 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
| 2407 } | |
| 2408 else /* not block mode */ | |
| 2409 { | |
| 2410 if (oap->motion_type == MLINE) | |
| 2411 { | |
| 2412 oap->start.col = 0; | |
| 2413 pos.col = 0; | |
| 2414 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
| 2415 if (oap->end.col) | |
| 2416 --oap->end.col; | |
| 2417 } | |
| 2418 else if (!oap->inclusive) | |
| 2419 dec(&(oap->end)); | |
| 2420 | |
| 1528 | 2421 if (pos.lnum == oap->end.lnum) |
| 2422 did_change = swapchars(oap->op_type, &pos, | |
| 2423 oap->end.col - pos.col + 1); | |
| 2424 else | |
| 2425 for (;;) | |
| 2426 { | |
| 2427 did_change |= swapchars(oap->op_type, &pos, | |
| 2428 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
| 2429 (int)STRLEN(ml_get_pos(&pos))); | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2430 if (LTOREQ_POS(oap->end, pos) || inc(&pos) == -1) |
| 1528 | 2431 break; |
| 2432 } | |
| 7 | 2433 if (did_change) |
| 2434 { | |
| 2435 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
| 2436 0L); | |
| 2437 #ifdef FEAT_NETBEANS_INTG | |
| 2210 | 2438 if (netbeans_active() && did_change) |
| 7 | 2439 { |
| 2440 char_u *ptr; | |
| 2441 int count; | |
| 2442 | |
| 2443 pos = oap->start; | |
| 2444 while (pos.lnum < oap->end.lnum) | |
| 2445 { | |
| 2446 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 835 | 2447 count = (int)STRLEN(ptr) - pos.col; |
| 33 | 2448 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
| 7 | 2449 netbeans_inserted(curbuf, pos.lnum, pos.col, |
| 2210 | 2450 &ptr[pos.col], count); |
| 7 | 2451 pos.col = 0; |
| 2452 pos.lnum++; | |
| 2453 } | |
| 2454 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
| 2455 count = oap->end.col - pos.col + 1; | |
| 33 | 2456 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
| 7 | 2457 netbeans_inserted(curbuf, pos.lnum, pos.col, |
| 2210 | 2458 &ptr[pos.col], count); |
| 7 | 2459 } |
| 2460 #endif | |
| 2461 } | |
| 2462 } | |
| 2463 | |
| 2464 if (!did_change && oap->is_VIsual) | |
| 2465 /* No change: need to remove the Visual selection */ | |
| 2466 redraw_curbuf_later(INVERTED); | |
| 2467 | |
| 2468 /* | |
| 2469 * Set '[ and '] marks. | |
| 2470 */ | |
| 2471 curbuf->b_op_start = oap->start; | |
| 2472 curbuf->b_op_end = oap->end; | |
| 2473 | |
| 2474 if (oap->line_count > p_report) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
2475 smsg(NGETTEXT("%ld line changed", "%ld lines changed", |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
2476 oap->line_count), oap->line_count); |
| 7 | 2477 } |
| 2478 | |
| 2479 /* | |
| 1525 | 2480 * Invoke swapchar() on "length" bytes at position "pos". |
| 2481 * "pos" is advanced to just after the changed characters. | |
| 2482 * "length" is rounded up to include the whole last multi-byte character. | |
| 2483 * Also works correctly when the number of bytes changes. | |
| 2484 * Returns TRUE if some character was changed. | |
| 2485 */ | |
| 2486 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2487 swapchars(int op_type, pos_T *pos, int length) |
| 1525 | 2488 { |
| 2489 int todo; | |
| 2490 int did_change = 0; | |
| 2491 | |
| 2492 for (todo = length; todo > 0; --todo) | |
| 2493 { | |
| 2494 if (has_mbyte) | |
|
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2495 { |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2496 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2497 |
| 1525 | 2498 /* we're counting bytes, not characters */ |
|
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2499 if (len > 0) |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2500 todo -= len - 1; |
|
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2501 } |
| 1525 | 2502 did_change |= swapchar(op_type, pos); |
| 2503 if (inc(pos) == -1) /* at end of file */ | |
| 2504 break; | |
| 2505 } | |
| 2506 return did_change; | |
| 2507 } | |
| 2508 | |
| 2509 /* | |
| 7 | 2510 * If op_type == OP_UPPER: make uppercase, |
| 2511 * if op_type == OP_LOWER: make lowercase, | |
| 2512 * if op_type == OP_ROT13: do rot13 encoding, | |
| 2513 * else swap case of character at 'pos' | |
| 2514 * returns TRUE when something actually changed. | |
| 2515 */ | |
| 2516 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2517 swapchar(int op_type, pos_T *pos) |
| 7 | 2518 { |
| 2519 int c; | |
| 2520 int nc; | |
| 2521 | |
| 2522 c = gchar_pos(pos); | |
| 2523 | |
| 2524 /* Only do rot13 encoding for ASCII characters. */ | |
| 2525 if (c >= 0x80 && op_type == OP_ROT13) | |
| 2526 return FALSE; | |
| 2527 | |
| 1525 | 2528 if (op_type == OP_UPPER && c == 0xdf |
| 2529 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
| 493 | 2530 { |
| 2531 pos_T sp = curwin->w_cursor; | |
| 2532 | |
| 2533 /* Special handling of German sharp s: change to "SS". */ | |
| 2534 curwin->w_cursor = *pos; | |
| 2535 del_char(FALSE); | |
| 2536 ins_char('S'); | |
| 2537 ins_char('S'); | |
| 2538 curwin->w_cursor = sp; | |
| 2539 inc(pos); | |
| 2540 } | |
| 2541 | |
| 7 | 2542 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
| 2543 return FALSE; | |
| 2544 nc = c; | |
| 2545 if (MB_ISLOWER(c)) | |
| 2546 { | |
| 2547 if (op_type == OP_ROT13) | |
| 2548 nc = ROT13(c, 'a'); | |
| 2549 else if (op_type != OP_LOWER) | |
| 2550 nc = MB_TOUPPER(c); | |
| 2551 } | |
| 2552 else if (MB_ISUPPER(c)) | |
| 2553 { | |
| 2554 if (op_type == OP_ROT13) | |
| 2555 nc = ROT13(c, 'A'); | |
| 2556 else if (op_type != OP_UPPER) | |
| 2557 nc = MB_TOLOWER(c); | |
| 2558 } | |
| 2559 if (nc != c) | |
| 2560 { | |
| 2561 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
| 2562 { | |
| 2563 pos_T sp = curwin->w_cursor; | |
| 2564 | |
| 2565 curwin->w_cursor = *pos; | |
|
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2566 /* 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
|
2567 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
| 7 | 2568 ins_char(nc); |
| 2569 curwin->w_cursor = sp; | |
| 2570 } | |
| 2571 else | |
|
14216
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2572 PBYTE(*pos, nc); |
| 7 | 2573 return TRUE; |
| 2574 } | |
| 2575 return FALSE; | |
| 2576 } | |
| 2577 | |
| 2578 /* | |
| 2579 * op_insert - Insert and append operators for Visual mode. | |
| 2580 */ | |
| 2581 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2582 op_insert(oparg_T *oap, long count1) |
| 7 | 2583 { |
| 2584 long ins_len, pre_textlen = 0; | |
| 2585 char_u *firstline, *ins_text; | |
|
12329
0b10cff73322
patch 8.0.1044: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12327
diff
changeset
|
2586 colnr_T ind_pre = 0, ind_post; |
| 7 | 2587 struct block_def bd; |
| 2588 int i; | |
| 6579 | 2589 pos_T t1; |
| 7 | 2590 |
| 2591 /* edit() changes this - record it for OP_APPEND */ | |
| 2592 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
| 2593 | |
| 2594 /* vis block is still marked. Get rid of it now. */ | |
| 2595 curwin->w_cursor.lnum = oap->start.lnum; | |
| 2596 update_screen(INVERTED); | |
| 2597 | |
| 2598 if (oap->block_mode) | |
| 2599 { | |
| 2600 /* When 'virtualedit' is used, need to insert the extra spaces before | |
| 2601 * doing block_prep(). When only "block" is used, virtual edit is | |
| 2602 * already disabled, but still need it when calling | |
| 2603 * coladvance_force(). */ | |
| 2604 if (curwin->w_cursor.coladd > 0) | |
| 2605 { | |
| 2606 int old_ve_flags = ve_flags; | |
| 2607 | |
| 2608 ve_flags = VE_ALL; | |
| 2609 if (u_save_cursor() == FAIL) | |
| 2610 return; | |
| 2611 coladvance_force(oap->op_type == OP_APPEND | |
| 2612 ? oap->end_vcol + 1 : getviscol()); | |
| 2613 if (oap->op_type == OP_APPEND) | |
| 2614 --curwin->w_cursor.col; | |
| 2615 ve_flags = old_ve_flags; | |
| 2616 } | |
| 2617 /* Get the info about the block before entering the text */ | |
| 2618 block_prep(oap, &bd, oap->start.lnum, TRUE); | |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2619 /* Get indent information */ |
|
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2620 ind_pre = (colnr_T)getwhitecols_curline(); |
| 7 | 2621 firstline = ml_get(oap->start.lnum) + bd.textcol; |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2622 |
| 7 | 2623 if (oap->op_type == OP_APPEND) |
| 2624 firstline += bd.textlen; | |
| 2625 pre_textlen = (long)STRLEN(firstline); | |
| 2626 } | |
| 2627 | |
| 2628 if (oap->op_type == OP_APPEND) | |
| 2629 { | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2630 if (oap->block_mode && curwin->w_cursor.coladd == 0) |
| 7 | 2631 { |
| 2632 /* Move the cursor to the character right of the block. */ | |
| 2633 curwin->w_set_curswant = TRUE; | |
| 2634 while (*ml_get_cursor() != NUL | |
| 2635 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
| 2636 ++curwin->w_cursor.col; | |
| 2637 if (bd.is_short && !bd.is_MAX) | |
| 2638 { | |
| 2639 /* First line was too short, make it longer and adjust the | |
| 2640 * values in "bd". */ | |
| 2641 if (u_save_cursor() == FAIL) | |
| 2642 return; | |
| 2643 for (i = 0; i < bd.endspaces; ++i) | |
| 2644 ins_char(' '); | |
| 2645 bd.textlen += bd.endspaces; | |
| 2646 } | |
| 2647 } | |
| 2648 else | |
| 2649 { | |
| 2650 curwin->w_cursor = oap->end; | |
| 893 | 2651 check_cursor_col(); |
| 7 | 2652 |
| 2653 /* Works just like an 'i'nsert on the next character. */ | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2654 if (!LINEEMPTY(curwin->w_cursor.lnum) |
| 7 | 2655 && oap->start_vcol != oap->end_vcol) |
| 2656 inc_cursor(); | |
| 2657 } | |
| 2658 } | |
| 2659 | |
| 6579 | 2660 t1 = oap->start; |
|
10803
065da86ca6d2
patch 8.0.0291: Visual block insertion does not insert in all lines
Christian Brabandt <cb@256bit.org>
parents:
10785
diff
changeset
|
2661 (void)edit(NUL, FALSE, (linenr_T)count1); |
| 7 | 2662 |
| 6579 | 2663 /* When a tab was inserted, and the characters in front of the tab |
| 2664 * have been converted to a tab as well, the column of the cursor | |
| 2665 * might have actually been reduced, so need to adjust here. */ | |
| 2666 if (t1.lnum == curbuf->b_op_start_orig.lnum | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2667 && LT_POS(curbuf->b_op_start_orig, t1)) |
| 6579 | 2668 oap->start = curbuf->b_op_start_orig; |
| 2669 | |
| 1477 | 2670 /* If user has moved off this line, we don't know what to do, so do |
| 2671 * nothing. | |
| 2672 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
| 2673 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
| 7 | 2674 return; |
| 2675 | |
| 2676 if (oap->block_mode) | |
| 2677 { | |
| 2678 struct block_def bd2; | |
|
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2679 int did_indent = FALSE; |
|
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2680 size_t len; |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2681 int add; |
| 7 | 2682 |
|
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2683 /* If indent kicked in, the firstline might have changed |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2684 * but only do that, if the indent actually increased. */ |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2685 ind_post = (colnr_T)getwhitecols_curline(); |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2686 if (curbuf->b_op_start.col > ind_pre && ind_post > ind_pre) |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2687 { |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2688 bd.textcol += ind_post - ind_pre; |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2689 bd.start_vcol += ind_post - ind_pre; |
|
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2690 did_indent = TRUE; |
|
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2691 } |
|
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2692 |
| 5471 | 2693 /* The user may have moved the cursor before inserting something, try |
|
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2694 * to adjust the block for that. But only do it, if the difference |
|
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2695 * does not come from indent kicking in. */ |
|
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2696 if (oap->start.lnum == curbuf->b_op_start_orig.lnum |
|
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
2697 && !bd.is_MAX && !did_indent) |
| 5471 | 2698 { |
| 2699 if (oap->op_type == OP_INSERT | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2700 && oap->start.col + oap->start.coladd |
| 5730 | 2701 != curbuf->b_op_start_orig.col |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2702 + curbuf->b_op_start_orig.coladd) |
| 5471 | 2703 { |
| 6579 | 2704 int t = getviscol2(curbuf->b_op_start_orig.col, |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2705 curbuf->b_op_start_orig.coladd); |
| 5680 | 2706 oap->start.col = curbuf->b_op_start_orig.col; |
| 6579 | 2707 pre_textlen -= t - oap->start_vcol; |
| 2708 oap->start_vcol = t; | |
| 5471 | 2709 } |
| 2710 else if (oap->op_type == OP_APPEND | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2711 && oap->end.col + oap->end.coladd |
| 5730 | 2712 >= curbuf->b_op_start_orig.col |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2713 + curbuf->b_op_start_orig.coladd) |
| 5471 | 2714 { |
| 6579 | 2715 int t = getviscol2(curbuf->b_op_start_orig.col, |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2716 curbuf->b_op_start_orig.coladd); |
| 5680 | 2717 oap->start.col = curbuf->b_op_start_orig.col; |
| 5471 | 2718 /* reset pre_textlen to the value of OP_INSERT */ |
| 2719 pre_textlen += bd.textlen; | |
| 6579 | 2720 pre_textlen -= t - oap->start_vcol; |
| 2721 oap->start_vcol = t; | |
| 5471 | 2722 oap->op_type = OP_INSERT; |
| 2723 } | |
| 2724 } | |
| 2725 | |
| 7 | 2726 /* |
| 2727 * Spaces and tabs in the indent may have changed to other spaces and | |
| 1392 | 2728 * tabs. Get the starting column again and correct the length. |
| 7 | 2729 * Don't do this when "$" used, end-of-line will have changed. |
| 2730 */ | |
| 2731 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
| 2732 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
| 2733 { | |
| 2734 if (oap->op_type == OP_APPEND) | |
| 2735 { | |
| 2736 pre_textlen += bd2.textlen - bd.textlen; | |
| 2737 if (bd2.endspaces) | |
| 2738 --bd2.textlen; | |
| 2739 } | |
| 2740 bd.textcol = bd2.textcol; | |
| 2741 bd.textlen = bd2.textlen; | |
| 2742 } | |
| 2743 | |
| 2744 /* | |
| 2745 * Subsequent calls to ml_get() flush the firstline data - take a | |
| 2746 * copy of the required string. | |
| 2747 */ | |
|
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2748 firstline = ml_get(oap->start.lnum); |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2749 len = STRLEN(firstline); |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2750 add = bd.textcol; |
| 7 | 2751 if (oap->op_type == OP_APPEND) |
|
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2752 add += bd.textlen; |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2753 if ((size_t)add > len) |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2754 firstline += len; // short line, point to the NUL |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2755 else |
|
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2756 firstline += add; |
| 3421 | 2757 if (pre_textlen >= 0 |
| 2758 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
| 7 | 2759 { |
| 2760 ins_text = vim_strnsave(firstline, (int)ins_len); | |
| 2761 if (ins_text != NULL) | |
| 2762 { | |
| 2763 /* block handled here */ | |
| 2764 if (u_save(oap->start.lnum, | |
| 2765 (linenr_T)(oap->end.lnum + 1)) == OK) | |
| 2766 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
| 2767 &bd); | |
| 2768 | |
| 2769 curwin->w_cursor.col = oap->start.col; | |
| 2770 check_cursor(); | |
| 2771 vim_free(ins_text); | |
| 2772 } | |
| 2773 } | |
| 2774 } | |
| 2775 } | |
| 2776 | |
| 2777 /* | |
| 2778 * op_change - handle a change operation | |
| 2779 * | |
| 2780 * return TRUE if edit() returns because of a CTRL-O command | |
| 2781 */ | |
| 2782 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2783 op_change(oparg_T *oap) |
| 7 | 2784 { |
| 2785 colnr_T l; | |
| 2786 int retval; | |
| 2787 long offset; | |
| 2788 linenr_T linenr; | |
| 1392 | 2789 long ins_len; |
| 2790 long pre_textlen = 0; | |
| 2791 long pre_indent = 0; | |
| 7 | 2792 char_u *firstline; |
| 2793 char_u *ins_text, *newp, *oldp; | |
| 2794 struct block_def bd; | |
| 2795 | |
| 2796 l = oap->start.col; | |
| 2797 if (oap->motion_type == MLINE) | |
| 2798 { | |
| 2799 l = 0; | |
| 2800 #ifdef FEAT_SMARTINDENT | |
| 2801 if (!p_paste && curbuf->b_p_si | |
| 2802 # ifdef FEAT_CINDENT | |
| 2803 && !curbuf->b_p_cin | |
| 2804 # endif | |
| 2805 ) | |
| 2806 can_si = TRUE; /* It's like opening a new line, do si */ | |
| 2807 #endif | |
| 2808 } | |
| 2809 | |
| 2810 /* First delete the text in the region. In an empty buffer only need to | |
| 2811 * save for undo */ | |
| 2812 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
| 2813 { | |
| 2814 if (u_save_cursor() == FAIL) | |
| 2815 return FALSE; | |
| 2816 } | |
| 2817 else if (op_delete(oap) == FAIL) | |
| 2818 return FALSE; | |
| 2819 | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2820 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum) |
| 7 | 2821 && !virtual_op) |
| 2822 inc_cursor(); | |
| 2823 | |
| 2824 /* check for still on same line (<CR> in inserted text meaningless) */ | |
| 2825 /* skip blank lines too */ | |
| 2826 if (oap->block_mode) | |
| 2827 { | |
| 2828 /* Add spaces before getting the current line length. */ | |
| 2829 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
| 2830 || gchar_cursor() == NUL)) | |
| 2831 coladvance_force(getviscol()); | |
| 1392 | 2832 firstline = ml_get(oap->start.lnum); |
| 2833 pre_textlen = (long)STRLEN(firstline); | |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2834 pre_indent = (long)getwhitecols(firstline); |
| 7 | 2835 bd.textcol = curwin->w_cursor.col; |
| 2836 } | |
| 2837 | |
| 2838 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
| 2839 if (oap->motion_type == MLINE) | |
| 2840 fix_indent(); | |
| 2841 #endif | |
| 2842 | |
| 2843 retval = edit(NUL, FALSE, (linenr_T)1); | |
| 2844 | |
| 2845 /* | |
| 39 | 2846 * In Visual block mode, handle copying the new text to all lines of the |
| 7 | 2847 * block. |
| 1477 | 2848 * Don't repeat the insert when Insert mode ended with CTRL-C. |
| 7 | 2849 */ |
| 1477 | 2850 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
| 7 | 2851 { |
| 1392 | 2852 /* Auto-indenting may have changed the indent. If the cursor was past |
| 2853 * the indent, exclude that indent change from the inserted text. */ | |
| 7 | 2854 firstline = ml_get(oap->start.lnum); |
| 1403 | 2855 if (bd.textcol > (colnr_T)pre_indent) |
| 7 | 2856 { |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2857 long new_indent = (long)getwhitecols(firstline); |
| 1392 | 2858 |
| 2859 pre_textlen += new_indent - pre_indent; | |
| 2860 bd.textcol += new_indent - pre_indent; | |
| 2861 } | |
| 2862 | |
| 2863 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
| 2864 if (ins_len > 0) | |
| 2865 { | |
| 2866 /* Subsequent calls to ml_get() flush the firstline data - take a | |
| 2867 * copy of the inserted text. */ | |
| 7 | 2868 if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL) |
| 2869 { | |
| 419 | 2870 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
| 7 | 2871 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
| 2872 linenr++) | |
| 2873 { | |
| 2874 block_prep(oap, &bd, linenr, TRUE); | |
| 2875 if (!bd.is_short || virtual_op) | |
| 2876 { | |
| 2877 pos_T vpos; | |
| 2878 | |
| 2879 /* If the block starts in virtual space, count the | |
| 2880 * initial coladd offset as part of "startspaces" */ | |
| 2881 if (bd.is_short) | |
| 2882 { | |
| 1982 | 2883 vpos.lnum = linenr; |
| 7 | 2884 (void)getvpos(&vpos, oap->start_vcol); |
| 2885 } | |
| 2886 else | |
| 2887 vpos.coladd = 0; | |
| 2888 oldp = ml_get(linenr); | |
| 2889 newp = alloc_check((unsigned)(STRLEN(oldp) | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
2890 + vpos.coladd + ins_len + 1)); |
| 7 | 2891 if (newp == NULL) |
| 2892 continue; | |
| 2893 /* copy up to block start */ | |
| 2894 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
| 2895 offset = bd.textcol; | |
| 6929 | 2896 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
| 7 | 2897 offset += vpos.coladd; |
| 2898 mch_memmove(newp + offset, ins_text, (size_t)ins_len); | |
| 2899 offset += ins_len; | |
| 2900 oldp += bd.textcol; | |
| 1622 | 2901 STRMOVE(newp + offset, oldp); |
| 7 | 2902 ml_replace(linenr, newp, FALSE); |
| 2903 } | |
| 2904 } | |
| 2905 check_cursor(); | |
| 2906 | |
| 2907 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
| 2908 } | |
| 2909 vim_free(ins_text); | |
| 2910 } | |
| 2911 } | |
| 2912 | |
| 2913 return retval; | |
| 2914 } | |
| 2915 | |
| 2916 /* | |
| 2917 * set all the yank registers to empty (called from main()) | |
| 2918 */ | |
| 2919 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2920 init_yank(void) |
| 7 | 2921 { |
| 2922 int i; | |
| 2923 | |
| 2924 for (i = 0; i < NUM_REGISTERS; ++i) | |
| 2925 y_regs[i].y_array = NULL; | |
| 2926 } | |
| 2927 | |
| 356 | 2928 #if defined(EXITFREE) || defined(PROTO) |
| 2929 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2930 clear_registers(void) |
| 356 | 2931 { |
| 2932 int i; | |
| 2933 | |
| 2934 for (i = 0; i < NUM_REGISTERS; ++i) | |
| 2935 { | |
| 2936 y_current = &y_regs[i]; | |
| 2937 if (y_current->y_array != NULL) | |
| 2938 free_yank_all(); | |
| 2939 } | |
| 2940 } | |
| 2941 #endif | |
| 2942 | |
| 7 | 2943 /* |
| 2944 * Free "n" lines from the current yank register. | |
| 2945 * Called for normal freeing and in case of error. | |
| 2946 */ | |
| 2947 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2948 free_yank(long n) |
| 7 | 2949 { |
| 2950 if (y_current->y_array != NULL) | |
| 2951 { | |
| 2952 long i; | |
| 2953 | |
| 2954 for (i = n; --i >= 0; ) | |
| 2955 { | |
| 2956 #ifdef AMIGA /* only for very slow machines */ | |
| 2957 if ((i & 1023) == 1023) /* this may take a while */ | |
| 2958 { | |
| 2959 /* | |
| 2960 * This message should never cause a hit-return message. | |
| 2961 * Overwrite this message with any next message. | |
| 2962 */ | |
| 2963 ++no_wait_return; | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
2964 smsg(_("freeing %ld lines"), i + 1); |
| 7 | 2965 --no_wait_return; |
| 2966 msg_didout = FALSE; | |
| 2967 msg_col = 0; | |
| 2968 } | |
| 2969 #endif | |
| 2970 vim_free(y_current->y_array[i]); | |
| 2971 } | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
2972 VIM_CLEAR(y_current->y_array); |
| 7 | 2973 #ifdef AMIGA |
| 2974 if (n >= 1000) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
2975 msg(""); |
| 7 | 2976 #endif |
| 2977 } | |
| 2978 } | |
| 2979 | |
| 2980 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2981 free_yank_all(void) |
| 7 | 2982 { |
| 2983 free_yank(y_current->y_size); | |
| 2984 } | |
| 2985 | |
| 2986 /* | |
| 2987 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
| 2988 * If we are to append (uppercase register), we first yank into a new yank | |
| 2989 * register and then concatenate the old and the new one (so we keep the old | |
| 2990 * one in case of out-of-memory). | |
| 2991 * | |
|
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
2992 * Return FAIL for failure, OK otherwise. |
| 7 | 2993 */ |
| 2994 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2995 op_yank(oparg_T *oap, int deleting, int mess) |
| 7 | 2996 { |
| 2997 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
|
2998 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
|
2999 yankreg_T newreg; /* new yank register when appending */ |
| 7 | 3000 char_u **new_ptr; |
| 3001 linenr_T lnum; /* current line number */ | |
| 3002 long j; | |
| 3003 int yanktype = oap->motion_type; | |
| 3004 long yanklines = oap->line_count; | |
| 3005 linenr_T yankendlnum = oap->end.lnum; | |
| 3006 char_u *p; | |
| 3007 char_u *pnew; | |
| 3008 struct block_def bd; | |
| 2658 | 3009 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
| 2654 | 3010 int did_star = FALSE; |
| 2658 | 3011 #endif |
| 7 | 3012 |
| 3013 /* check for read-only register */ | |
| 3014 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
| 3015 { | |
| 3016 beep_flush(); | |
| 3017 return FAIL; | |
| 3018 } | |
| 3019 if (oap->regname == '_') /* black hole: nothing to do */ | |
| 3020 return OK; | |
| 3021 | |
| 3022 #ifdef FEAT_CLIPBOARD | |
| 3023 if (!clip_star.available && oap->regname == '*') | |
| 3024 oap->regname = 0; | |
| 3025 else if (!clip_plus.available && oap->regname == '+') | |
| 3026 oap->regname = 0; | |
| 3027 #endif | |
| 3028 | |
| 3029 if (!deleting) /* op_delete() already set y_current */ | |
| 3030 get_yank_register(oap->regname, TRUE); | |
| 3031 | |
| 3032 curr = y_current; | |
| 3033 /* append to existing contents */ | |
| 3034 if (y_append && y_current->y_array != NULL) | |
| 3035 y_current = &newreg; | |
| 3036 else | |
| 3037 free_yank_all(); /* free previously yanked lines */ | |
| 3038 | |
| 593 | 3039 /* |
| 3040 * If the cursor was in column 1 before and after the movement, and the | |
| 3041 * operator is not inclusive, the yank is always linewise. | |
| 3042 */ | |
| 7 | 3043 if ( oap->motion_type == MCHAR |
| 3044 && oap->start.col == 0 | |
| 3045 && !oap->inclusive | |
| 3046 && (!oap->is_VIsual || *p_sel == 'o') | |
| 50 | 3047 && !oap->block_mode |
| 7 | 3048 && oap->end.col == 0 |
| 3049 && yanklines > 1) | |
| 3050 { | |
| 3051 yanktype = MLINE; | |
| 3052 --yankendlnum; | |
| 3053 --yanklines; | |
| 3054 } | |
| 3055 | |
| 3056 y_current->y_size = yanklines; | |
| 3057 y_current->y_type = yanktype; /* set the yank register type */ | |
| 3058 y_current->y_width = 0; | |
| 3059 y_current->y_array = (char_u **)lalloc_clear((long_u)(sizeof(char_u *) * | |
| 3060 yanklines), TRUE); | |
| 3061 if (y_current->y_array == NULL) | |
| 3062 { | |
| 3063 y_current = curr; | |
| 3064 return FAIL; | |
| 3065 } | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3066 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3067 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
|
3068 #endif |
| 7 | 3069 |
| 3070 y_idx = 0; | |
| 3071 lnum = oap->start.lnum; | |
| 3072 | |
| 3073 if (oap->block_mode) | |
| 3074 { | |
| 3075 /* Visual block mode */ | |
| 3076 y_current->y_type = MBLOCK; /* set the yank register type */ | |
| 3077 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
| 3078 | |
| 3079 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
| 3080 y_current->y_width--; | |
| 3081 } | |
| 3082 | |
| 3083 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
| 3084 { | |
| 3085 switch (y_current->y_type) | |
| 3086 { | |
| 3087 case MBLOCK: | |
| 3088 block_prep(oap, &bd, lnum, FALSE); | |
| 3089 if (yank_copy_line(&bd, y_idx) == FAIL) | |
| 3090 goto fail; | |
| 3091 break; | |
| 3092 | |
| 3093 case MLINE: | |
| 3094 if ((y_current->y_array[y_idx] = | |
| 3095 vim_strsave(ml_get(lnum))) == NULL) | |
| 3096 goto fail; | |
| 3097 break; | |
| 3098 | |
| 3099 case MCHAR: | |
| 3100 { | |
| 3101 colnr_T startcol = 0, endcol = MAXCOL; | |
| 3102 int is_oneChar = FALSE; | |
| 3103 colnr_T cs, ce; | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
3104 |
| 7 | 3105 p = ml_get(lnum); |
| 3106 bd.startspaces = 0; | |
| 3107 bd.endspaces = 0; | |
| 3108 | |
| 3109 if (lnum == oap->start.lnum) | |
| 3110 { | |
| 3111 startcol = oap->start.col; | |
| 3112 if (virtual_op) | |
| 3113 { | |
| 3114 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
| 3115 if (ce != cs && oap->start.coladd > 0) | |
| 3116 { | |
| 3117 /* Part of a tab selected -- but don't | |
| 3118 * double-count it. */ | |
| 3119 bd.startspaces = (ce - cs + 1) | |
| 3120 - oap->start.coladd; | |
| 3121 startcol++; | |
| 3122 } | |
| 3123 } | |
| 3124 } | |
| 3125 | |
| 3126 if (lnum == oap->end.lnum) | |
| 3127 { | |
| 3128 endcol = oap->end.col; | |
| 3129 if (virtual_op) | |
| 3130 { | |
| 3131 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
| 3132 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
| 3133 /* Don't add space for double-wide | |
| 3134 * char; endcol will be on last byte | |
| 3135 * of multi-byte char. */ | |
|
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3136 && (*mb_head_off)(p, p + endcol) == 0)) |
| 7 | 3137 { |
| 3138 if (oap->start.lnum == oap->end.lnum | |
| 3139 && oap->start.col == oap->end.col) | |
| 3140 { | |
| 3141 /* Special case: inside a single char */ | |
| 3142 is_oneChar = TRUE; | |
| 3143 bd.startspaces = oap->end.coladd | |
| 3144 - oap->start.coladd + oap->inclusive; | |
| 3145 endcol = startcol; | |
| 3146 } | |
| 3147 else | |
| 3148 { | |
| 3149 bd.endspaces = oap->end.coladd | |
| 3150 + oap->inclusive; | |
| 3151 endcol -= oap->inclusive; | |
| 3152 } | |
| 3153 } | |
| 3154 } | |
| 3155 } | |
| 3510 | 3156 if (endcol == MAXCOL) |
| 3157 endcol = (colnr_T)STRLEN(p); | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15597
diff
changeset
|
3158 if (startcol > endcol || is_oneChar) |
| 7 | 3159 bd.textlen = 0; |
| 3160 else | |
| 3161 bd.textlen = endcol - startcol + oap->inclusive; | |
| 3162 bd.textstart = p + startcol; | |
| 3163 if (yank_copy_line(&bd, y_idx) == FAIL) | |
| 3164 goto fail; | |
| 3165 break; | |
| 3166 } | |
| 3167 /* NOTREACHED */ | |
| 3168 } | |
| 3169 } | |
| 3170 | |
| 3171 if (curr != y_current) /* append the new block to the old block */ | |
| 3172 { | |
| 3173 new_ptr = (char_u **)lalloc((long_u)(sizeof(char_u *) * | |
| 3174 (curr->y_size + y_current->y_size)), TRUE); | |
| 3175 if (new_ptr == NULL) | |
| 3176 goto fail; | |
| 3177 for (j = 0; j < curr->y_size; ++j) | |
| 3178 new_ptr[j] = curr->y_array[j]; | |
| 3179 vim_free(curr->y_array); | |
| 3180 curr->y_array = new_ptr; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3181 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3182 curr->y_time_set = vim_time(); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3183 #endif |
| 7 | 3184 |
| 3185 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
| 3186 curr->y_type = MLINE; | |
| 3187 | |
| 164 | 3188 /* Concatenate the last line of the old block with the first line of |
| 3189 * the new block, unless being Vi compatible. */ | |
| 3190 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
| 7 | 3191 { |
| 3192 pnew = lalloc((long_u)(STRLEN(curr->y_array[curr->y_size - 1]) | |
| 3193 + STRLEN(y_current->y_array[0]) + 1), TRUE); | |
| 3194 if (pnew == NULL) | |
| 3195 { | |
| 3196 y_idx = y_current->y_size - 1; | |
| 3197 goto fail; | |
| 3198 } | |
| 3199 STRCPY(pnew, curr->y_array[--j]); | |
| 3200 STRCAT(pnew, y_current->y_array[0]); | |
| 3201 vim_free(curr->y_array[j]); | |
| 3202 vim_free(y_current->y_array[0]); | |
| 3203 curr->y_array[j++] = pnew; | |
| 3204 y_idx = 1; | |
| 3205 } | |
| 3206 else | |
| 3207 y_idx = 0; | |
| 3208 while (y_idx < y_current->y_size) | |
| 3209 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
| 3210 curr->y_size = j; | |
| 3211 vim_free(y_current->y_array); | |
| 3212 y_current = curr; | |
| 3213 } | |
| 5981 | 3214 if (curwin->w_p_rnu) |
| 3215 redraw_later(SOME_VALID); /* cursor moved to start */ | |
| 7 | 3216 if (mess) /* Display message about yank? */ |
| 3217 { | |
| 3218 if (yanktype == MCHAR | |
| 3219 && !oap->block_mode | |
| 3220 && yanklines == 1) | |
| 3221 yanklines = 0; | |
| 3222 /* Some versions of Vi use ">=" here, some don't... */ | |
| 3223 if (yanklines > p_report) | |
| 3224 { | |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3225 char namebuf[100]; |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3226 |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3227 if (oap->regname == NUL) |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3228 *namebuf = NUL; |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3229 else |
|
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3230 vim_snprintf(namebuf, sizeof(namebuf), |
|
11688
570f00932da8
patch 8.0.0727: message about what register to yank into is not translated
Christian Brabandt <cb@256bit.org>
parents:
11682
diff
changeset
|
3231 _(" into \"%c"), oap->regname); |
|
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3232 |
| 7 | 3233 /* redisplay now, so message is not deleted */ |
| 3234 update_topline_redraw(); | |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3235 if (oap->block_mode) |
| 205 | 3236 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
3237 smsg(NGETTEXT("block of %ld line yanked%s", |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3238 "block of %ld lines yanked%s", yanklines), |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3239 yanklines, namebuf); |
| 205 | 3240 } |
| 7 | 3241 else |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3242 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
3243 smsg(NGETTEXT("%ld line yanked%s", |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3244 "%ld lines yanked%s", yanklines), |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3245 yanklines, namebuf); |
|
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3246 } |
| 7 | 3247 } |
| 3248 } | |
| 3249 | |
| 3250 /* | |
| 3251 * Set "'[" and "']" marks. | |
| 3252 */ | |
| 3253 curbuf->b_op_start = oap->start; | |
| 3254 curbuf->b_op_end = oap->end; | |
| 5735 | 3255 if (yanktype == MLINE && !oap->block_mode) |
| 36 | 3256 { |
| 3257 curbuf->b_op_start.col = 0; | |
| 3258 curbuf->b_op_end.col = MAXCOL; | |
| 3259 } | |
| 7 | 3260 |
| 3261 #ifdef FEAT_CLIPBOARD | |
| 3262 /* | |
| 3263 * If we were yanking to the '*' register, send result to clipboard. | |
| 3264 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
| 3265 * to the '*' register. | |
| 3266 */ | |
| 3267 if (clip_star.available | |
| 3268 && (curr == &(y_regs[STAR_REGISTER]) | |
| 2654 | 3269 || (!deleting && oap->regname == 0 |
| 6116 | 3270 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
| 7 | 3271 { |
| 3272 if (curr != &(y_regs[STAR_REGISTER])) | |
| 3273 /* Copy the text from register 0 to the clipboard register. */ | |
| 3274 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
| 3275 | |
| 3276 clip_own_selection(&clip_star); | |
| 3277 clip_gen_set_selection(&clip_star); | |
| 2658 | 3278 # ifdef FEAT_X11 |
| 2654 | 3279 did_star = TRUE; |
| 2658 | 3280 # endif |
| 7 | 3281 } |
| 3282 | |
| 3283 # ifdef FEAT_X11 | |
| 3284 /* | |
| 3285 * If we were yanking to the '+' register, send result to selection. | |
| 3286 * Also copy to the '*' register, in case auto-select is off. | |
| 3287 */ | |
| 2654 | 3288 if (clip_plus.available |
| 3289 && (curr == &(y_regs[PLUS_REGISTER]) | |
| 3290 || (!deleting && oap->regname == 0 | |
| 6116 | 3291 && ((clip_unnamed | clip_unnamed_saved) & |
| 3292 CLIP_UNNAMED_PLUS)))) | |
| 7 | 3293 { |
| 2654 | 3294 if (curr != &(y_regs[PLUS_REGISTER])) |
| 3295 /* Copy the text from register 0 to the clipboard register. */ | |
| 3296 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
| 3297 | |
| 7 | 3298 clip_own_selection(&clip_plus); |
| 3299 clip_gen_set_selection(&clip_plus); | |
|
12642
d1cbe8cb05d0
patch 8.0.1199: when 'clipboard' is "autoselectplus" star register is set
Christian Brabandt <cb@256bit.org>
parents:
12329
diff
changeset
|
3300 if (!clip_isautosel_star() && !clip_isautosel_plus() |
|
d1cbe8cb05d0
patch 8.0.1199: when 'clipboard' is "autoselectplus" star register is set
Christian Brabandt <cb@256bit.org>
parents:
12329
diff
changeset
|
3301 && !did_star && curr == &(y_regs[PLUS_REGISTER])) |
| 7 | 3302 { |
| 3303 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
| 3304 clip_own_selection(&clip_star); | |
| 3305 clip_gen_set_selection(&clip_star); | |
| 3306 } | |
| 3307 } | |
| 3308 # endif | |
| 3309 #endif | |
| 3310 | |
|
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
3311 #if defined(FEAT_EVAL) |
|
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3312 if (!deleting && has_textyankpost()) |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3313 yank_do_autocmd(oap, y_current); |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3314 #endif |
|
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3315 |
| 7 | 3316 return OK; |
| 3317 | |
| 3318 fail: /* free the allocated lines */ | |
| 3319 free_yank(y_idx + 1); | |
| 3320 y_current = curr; | |
| 3321 return FAIL; | |
| 3322 } | |
| 3323 | |
| 3324 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3325 yank_copy_line(struct block_def *bd, long y_idx) |
| 7 | 3326 { |
| 3327 char_u *pnew; | |
| 3328 | |
| 3329 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
| 3330 == NULL) | |
| 3331 return FAIL; | |
| 3332 y_current->y_array[y_idx] = pnew; | |
| 6929 | 3333 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
| 7 | 3334 pnew += bd->startspaces; |
| 3335 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
| 3336 pnew += bd->textlen; | |
| 6929 | 3337 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
| 7 | 3338 pnew += bd->endspaces; |
| 3339 *pnew = NUL; | |
| 3340 return OK; | |
| 3341 } | |
| 3342 | |
| 3343 #ifdef FEAT_CLIPBOARD | |
| 3344 /* | |
| 3345 * Make a copy of the y_current register to register "reg". | |
| 3346 */ | |
| 3347 static void | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3348 copy_yank_reg(yankreg_T *reg) |
| 7 | 3349 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3350 yankreg_T *curr = y_current; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3351 long j; |
| 7 | 3352 |
| 3353 y_current = reg; | |
| 3354 free_yank_all(); | |
| 3355 *y_current = *curr; | |
| 3356 y_current->y_array = (char_u **)lalloc_clear( | |
| 3357 (long_u)(sizeof(char_u *) * y_current->y_size), TRUE); | |
| 3358 if (y_current->y_array == NULL) | |
| 3359 y_current->y_size = 0; | |
| 3360 else | |
| 3361 for (j = 0; j < y_current->y_size; ++j) | |
| 3362 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
| 3363 { | |
| 3364 free_yank(j); | |
| 3365 y_current->y_size = 0; | |
| 3366 break; | |
| 3367 } | |
| 3368 y_current = curr; | |
| 3369 } | |
| 3370 #endif | |
| 3371 | |
| 3372 /* | |
| 140 | 3373 * Put contents of register "regname" into the text. |
| 3374 * Caller must check "regname" to be valid! | |
| 3375 * "flags": PUT_FIXINDENT make indent look nice | |
| 3376 * PUT_CURSEND leave cursor after end of new text | |
| 3377 * PUT_LINE force linewise put (":put") | |
| 7 | 3378 */ |
| 3379 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3380 do_put( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3381 int regname, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3382 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
|
3383 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3384 int flags) |
| 7 | 3385 { |
| 3386 char_u *ptr; | |
| 3387 char_u *newp, *oldp; | |
| 3388 int yanklen; | |
| 3389 int totlen = 0; /* init for gcc */ | |
| 3390 linenr_T lnum; | |
| 3391 colnr_T col; | |
| 3392 long i; /* index in y_array[] */ | |
| 3393 int y_type; | |
| 3394 long y_size; | |
| 3395 int oldlen; | |
| 3396 long y_width = 0; | |
| 3397 colnr_T vcol; | |
| 3398 int delcount; | |
| 3399 int incr = 0; | |
| 3400 long j; | |
| 3401 struct block_def bd; | |
| 3402 char_u **y_array = NULL; | |
| 3403 long nr_lines = 0; | |
| 3404 pos_T new_cursor; | |
| 3405 int indent; | |
| 3406 int orig_indent = 0; /* init for gcc */ | |
| 3407 int indent_diff = 0; /* init for gcc */ | |
| 3408 int first_indent = TRUE; | |
| 3409 int lendiff = 0; | |
| 3410 pos_T old_pos; | |
| 3411 char_u *insert_string = NULL; | |
| 3412 int allocated = FALSE; | |
| 3413 long cnt; | |
| 3414 | |
| 3415 #ifdef FEAT_CLIPBOARD | |
| 3416 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
| 3417 adjust_clip_reg(®name); | |
| 3418 (void)may_get_selection(regname); | |
| 3419 #endif | |
| 3420 | |
| 3421 if (flags & PUT_FIXINDENT) | |
| 3422 orig_indent = get_indent(); | |
| 3423 | |
| 3424 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
| 3425 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
| 3426 | |
| 3427 /* | |
| 3428 * Using inserted text works differently, because the register includes | |
| 3429 * special characters (newlines, etc.). | |
| 3430 */ | |
| 3431 if (regname == '.') | |
| 3432 { | |
|
10494
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3433 if (VIsual_active) |
|
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3434 stuffcharReadbuff(VIsual_mode); |
| 7 | 3435 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : |
| 3436 (count == -1 ? 'O' : 'i')), count, FALSE); | |
| 3437 /* Putting the text is done later, so can't really move the cursor to | |
| 3438 * the next character. Use "l" to simulate it. */ | |
| 3439 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
| 3440 stuffcharReadbuff('l'); | |
| 3441 return; | |
| 3442 } | |
| 3443 | |
| 3444 /* | |
| 3445 * For special registers '%' (file name), '#' (alternate file name) and | |
| 3446 * ':' (last command line), etc. we have to create a fake yank register. | |
| 3447 */ | |
| 3448 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
| 3449 { | |
| 3450 if (insert_string == NULL) | |
| 3451 return; | |
| 3452 } | |
| 3453 | |
|
14202
51693b1a640e
patch 8.1.0118: duplicate error message for put command
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
3454 /* Autocommands may be executed when saving lines for undo. This might |
|
51693b1a640e
patch 8.1.0118: duplicate error message for put command
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
3455 * make "y_array" invalid, so we start undo now to avoid that. */ |
|
51693b1a640e
patch 8.1.0118: duplicate error message for put command
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
3456 if (u_save(curwin->w_cursor.lnum, curwin->w_cursor.lnum + 1) == FAIL) |
|
51693b1a640e
patch 8.1.0118: duplicate error message for put command
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
3457 goto end; |
| 4005 | 3458 |
| 7 | 3459 if (insert_string != NULL) |
| 3460 { | |
| 3461 y_type = MCHAR; | |
| 3462 #ifdef FEAT_EVAL | |
| 3463 if (regname == '=') | |
| 3464 { | |
| 3465 /* For the = register we need to split the string at NL | |
| 3093 | 3466 * characters. |
| 3467 * Loop twice: count the number of lines and save them. */ | |
| 7 | 3468 for (;;) |
| 3469 { | |
| 3470 y_size = 0; | |
| 3471 ptr = insert_string; | |
| 3472 while (ptr != NULL) | |
| 3473 { | |
| 3474 if (y_array != NULL) | |
| 3475 y_array[y_size] = ptr; | |
| 3476 ++y_size; | |
| 3477 ptr = vim_strchr(ptr, '\n'); | |
| 3478 if (ptr != NULL) | |
| 3479 { | |
| 3480 if (y_array != NULL) | |
| 3481 *ptr = NUL; | |
| 3482 ++ptr; | |
| 3093 | 3483 /* A trailing '\n' makes the register linewise. */ |
| 7 | 3484 if (*ptr == NUL) |
| 3485 { | |
| 3486 y_type = MLINE; | |
| 3487 break; | |
| 3488 } | |
| 3489 } | |
| 3490 } | |
| 3491 if (y_array != NULL) | |
| 3492 break; | |
| 3493 y_array = (char_u **)alloc((unsigned) | |
| 3494 (y_size * sizeof(char_u *))); | |
| 3495 if (y_array == NULL) | |
| 3496 goto end; | |
| 3497 } | |
| 3498 } | |
| 3499 else | |
| 3500 #endif | |
| 3501 { | |
| 3502 y_size = 1; /* use fake one-line yank register */ | |
| 3503 y_array = &insert_string; | |
| 3504 } | |
| 3505 } | |
| 3506 else | |
| 3507 { | |
| 3508 get_yank_register(regname, FALSE); | |
| 3509 | |
| 3510 y_type = y_current->y_type; | |
| 3511 y_width = y_current->y_width; | |
| 3512 y_size = y_current->y_size; | |
| 3513 y_array = y_current->y_array; | |
| 3514 } | |
| 3515 | |
| 3516 if (y_type == MLINE) | |
| 3517 { | |
| 3518 if (flags & PUT_LINE_SPLIT) | |
| 3519 { | |
| 6845 | 3520 char_u *p; |
| 3521 | |
| 7 | 3522 /* "p" or "P" in Visual mode: split the lines to put the text in |
| 3523 * between. */ | |
| 3524 if (u_save_cursor() == FAIL) | |
| 3525 goto end; | |
| 6845 | 3526 p = ml_get_cursor(); |
| 3527 if (dir == FORWARD && *p != NUL) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3528 MB_PTR_ADV(p); |
| 6845 | 3529 ptr = vim_strsave(p); |
| 7 | 3530 if (ptr == NULL) |
| 3531 goto end; | |
| 3532 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
| 3533 vim_free(ptr); | |
| 3534 | |
| 6845 | 3535 oldp = ml_get_curline(); |
| 3536 p = oldp + curwin->w_cursor.col; | |
| 3537 if (dir == FORWARD && *p != NUL) | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3538 MB_PTR_ADV(p); |
| 6845 | 3539 ptr = vim_strnsave(oldp, p - oldp); |
| 7 | 3540 if (ptr == NULL) |
| 3541 goto end; | |
| 3542 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
| 3543 ++nr_lines; | |
| 3544 dir = FORWARD; | |
| 3545 } | |
| 3546 if (flags & PUT_LINE_FORWARD) | |
| 3547 { | |
| 3548 /* Must be "p" for a Visual block, put lines below the block. */ | |
| 692 | 3549 curwin->w_cursor = curbuf->b_visual.vi_end; |
| 7 | 3550 dir = FORWARD; |
| 3551 } | |
| 3552 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
| 3553 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
| 3554 } | |
| 3555 | |
| 3556 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
| 3557 y_type = MLINE; | |
| 3558 | |
| 3559 if (y_size == 0 || y_array == NULL) | |
| 3560 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
3561 semsg(_("E353: Nothing in register %s"), |
| 7 | 3562 regname == 0 ? (char_u *)"\"" : transchar(regname)); |
| 3563 goto end; | |
| 3564 } | |
| 3565 | |
| 3566 if (y_type == MBLOCK) | |
| 3567 { | |
| 3568 lnum = curwin->w_cursor.lnum + y_size + 1; | |
| 3569 if (lnum > curbuf->b_ml.ml_line_count) | |
| 3570 lnum = curbuf->b_ml.ml_line_count + 1; | |
| 3571 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
| 3572 goto end; | |
| 3573 } | |
| 5735 | 3574 else if (y_type == MLINE) |
| 7 | 3575 { |
| 3576 lnum = curwin->w_cursor.lnum; | |
| 3577 #ifdef FEAT_FOLDING | |
| 3578 /* Correct line number for closed fold. Don't move the cursor yet, | |
| 3579 * u_save() uses it. */ | |
| 3580 if (dir == BACKWARD) | |
| 3581 (void)hasFolding(lnum, &lnum, NULL); | |
| 3582 else | |
| 3583 (void)hasFolding(lnum, NULL, &lnum); | |
| 3584 #endif | |
| 3585 if (dir == FORWARD) | |
| 3586 ++lnum; | |
|
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3587 /* 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
|
3588 * it in the saved lines. */ |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
3589 if ((BUFEMPTY() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
| 7 | 3590 goto end; |
| 3591 #ifdef FEAT_FOLDING | |
| 3592 if (dir == FORWARD) | |
| 3593 curwin->w_cursor.lnum = lnum - 1; | |
| 3594 else | |
| 3595 curwin->w_cursor.lnum = lnum; | |
| 3596 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
| 3597 #endif | |
| 3598 } | |
| 3599 else if (u_save_cursor() == FAIL) | |
| 3600 goto end; | |
| 3601 | |
| 3602 yanklen = (int)STRLEN(y_array[0]); | |
| 3603 | |
| 3604 if (ve_flags == VE_ALL && y_type == MCHAR) | |
| 3605 { | |
| 3606 if (gchar_cursor() == TAB) | |
| 3607 { | |
| 3608 /* Don't need to insert spaces when "p" on the last position of a | |
| 3609 * tab or "P" on the first position. */ | |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3610 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3611 int viscol = getviscol(); |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3612 if (dir == FORWARD |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3613 ? tabstop_padding(viscol, curbuf->b_p_ts, |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3614 curbuf->b_p_vts_array) != 1 |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3615 : curwin->w_cursor.coladd > 0) |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3616 coladvance_force(viscol); |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3617 #else |
| 7 | 3618 if (dir == FORWARD |
| 3619 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
| 3620 : curwin->w_cursor.coladd > 0) | |
| 3621 coladvance_force(getviscol()); | |
|
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3622 #endif |
| 7 | 3623 else |
| 3624 curwin->w_cursor.coladd = 0; | |
| 3625 } | |
| 3626 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
| 3627 coladvance_force(getviscol() + (dir == FORWARD)); | |
| 3628 } | |
| 3629 | |
| 3630 lnum = curwin->w_cursor.lnum; | |
| 3631 col = curwin->w_cursor.col; | |
| 3632 | |
| 3633 /* | |
| 3634 * Block mode | |
| 3635 */ | |
| 3636 if (y_type == MBLOCK) | |
| 3637 { | |
|
10664
94db9c08e206
patch 8.0.0222: blockwise put on multi-byte character misplaced
Christian Brabandt <cb@256bit.org>
parents:
10494
diff
changeset
|
3638 int c = gchar_cursor(); |
| 7 | 3639 colnr_T endcol2 = 0; |
| 3640 | |
| 3641 if (dir == FORWARD && c != NUL) | |
| 3642 { | |
| 3643 if (ve_flags == VE_ALL) | |
| 3644 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
| 3645 else | |
| 3646 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
| 3647 | |
| 3648 if (has_mbyte) | |
| 3649 /* move to start of next multi-byte character */ | |
| 474 | 3650 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
| 7 | 3651 else |
| 3652 if (c != TAB || ve_flags != VE_ALL) | |
| 3653 ++curwin->w_cursor.col; | |
| 3654 ++col; | |
| 3655 } | |
| 3656 else | |
| 3657 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
| 3658 | |
| 3659 col += curwin->w_cursor.coladd; | |
| 1304 | 3660 if (ve_flags == VE_ALL |
| 3661 && (curwin->w_cursor.coladd > 0 | |
| 3662 || endcol2 == curwin->w_cursor.col)) | |
| 7 | 3663 { |
| 3664 if (dir == FORWARD && c == NUL) | |
| 3665 ++col; | |
| 3666 if (dir != FORWARD && c != NUL) | |
| 3667 ++curwin->w_cursor.col; | |
| 3668 if (c == TAB) | |
| 3669 { | |
| 3670 if (dir == BACKWARD && curwin->w_cursor.col) | |
| 3671 curwin->w_cursor.col--; | |
| 3672 if (dir == FORWARD && col - 1 == endcol2) | |
| 3673 curwin->w_cursor.col++; | |
| 3674 } | |
| 3675 } | |
| 3676 curwin->w_cursor.coladd = 0; | |
| 699 | 3677 bd.textcol = 0; |
| 7 | 3678 for (i = 0; i < y_size; ++i) |
| 3679 { | |
| 3680 int spaces; | |
| 3681 char shortline; | |
| 3682 | |
| 3683 bd.startspaces = 0; | |
| 3684 bd.endspaces = 0; | |
| 3685 vcol = 0; | |
| 3686 delcount = 0; | |
| 3687 | |
| 3688 /* add a new line */ | |
| 3689 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
| 3690 { | |
| 3691 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
| 3692 (colnr_T)1, FALSE) == FAIL) | |
| 3693 break; | |
| 3694 ++nr_lines; | |
| 3695 } | |
| 3696 /* get the old line and advance to the position to insert at */ | |
| 3697 oldp = ml_get_curline(); | |
| 3698 oldlen = (int)STRLEN(oldp); | |
| 3699 for (ptr = oldp; vcol < col && *ptr; ) | |
| 3700 { | |
| 3701 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5995 | 3702 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
| 7 | 3703 vcol += incr; |
| 3704 } | |
| 3705 bd.textcol = (colnr_T)(ptr - oldp); | |
| 3706 | |
| 3707 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
| 3708 | |
| 3709 if (vcol < col) /* line too short, padd with spaces */ | |
| 3710 bd.startspaces = col - vcol; | |
| 3711 else if (vcol > col) | |
| 3712 { | |
| 3713 bd.endspaces = vcol - col; | |
| 3714 bd.startspaces = incr - bd.endspaces; | |
| 3715 --bd.textcol; | |
| 3716 delcount = 1; | |
| 3717 if (has_mbyte) | |
| 3718 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
| 3719 if (oldp[bd.textcol] != TAB) | |
| 3720 { | |
| 3721 /* Only a Tab can be split into spaces. Other | |
| 3722 * characters will have to be moved to after the | |
| 3723 * block, causing misalignment. */ | |
| 3724 delcount = 0; | |
| 3725 bd.endspaces = 0; | |
| 3726 } | |
| 3727 } | |
| 3728 | |
| 3729 yanklen = (int)STRLEN(y_array[i]); | |
| 3730 | |
| 3731 /* calculate number of spaces required to fill right side of block*/ | |
| 3732 spaces = y_width + 1; | |
| 3733 for (j = 0; j < yanklen; j++) | |
| 5995 | 3734 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
| 7 | 3735 if (spaces < 0) |
| 3736 spaces = 0; | |
| 3737 | |
| 3738 /* insert the new text */ | |
| 3739 totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces; | |
| 3740 newp = alloc_check((unsigned)totlen + oldlen + 1); | |
| 3741 if (newp == NULL) | |
| 3742 break; | |
| 3743 /* copy part up to cursor to new line */ | |
| 3744 ptr = newp; | |
| 3745 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
| 3746 ptr += bd.textcol; | |
| 3747 /* may insert some spaces before the new text */ | |
| 6929 | 3748 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
| 7 | 3749 ptr += bd.startspaces; |
| 3750 /* insert the new text */ | |
| 3751 for (j = 0; j < count; ++j) | |
| 3752 { | |
| 3753 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
| 3754 ptr += yanklen; | |
| 3755 | |
| 3756 /* insert block's trailing spaces only if there's text behind */ | |
| 3757 if ((j < count - 1 || !shortline) && spaces) | |
| 3758 { | |
| 6929 | 3759 vim_memset(ptr, ' ', (size_t)spaces); |
| 7 | 3760 ptr += spaces; |
| 3761 } | |
| 3762 } | |
| 3763 /* may insert some spaces after the new text */ | |
| 6929 | 3764 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
| 7 | 3765 ptr += bd.endspaces; |
| 3766 /* move the text after the cursor to the end of the line. */ | |
| 3767 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
| 3768 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
| 3769 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
| 3770 | |
| 3771 ++curwin->w_cursor.lnum; | |
| 3772 if (i == 0) | |
| 3773 curwin->w_cursor.col += bd.startspaces; | |
| 3774 } | |
| 3775 | |
| 3776 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
| 3777 | |
| 3778 /* Set '[ mark. */ | |
| 3779 curbuf->b_op_start = curwin->w_cursor; | |
| 3780 curbuf->b_op_start.lnum = lnum; | |
| 3781 | |
| 3782 /* adjust '] mark */ | |
| 3783 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
| 3784 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
| 3785 curbuf->b_op_end.coladd = 0; | |
| 3786 if (flags & PUT_CURSEND) | |
| 3787 { | |
| 916 | 3788 colnr_T len; |
| 3789 | |
| 7 | 3790 curwin->w_cursor = curbuf->b_op_end; |
| 3791 curwin->w_cursor.col++; | |
| 916 | 3792 |
| 3793 /* in Insert mode we might be after the NUL, correct for that */ | |
| 3794 len = (colnr_T)STRLEN(ml_get_curline()); | |
| 3795 if (curwin->w_cursor.col > len) | |
| 3796 curwin->w_cursor.col = len; | |
| 7 | 3797 } |
| 3798 else | |
| 3799 curwin->w_cursor.lnum = lnum; | |
| 3800 } | |
| 3801 else | |
| 3802 { | |
| 3803 /* | |
| 3804 * Character or Line mode | |
| 3805 */ | |
| 3806 if (y_type == MCHAR) | |
| 3807 { | |
| 3808 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
| 3809 * char */ | |
| 3810 if (dir == FORWARD && gchar_cursor() != NUL) | |
| 3811 { | |
| 3812 if (has_mbyte) | |
| 3813 { | |
| 474 | 3814 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
| 7 | 3815 |
| 3816 /* put it on the next of the multi-byte character. */ | |
| 3817 col += bytelen; | |
| 3818 if (yanklen) | |
| 3819 { | |
| 3820 curwin->w_cursor.col += bytelen; | |
| 3821 curbuf->b_op_end.col += bytelen; | |
| 3822 } | |
| 3823 } | |
| 3824 else | |
| 3825 { | |
| 3826 ++col; | |
| 3827 if (yanklen) | |
| 3828 { | |
| 3829 ++curwin->w_cursor.col; | |
| 3830 ++curbuf->b_op_end.col; | |
| 3831 } | |
| 3832 } | |
| 3833 } | |
| 3834 curbuf->b_op_start = curwin->w_cursor; | |
| 3835 } | |
| 3836 /* | |
| 3837 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
| 3838 */ | |
| 3839 else if (dir == BACKWARD) | |
| 3840 --lnum; | |
| 699 | 3841 new_cursor = curwin->w_cursor; |
| 7 | 3842 |
| 3843 /* | |
| 3844 * simple case: insert into current line | |
| 3845 */ | |
| 3846 if (y_type == MCHAR && y_size == 1) | |
| 3847 { | |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3848 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
|
3849 |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3850 if (VIsual_active) |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3851 { |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3852 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
|
3853 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
|
3854 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
|
3855 } |
|
10670
bce3eccea39a
patch 8.0.0225: put in Visual block mode terminates early
Christian Brabandt <cb@256bit.org>
parents:
10664
diff
changeset
|
3856 |
| 5365 | 3857 do { |
| 3858 totlen = count * yanklen; | |
| 3859 if (totlen > 0) | |
| 7 | 3860 { |
| 5365 | 3861 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
|
3862 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
|
3863 { |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3864 lnum++; |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3865 continue; |
|
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3866 } |
| 5365 | 3867 newp = alloc_check((unsigned)(STRLEN(oldp) + totlen + 1)); |
| 3868 if (newp == NULL) | |
| 3869 goto end; /* alloc() gave an error message */ | |
| 3870 mch_memmove(newp, oldp, (size_t)col); | |
| 3871 ptr = newp + col; | |
| 3872 for (i = 0; i < count; ++i) | |
| 3873 { | |
| 3874 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
| 3875 ptr += yanklen; | |
| 3876 } | |
| 3877 STRMOVE(ptr, oldp + col); | |
| 3878 ml_replace(lnum, newp, FALSE); | |
| 3879 /* Place cursor on last putted char. */ | |
| 3880 if (lnum == curwin->w_cursor.lnum) | |
| 5496 | 3881 { |
| 3882 /* make sure curwin->w_virtcol is updated */ | |
| 3883 changed_cline_bef_curs(); | |
| 5365 | 3884 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
| 5496 | 3885 } |
| 7 | 3886 } |
| 5365 | 3887 if (VIsual_active) |
| 3888 lnum++; | |
|
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3889 } while (VIsual_active && lnum <= end_lnum); |
| 5365 | 3890 |
| 6379 | 3891 if (VIsual_active) /* reset lnum to the last visual line */ |
| 3892 lnum--; | |
| 3893 | |
| 7 | 3894 curbuf->b_op_end = curwin->w_cursor; |
| 3895 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
| 3896 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
| 3897 ++curwin->w_cursor.col; | |
| 3898 changed_bytes(lnum, col); | |
| 3899 } | |
| 3900 else | |
| 3901 { | |
| 3902 /* | |
| 3903 * Insert at least one line. When y_type is MCHAR, break the first | |
| 3904 * line in two. | |
| 3905 */ | |
| 3906 for (cnt = 1; cnt <= count; ++cnt) | |
| 3907 { | |
| 3908 i = 0; | |
| 3909 if (y_type == MCHAR) | |
| 3910 { | |
| 3911 /* | |
| 3912 * Split the current line in two at the insert position. | |
| 3913 * First insert y_array[size - 1] in front of second line. | |
| 3914 * Then append y_array[0] to first line. | |
| 3915 */ | |
| 3916 lnum = new_cursor.lnum; | |
| 3917 ptr = ml_get(lnum) + col; | |
| 3918 totlen = (int)STRLEN(y_array[y_size - 1]); | |
| 3919 newp = alloc_check((unsigned)(STRLEN(ptr) + totlen + 1)); | |
| 3920 if (newp == NULL) | |
| 3921 goto error; | |
| 3922 STRCPY(newp, y_array[y_size - 1]); | |
| 3923 STRCAT(newp, ptr); | |
| 3924 /* insert second line */ | |
| 3925 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
| 3926 vim_free(newp); | |
| 3927 | |
| 3928 oldp = ml_get(lnum); | |
| 3929 newp = alloc_check((unsigned)(col + yanklen + 1)); | |
| 3930 if (newp == NULL) | |
| 3931 goto error; | |
| 3932 /* copy first part of line */ | |
| 3933 mch_memmove(newp, oldp, (size_t)col); | |
| 3934 /* append to first line */ | |
| 3935 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
| 3936 ml_replace(lnum, newp, FALSE); | |
| 3937 | |
| 3938 curwin->w_cursor.lnum = lnum; | |
| 3939 i = 1; | |
| 3940 } | |
| 3941 | |
| 3942 for (; i < y_size; ++i) | |
| 3943 { | |
| 3944 if ((y_type != MCHAR || i < y_size - 1) | |
| 3945 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
| 3946 == FAIL) | |
| 3947 goto error; | |
| 3948 lnum++; | |
| 3949 ++nr_lines; | |
| 3950 if (flags & PUT_FIXINDENT) | |
| 3951 { | |
| 3952 old_pos = curwin->w_cursor; | |
| 3953 curwin->w_cursor.lnum = lnum; | |
| 3954 ptr = ml_get(lnum); | |
| 3955 if (cnt == count && i == y_size - 1) | |
| 3956 lendiff = (int)STRLEN(ptr); | |
| 3957 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
| 3958 if (*ptr == '#' && preprocs_left()) | |
| 3959 indent = 0; /* Leave # lines at start */ | |
| 3960 else | |
| 3961 #endif | |
| 3962 if (*ptr == NUL) | |
| 3963 indent = 0; /* Ignore empty lines */ | |
| 3964 else if (first_indent) | |
| 3965 { | |
| 3966 indent_diff = orig_indent - get_indent(); | |
| 3967 indent = orig_indent; | |
| 3968 first_indent = FALSE; | |
| 3969 } | |
| 3970 else if ((indent = get_indent() + indent_diff) < 0) | |
| 3971 indent = 0; | |
| 3972 (void)set_indent(indent, 0); | |
| 3973 curwin->w_cursor = old_pos; | |
| 3974 /* remember how many chars were removed */ | |
| 3975 if (cnt == count && i == y_size - 1) | |
| 3976 lendiff -= (int)STRLEN(ml_get(lnum)); | |
| 3977 } | |
| 3978 } | |
| 3979 } | |
| 3980 | |
| 3981 error: | |
| 3982 /* Adjust marks. */ | |
| 3983 if (y_type == MLINE) | |
| 3984 { | |
| 3985 curbuf->b_op_start.col = 0; | |
| 3986 if (dir == FORWARD) | |
| 3987 curbuf->b_op_start.lnum++; | |
| 3988 } | |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3989 /* Skip mark_adjust when adding lines after the last one, there |
|
11065
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
3990 * can't be marks there. But still needed in diff mode. */ |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3991 if (curbuf->b_op_start.lnum + (y_type == MCHAR) - 1 + nr_lines |
|
11065
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
3992 < curbuf->b_ml.ml_line_count |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
3993 #ifdef FEAT_DIFF |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
3994 || curwin->w_p_diff |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
3995 #endif |
|
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
3996 ) |
|
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
3997 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
| 7 | 3998 (linenr_T)MAXLNUM, nr_lines, 0L); |
| 3999 | |
| 4000 /* note changed text for displaying and folding */ | |
| 4001 if (y_type == MCHAR) | |
| 4002 changed_lines(curwin->w_cursor.lnum, col, | |
| 4003 curwin->w_cursor.lnum + 1, nr_lines); | |
| 4004 else | |
| 4005 changed_lines(curbuf->b_op_start.lnum, 0, | |
| 4006 curbuf->b_op_start.lnum, nr_lines); | |
| 4007 | |
| 4008 /* put '] mark at last inserted character */ | |
| 4009 curbuf->b_op_end.lnum = lnum; | |
| 4010 /* correct length for change in indent */ | |
| 4011 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
| 4012 if (col > 1) | |
| 4013 curbuf->b_op_end.col = col - 1; | |
| 4014 else | |
| 4015 curbuf->b_op_end.col = 0; | |
| 4016 | |
| 168 | 4017 if (flags & PUT_CURSLINE) |
| 4018 { | |
| 237 | 4019 /* ":put": put cursor on last inserted line */ |
| 168 | 4020 curwin->w_cursor.lnum = lnum; |
| 4021 beginline(BL_WHITE | BL_FIX); | |
| 4022 } | |
| 4023 else if (flags & PUT_CURSEND) | |
| 7 | 4024 { |
| 4025 /* put cursor after inserted text */ | |
| 4026 if (y_type == MLINE) | |
| 4027 { | |
| 4028 if (lnum >= curbuf->b_ml.ml_line_count) | |
| 4029 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
| 4030 else | |
| 4031 curwin->w_cursor.lnum = lnum + 1; | |
| 4032 curwin->w_cursor.col = 0; | |
| 4033 } | |
| 4034 else | |
| 4035 { | |
| 4036 curwin->w_cursor.lnum = lnum; | |
| 4037 curwin->w_cursor.col = col; | |
| 4038 } | |
| 4039 } | |
| 4040 else if (y_type == MLINE) | |
| 4041 { | |
| 168 | 4042 /* put cursor on first non-blank in first inserted line */ |
| 7 | 4043 curwin->w_cursor.col = 0; |
| 4044 if (dir == FORWARD) | |
| 4045 ++curwin->w_cursor.lnum; | |
| 4046 beginline(BL_WHITE | BL_FIX); | |
| 4047 } | |
| 4048 else /* put cursor on first inserted character */ | |
| 4049 curwin->w_cursor = new_cursor; | |
| 4050 } | |
| 4051 } | |
| 4052 | |
| 4053 msgmore(nr_lines); | |
| 4054 curwin->w_set_curswant = TRUE; | |
| 4055 | |
| 4056 end: | |
| 4057 if (allocated) | |
| 4058 vim_free(insert_string); | |
| 840 | 4059 if (regname == '=') |
| 4060 vim_free(y_array); | |
| 4061 | |
| 5380 | 4062 VIsual_active = FALSE; |
| 4063 | |
| 140 | 4064 /* If the cursor is past the end of the line put it at the end. */ |
| 844 | 4065 adjust_cursor_eol(); |
| 4066 } | |
| 4067 | |
| 4068 /* | |
| 4069 * When the cursor is on the NUL past the end of the line and it should not be | |
| 4070 * there move it left. | |
| 4071 */ | |
| 4072 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4073 adjust_cursor_eol(void) |
| 844 | 4074 { |
| 4075 if (curwin->w_cursor.col > 0 | |
| 4076 && gchar_cursor() == NUL | |
| 773 | 4077 && (ve_flags & VE_ONEMORE) == 0 |
| 7 | 4078 && !(restart_edit || (State & INSERT))) |
| 4079 { | |
| 557 | 4080 /* Put the cursor on the last character in the line. */ |
| 555 | 4081 dec_cursor(); |
| 844 | 4082 |
| 7 | 4083 if (ve_flags == VE_ALL) |
| 557 | 4084 { |
| 4085 colnr_T scol, ecol; | |
| 4086 | |
| 4087 /* Coladd is set to the width of the last character. */ | |
| 4088 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
| 4089 curwin->w_cursor.coladd = ecol - scol + 1; | |
| 4090 } | |
| 7 | 4091 } |
| 4092 } | |
| 4093 | |
| 4094 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
| 4095 /* | |
| 4096 * Return TRUE if lines starting with '#' should be left aligned. | |
| 4097 */ | |
| 4098 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4099 preprocs_left(void) |
| 7 | 4100 { |
| 4101 return | |
| 4102 # ifdef FEAT_SMARTINDENT | |
| 4103 # ifdef FEAT_CINDENT | |
| 4104 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
| 4105 # else | |
| 4106 curbuf->b_p_si | |
| 4107 # endif | |
| 4108 # endif | |
| 4109 # ifdef FEAT_CINDENT | |
| 5438 | 4110 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
| 4111 && curbuf->b_ind_hash_comment == 0) | |
| 7 | 4112 # endif |
| 4113 ; | |
| 4114 } | |
| 4115 #endif | |
| 4116 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4117 /* |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4118 * 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
|
4119 */ |
| 7 | 4120 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4121 get_register_name(int num) |
| 7 | 4122 { |
| 4123 if (num == -1) | |
| 4124 return '"'; | |
| 4125 else if (num < 10) | |
| 4126 return num + '0'; | |
| 4127 else if (num == DELETION_REGISTER) | |
| 4128 return '-'; | |
| 4129 #ifdef FEAT_CLIPBOARD | |
| 4130 else if (num == STAR_REGISTER) | |
| 4131 return '*'; | |
| 4132 else if (num == PLUS_REGISTER) | |
| 4133 return '+'; | |
| 4134 #endif | |
| 4135 else | |
| 4136 { | |
| 4137 #ifdef EBCDIC | |
| 4138 int i; | |
| 4139 | |
| 4140 /* EBCDIC is really braindead ... */ | |
| 4141 i = 'a' + (num - 10); | |
| 4142 if (i > 'i') | |
| 4143 i += 7; | |
| 4144 if (i > 'r') | |
| 4145 i += 8; | |
| 4146 return i; | |
| 4147 #else | |
| 4148 return num + 'a' - 10; | |
| 4149 #endif | |
| 4150 } | |
| 4151 } | |
| 4152 | |
| 4153 /* | |
| 4154 * ":dis" and ":registers": Display the contents of the yank registers. | |
| 4155 */ | |
| 4156 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4157 ex_display(exarg_T *eap) |
| 7 | 4158 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4159 int i, n; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4160 long j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4161 char_u *p; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4162 yankreg_T *yb; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4163 int name; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4164 int attr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4165 char_u *arg = eap->arg; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4166 int clen; |
| 7 | 4167 |
| 4168 if (arg != NULL && *arg == NUL) | |
| 4169 arg = NULL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
4170 attr = HL_ATTR(HLF_8); |
| 7 | 4171 |
| 4172 /* Highlight title */ | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4173 msg_puts_title(_("\n--- Registers ---")); |
| 7 | 4174 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) |
| 4175 { | |
| 4176 name = get_register_name(i); | |
| 2644 | 4177 if (arg != NULL && vim_strchr(arg, name) == NULL |
| 4178 #ifdef ONE_CLIPBOARD | |
| 4179 /* Star register and plus register contain the same thing. */ | |
| 4180 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
| 4181 #endif | |
| 4182 ) | |
| 7 | 4183 continue; /* did not ask for this register */ |
| 4184 | |
| 4185 #ifdef FEAT_CLIPBOARD | |
| 4186 /* Adjust register name for "unnamed" in 'clipboard'. | |
| 4187 * When it's a clipboard register, fill it with the current contents | |
| 4188 * of the clipboard. */ | |
| 4189 adjust_clip_reg(&name); | |
| 4190 (void)may_get_selection(name); | |
| 4191 #endif | |
| 4192 | |
| 4193 if (i == -1) | |
| 4194 { | |
| 4195 if (y_previous != NULL) | |
| 4196 yb = y_previous; | |
| 4197 else | |
| 4198 yb = &(y_regs[0]); | |
| 4199 } | |
| 4200 else | |
| 4201 yb = &(y_regs[i]); | |
| 2000 | 4202 |
| 4203 #ifdef FEAT_EVAL | |
| 4204 if (name == MB_TOLOWER(redir_reg) | |
| 4205 || (redir_reg == '"' && yb == y_previous)) | |
| 4206 continue; /* do not list register being written to, the | |
| 4207 * pointer can be freed */ | |
| 4208 #endif | |
| 4209 | |
| 7 | 4210 if (yb->y_array != NULL) |
| 4211 { | |
| 4212 msg_putchar('\n'); | |
| 4213 msg_putchar('"'); | |
| 4214 msg_putchar(name); | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4215 msg_puts(" "); |
| 7 | 4216 |
| 4217 n = (int)Columns - 6; | |
| 4218 for (j = 0; j < yb->y_size && n > 1; ++j) | |
| 4219 { | |
| 4220 if (j) | |
| 4221 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4222 msg_puts_attr("^J", attr); |
| 7 | 4223 n -= 2; |
| 4224 } | |
| 4225 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
| 4226 { | |
| 474 | 4227 clen = (*mb_ptr2len)(p); |
| 22 | 4228 msg_outtrans_len(p, clen); |
| 4229 p += clen - 1; | |
| 7 | 4230 } |
| 4231 } | |
| 4232 if (n > 1 && yb->y_type == MLINE) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4233 msg_puts_attr("^J", attr); |
| 7 | 4234 out_flush(); /* show one line at a time */ |
| 4235 } | |
| 4236 ui_breakcheck(); | |
| 4237 } | |
| 4238 | |
| 4239 /* | |
| 4240 * display last inserted text | |
| 4241 */ | |
| 4242 if ((p = get_last_insert()) != NULL | |
| 4243 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
| 4244 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4245 msg_puts("\n\". "); |
| 7 | 4246 dis_msg(p, TRUE); |
| 4247 } | |
| 4248 | |
| 4249 /* | |
| 4250 * display last command line | |
| 4251 */ | |
| 4252 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
| 4253 && !got_int) | |
| 4254 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4255 msg_puts("\n\": "); |
| 7 | 4256 dis_msg(last_cmdline, FALSE); |
| 4257 } | |
| 4258 | |
| 4259 /* | |
| 4260 * display current file name | |
| 4261 */ | |
| 4262 if (curbuf->b_fname != NULL | |
| 4263 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
| 4264 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4265 msg_puts("\n\"% "); |
| 7 | 4266 dis_msg(curbuf->b_fname, FALSE); |
| 4267 } | |
| 4268 | |
| 4269 /* | |
| 4270 * display alternate file name | |
| 4271 */ | |
| 4272 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
| 4273 { | |
| 4274 char_u *fname; | |
| 4275 linenr_T dummy; | |
| 4276 | |
| 4277 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
| 4278 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4279 msg_puts("\n\"# "); |
| 7 | 4280 dis_msg(fname, FALSE); |
| 4281 } | |
| 4282 } | |
| 4283 | |
| 4284 /* | |
| 4285 * display last search pattern | |
| 4286 */ | |
| 4287 if (last_search_pat() != NULL | |
| 4288 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
| 4289 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4290 msg_puts("\n\"/ "); |
| 7 | 4291 dis_msg(last_search_pat(), FALSE); |
| 4292 } | |
| 4293 | |
| 4294 #ifdef FEAT_EVAL | |
| 4295 /* | |
| 4296 * display last used expression | |
| 4297 */ | |
| 4298 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
| 4299 && !got_int) | |
| 4300 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
4301 msg_puts("\n\"= "); |
| 7 | 4302 dis_msg(expr_line, FALSE); |
| 4303 } | |
| 4304 #endif | |
| 4305 } | |
| 4306 | |
| 4307 /* | |
| 4308 * display a string for do_dis() | |
| 4309 * truncate at end of screen line | |
| 4310 */ | |
| 4311 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4312 dis_msg( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4313 char_u *p, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4314 int skip_esc) /* if TRUE, ignore trailing ESC */ |
| 7 | 4315 { |
| 4316 int n; | |
| 4317 int l; | |
| 4318 | |
| 4319 n = (int)Columns - 6; | |
| 4320 while (*p != NUL | |
| 4321 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
| 4322 && (n -= ptr2cells(p)) >= 0) | |
| 4323 { | |
| 474 | 4324 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
| 7 | 4325 { |
| 4326 msg_outtrans_len(p, l); | |
| 4327 p += l; | |
| 4328 } | |
| 4329 else | |
| 4330 msg_outtrans_len(p++, 1); | |
| 4331 } | |
| 4332 ui_breakcheck(); | |
| 4333 } | |
| 4334 | |
| 3562 | 4335 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4336 /* | |
| 4337 * If "process" is TRUE and the line begins with a comment leader (possibly | |
| 4338 * after some white space), return a pointer to the text after it. Put a boolean | |
| 4339 * value indicating whether the line ends with an unclosed comment in | |
| 4340 * "is_comment". | |
| 4341 * line - line to be processed, | |
| 4342 * process - if FALSE, will only check whether the line ends with an unclosed | |
| 3584 | 4343 * comment, |
| 3562 | 4344 * include_space - whether to also skip space following the comment leader, |
| 4345 * is_comment - will indicate whether the current line ends with an unclosed | |
| 3584 | 4346 * comment. |
| 3562 | 4347 */ |
|
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4348 char_u * |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4349 skip_comment( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4350 char_u *line, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4351 int process, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4352 int include_space, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4353 int *is_comment) |
| 3562 | 4354 { |
| 4355 char_u *comment_flags = NULL; | |
| 4356 int lead_len; | |
| 4357 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
| 4358 | |
| 4359 *is_comment = FALSE; | |
| 4360 if (leader_offset != -1) | |
| 4361 { | |
| 4362 /* Let's check whether the line ends with an unclosed comment. | |
| 4363 * If the last comment leader has COM_END in flags, there's no comment. | |
| 4364 */ | |
| 4365 while (*comment_flags) | |
| 4366 { | |
| 4367 if (*comment_flags == COM_END | |
| 4368 || *comment_flags == ':') | |
| 4369 break; | |
| 4370 ++comment_flags; | |
| 4371 } | |
| 4372 if (*comment_flags != COM_END) | |
| 4373 *is_comment = TRUE; | |
| 4374 } | |
| 4375 | |
| 4376 if (process == FALSE) | |
| 4377 return line; | |
| 4378 | |
| 4379 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
| 4380 | |
| 4381 if (lead_len == 0) | |
| 4382 return line; | |
| 4383 | |
| 4384 /* Find: | |
| 4385 * - COM_END, | |
| 4386 * - colon, | |
| 4387 * whichever comes first. | |
| 4388 */ | |
| 4389 while (*comment_flags) | |
| 4390 { | |
| 3580 | 4391 if (*comment_flags == COM_END |
| 3562 | 4392 || *comment_flags == ':') |
| 4393 break; | |
| 4394 ++comment_flags; | |
| 4395 } | |
| 4396 | |
| 4397 /* If we found a colon, it means that we are not processing a line | |
| 3580 | 4398 * starting with a closing part of a three-part comment. That's good, |
| 4399 * because we don't want to remove those as this would be annoying. | |
| 3562 | 4400 */ |
| 4401 if (*comment_flags == ':' || *comment_flags == NUL) | |
| 4402 line += lead_len; | |
| 4403 | |
| 4404 return line; | |
| 4405 } | |
| 4406 #endif | |
| 4407 | |
| 7 | 4408 /* |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4409 * 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
|
4410 * When "save_undo" is TRUE save lines for undo first. |
| 5848 | 4411 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
| 4412 * leaders should not be removed. | |
| 4413 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
| 4414 * to set those marks. | |
| 7 | 4415 * |
| 1217 | 4416 * return FAIL for failure, OK otherwise |
| 7 | 4417 */ |
| 4418 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4419 do_join( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4420 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4421 int insert_space, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4422 int save_undo, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4423 int use_formatoptions UNUSED, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4424 int setmark) |
| 7 | 4425 { |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4426 char_u *curr = NULL; |
| 2597 | 4427 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
|
4428 char_u *cend; |
| 7 | 4429 char_u *newp; |
| 2597 | 4430 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
|
4431 int endcurr1 = NUL; |
|
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4432 int endcurr2 = NUL; |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4433 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
|
4434 int sumsize = 0; /* size of the long new line */ |
| 7 | 4435 linenr_T t; |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4436 colnr_T col = 0; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4437 int ret = OK; |
| 3562 | 4438 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 3574 | 4439 int *comments = NULL; |
| 3562 | 4440 int remove_comments = (use_formatoptions == TRUE) |
| 4441 && has_format_option(FO_REMOVE_COMS); | |
| 4442 int prev_was_comment; | |
| 4443 #endif | |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4444 #ifdef FEAT_TEXT_PROP |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4445 textprop_T **prop_lines = NULL; |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4446 int *prop_lengths = NULL; |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4447 #endif |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4448 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4449 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
|
4450 (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
|
4451 return FAIL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4452 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4453 /* 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
|
4454 * 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
|
4455 * 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
|
4456 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
|
4457 if (spaces == NULL) |
| 7 | 4458 return FAIL; |
| 3562 | 4459 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4460 if (remove_comments) | |
| 4461 { | |
| 4462 comments = (int *)lalloc_clear((long_u)count * sizeof(int), TRUE); | |
| 4463 if (comments == NULL) | |
| 4464 { | |
| 4465 vim_free(spaces); | |
| 4466 return FAIL; | |
| 4467 } | |
| 4468 } | |
| 4469 #endif | |
| 7 | 4470 |
| 4471 /* | |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4472 * Don't move anything yet, just compute the final line length |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4473 * and setup the array of space strings lengths |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4474 * This loops forward over the joined lines. |
| 7 | 4475 */ |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4476 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
|
4477 { |
| 2597 | 4478 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
| 5848 | 4479 if (t == 0 && setmark) |
| 5664 | 4480 { |
| 4481 /* Set the '[ mark. */ | |
| 4482 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
| 4483 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
| 4484 } | |
| 3562 | 4485 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4486 if (remove_comments) | |
| 4487 { | |
| 4488 /* We don't want to remove the comment leader if the | |
| 4489 * previous line is not a comment. */ | |
| 4490 if (t > 0 && prev_was_comment) | |
| 4491 { | |
| 4492 | |
| 4493 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
| 4494 &prev_was_comment); | |
| 3576 | 4495 comments[t] = (int)(new_curr - curr); |
| 3562 | 4496 curr = new_curr; |
| 4497 } | |
| 4498 else | |
| 4499 curr = skip_comment(curr, FALSE, insert_space, | |
| 4500 &prev_was_comment); | |
| 4501 } | |
| 4502 #endif | |
| 4503 | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4504 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
|
4505 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4506 curr = skipwhite(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4507 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
|
4508 && (!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
|
4509 || (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
|
4510 && (!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
|
4511 || 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
|
4512 ) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4513 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4514 /* 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
|
4515 if (endcurr1 == ' ') |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4516 endcurr1 = endcurr2; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4517 else |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4518 ++spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4519 /* 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
|
4520 if ( p_js |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4521 && (endcurr1 == '.' |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4522 || (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
|
4523 && (endcurr1 == '?' || endcurr1 == '!')))) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4524 ++spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4525 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4526 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4527 currsize = (int)STRLEN(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4528 sumsize += currsize + spaces[t]; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4529 endcurr1 = endcurr2 = NUL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4530 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
|
4531 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4532 if (has_mbyte) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4533 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4534 cend = curr + currsize; |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4535 MB_PTR_BACK(curr, cend); |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4536 endcurr1 = (*mb_ptr2char)(cend); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4537 if (cend > curr) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4538 { |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4539 MB_PTR_BACK(curr, cend); |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4540 endcurr2 = (*mb_ptr2char)(cend); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4541 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4542 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4543 else |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4544 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4545 endcurr1 = *(curr + currsize - 1); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4546 if (currsize > 1) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4547 endcurr2 = *(curr + currsize - 2); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4548 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4549 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4550 line_breakcheck(); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4551 if (got_int) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4552 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4553 ret = FAIL; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4554 goto theend; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4555 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4556 } |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4557 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4558 /* 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
|
4559 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
|
4560 |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4561 /* 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
|
4562 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
|
4563 cend = newp + sumsize; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4564 *cend = 0; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4565 |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4566 #ifdef FEAT_TEXT_PROP |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4567 // We need to move properties of the lines that are going to be deleted to |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4568 // the new long one. |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4569 if (curbuf->b_has_textprop && !text_prop_frozen) |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4570 { |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4571 // Allocate an array to copy the text properties of joined lines into. |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4572 // And another array to store the number of properties in each line. |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4573 prop_lines = (textprop_T **)alloc_clear( |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4574 (int)(count - 1) * sizeof(textprop_T *)); |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4575 prop_lengths = (int *)alloc_clear((int)(count - 1) * sizeof(int)); |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4576 if (prop_lengths == NULL) |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4577 VIM_CLEAR(prop_lines); |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4578 } |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4579 #endif |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4580 |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4581 /* |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4582 * Move affected lines to the new long one. |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4583 * This loops backwards over the joined lines, including the original line. |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4584 * |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4585 * 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
|
4586 * 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
|
4587 * 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
|
4588 */ |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4589 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
|
4590 { |
|
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4591 int spaces_removed; |
|
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4592 |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4593 cend -= currsize; |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4594 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
|
4595 if (spaces[t] > 0) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4596 { |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4597 cend -= spaces[t]; |
| 6929 | 4598 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
|
4599 } |
|
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4600 |
|
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4601 // If deleting more spaces than adding, the cursor moves no more than |
|
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4602 // what is added if it is inside these spaces. |
|
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4603 spaces_removed = (curr - curr_start) - spaces[t]; |
|
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4604 |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4605 mark_col_adjust(curwin->w_cursor.lnum + t, (colnr_T)0, (linenr_T)-t, |
|
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4606 (long)(cend - newp - spaces_removed), spaces_removed); |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4607 if (t == 0) |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4608 break; |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4609 #ifdef FEAT_TEXT_PROP |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4610 if (prop_lines != NULL) |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4611 adjust_props_for_join(curwin->w_cursor.lnum + t, |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4612 prop_lines + t - 1, prop_lengths + t - 1, |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4613 (long)(cend - newp - spaces_removed), spaces_removed); |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4614 #endif |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4615 |
| 2597 | 4616 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1)); |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4617 #if defined(FEAT_COMMENTS) |
| 3562 | 4618 if (remove_comments) |
| 4619 curr += comments[t - 1]; | |
| 4620 #endif | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4621 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
|
4622 curr = skipwhite(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4623 currsize = (int)STRLEN(curr); |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4624 } |
|
16678
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4625 |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4626 #ifdef FEAT_TEXT_PROP |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4627 if (prop_lines != NULL) |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4628 join_prop_lines(curwin->w_cursor.lnum, newp, |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4629 prop_lines, prop_lengths, count); |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4630 else |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4631 #endif |
|
6f453673eb19
patch 8.1.1341: text properties are lost when joining lines
Bram Moolenaar <Bram@vim.org>
parents:
16429
diff
changeset
|
4632 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
| 7 | 4633 |
| 5848 | 4634 if (setmark) |
| 4635 { | |
| 4636 /* Set the '] mark. */ | |
| 4637 curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; | |
|
16680
c263acbbd961
patch 8.1.1342: using freed memory when joining line with text property
Bram Moolenaar <Bram@vim.org>
parents:
16678
diff
changeset
|
4638 curwin->w_buffer->b_op_end.col = (colnr_T)sumsize; |
| 5848 | 4639 } |
| 5664 | 4640 |
| 7 | 4641 /* Only report the change in the first line here, del_lines() will report |
| 4642 * the deleted line. */ | |
| 4643 changed_lines(curwin->w_cursor.lnum, currsize, | |
| 4644 curwin->w_cursor.lnum + 1, 0L); | |
| 4645 /* | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4646 * Delete following lines. To do this we move the cursor there |
| 7 | 4647 * briefly, and then move it back. After del_lines() the cursor may |
| 4648 * have moved up (last line deleted), so the current lnum is kept in t. | |
| 4649 */ | |
| 4650 t = curwin->w_cursor.lnum; | |
| 4651 ++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
|
4652 del_lines(count - 1, FALSE); |
| 7 | 4653 curwin->w_cursor.lnum = t; |
| 4654 | |
| 4655 /* | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4656 * Set the cursor column: |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4657 * 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
|
4658 * vim: use the column of the last join |
| 7 | 4659 */ |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4660 curwin->w_cursor.col = |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4661 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
| 7 | 4662 check_cursor_col(); |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4663 |
| 7 | 4664 curwin->w_cursor.coladd = 0; |
| 4665 curwin->w_set_curswant = TRUE; | |
| 4666 | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4667 theend: |
|
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4668 vim_free(spaces); |
| 3562 | 4669 #if defined(FEAT_COMMENTS) || defined(PROTO) |
| 4670 if (remove_comments) | |
| 4671 vim_free(comments); | |
| 4672 #endif | |
|
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4673 return ret; |
| 7 | 4674 } |
| 4675 | |
| 4676 #ifdef FEAT_COMMENTS | |
| 4677 /* | |
| 4678 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
| 4679 * the first line. White-space is ignored. Note that the whole of | |
| 4680 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
| 4681 */ | |
| 4682 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4683 same_leader( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4684 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4685 int leader1_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4686 char_u *leader1_flags, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4687 int leader2_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4688 char_u *leader2_flags) |
| 7 | 4689 { |
| 4690 int idx1 = 0, idx2 = 0; | |
| 4691 char_u *p; | |
| 4692 char_u *line1; | |
| 4693 char_u *line2; | |
| 4694 | |
| 4695 if (leader1_len == 0) | |
| 4696 return (leader2_len == 0); | |
| 4697 | |
| 4698 /* | |
| 4699 * If first leader has 'f' flag, the lines can be joined only if the | |
| 4700 * second line does not have a leader. | |
| 4701 * If first leader has 'e' flag, the lines can never be joined. | |
| 4702 * If fist leader has 's' flag, the lines can only be joined if there is | |
| 4703 * some text after it and the second line has the 'm' flag. | |
| 4704 */ | |
| 4705 if (leader1_flags != NULL) | |
| 4706 { | |
| 4707 for (p = leader1_flags; *p && *p != ':'; ++p) | |
| 4708 { | |
| 4709 if (*p == COM_FIRST) | |
| 4710 return (leader2_len == 0); | |
| 4711 if (*p == COM_END) | |
| 4712 return FALSE; | |
| 4713 if (*p == COM_START) | |
| 4714 { | |
| 4715 if (*(ml_get(lnum) + leader1_len) == NUL) | |
| 4716 return FALSE; | |
| 4717 if (leader2_flags == NULL || leader2_len == 0) | |
| 4718 return FALSE; | |
| 4719 for (p = leader2_flags; *p && *p != ':'; ++p) | |
| 4720 if (*p == COM_MIDDLE) | |
| 4721 return TRUE; | |
| 4722 return FALSE; | |
| 4723 } | |
| 4724 } | |
| 4725 } | |
| 4726 | |
| 4727 /* | |
| 4728 * Get current line and next line, compare the leaders. | |
| 4729 * The first line has to be saved, only one line can be locked at a time. | |
| 4730 */ | |
| 4731 line1 = vim_strsave(ml_get(lnum)); | |
| 4732 if (line1 != NULL) | |
| 4733 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4734 for (idx1 = 0; VIM_ISWHITE(line1[idx1]); ++idx1) |
| 7 | 4735 ; |
| 4736 line2 = ml_get(lnum + 1); | |
| 4737 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
| 4738 { | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4739 if (!VIM_ISWHITE(line2[idx2])) |
| 7 | 4740 { |
| 4741 if (line1[idx1++] != line2[idx2]) | |
| 4742 break; | |
| 4743 } | |
| 4744 else | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4745 while (VIM_ISWHITE(line1[idx1])) |
| 7 | 4746 ++idx1; |
| 4747 } | |
| 4748 vim_free(line1); | |
| 4749 } | |
| 4750 return (idx2 == leader2_len && idx1 == leader1_len); | |
| 4751 } | |
| 4752 #endif | |
| 4753 | |
| 4754 /* | |
| 3252 | 4755 * Implementation of the format operator 'gq'. |
| 7 | 4756 */ |
| 4757 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4758 op_format( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4759 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4760 int keep_cursor) /* keep cursor on same text char */ |
| 7 | 4761 { |
| 4762 long old_line_count = curbuf->b_ml.ml_line_count; | |
| 4763 | |
| 4764 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
| 4765 * can put it back there. */ | |
| 4766 curwin->w_cursor = oap->cursor_start; | |
| 4767 | |
| 4768 if (u_save((linenr_T)(oap->start.lnum - 1), | |
| 4769 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
| 4770 return; | |
| 4771 curwin->w_cursor = oap->start; | |
| 4772 | |
| 4773 if (oap->is_VIsual) | |
| 4774 /* When there is no change: need to remove the Visual selection */ | |
| 4775 redraw_curbuf_later(INVERTED); | |
| 4776 | |
| 4777 /* Set '[ mark at the start of the formatted area */ | |
| 4778 curbuf->b_op_start = oap->start; | |
| 4779 | |
| 4780 /* For "gw" remember the cursor position and put it back below (adjusted | |
| 4781 * for joined and split lines). */ | |
| 4782 if (keep_cursor) | |
| 4783 saved_cursor = oap->cursor_start; | |
| 4784 | |
| 1563 | 4785 format_lines(oap->line_count, keep_cursor); |
| 7 | 4786 |
| 4787 /* | |
| 4788 * Leave the cursor at the first non-blank of the last formatted line. | |
| 4789 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
| 4790 * line, so "." will do the next lines. | |
| 4791 */ | |
| 4792 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
| 4793 ++curwin->w_cursor.lnum; | |
| 4794 beginline(BL_WHITE | BL_FIX); | |
| 4795 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
| 4796 msgmore(old_line_count); | |
| 4797 | |
| 4798 /* put '] mark on the end of the formatted area */ | |
| 4799 curbuf->b_op_end = curwin->w_cursor; | |
| 4800 | |
| 4801 if (keep_cursor) | |
| 4802 { | |
| 4803 curwin->w_cursor = saved_cursor; | |
| 4804 saved_cursor.lnum = 0; | |
| 4805 } | |
| 4806 | |
| 4807 if (oap->is_VIsual) | |
| 4808 { | |
| 4809 win_T *wp; | |
| 4810 | |
| 4811 FOR_ALL_WINDOWS(wp) | |
| 4812 { | |
| 4813 if (wp->w_old_cursor_lnum != 0) | |
| 4814 { | |
| 4815 /* When lines have been inserted or deleted, adjust the end of | |
| 4816 * the Visual area to be redrawn. */ | |
| 4817 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
| 4818 wp->w_old_cursor_lnum += old_line_count; | |
| 4819 else | |
| 4820 wp->w_old_visual_lnum += old_line_count; | |
| 4821 } | |
| 4822 } | |
| 4823 } | |
| 4824 } | |
| 4825 | |
| 667 | 4826 #if defined(FEAT_EVAL) || defined(PROTO) |
| 4827 /* | |
| 4828 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
| 4829 */ | |
| 4830 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4831 op_formatexpr(oparg_T *oap) |
| 667 | 4832 { |
| 4833 if (oap->is_VIsual) | |
| 4834 /* When there is no change: need to remove the Visual selection */ | |
| 4835 redraw_curbuf_later(INVERTED); | |
| 4836 | |
|
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4837 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
|
4838 /* 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
|
4839 * internal formatting. */ |
|
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4840 op_format(oap, FALSE); |
| 667 | 4841 } |
| 4842 | |
| 4843 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4844 fex_format( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4845 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4846 long count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4847 int c) /* character to be inserted */ |
| 667 | 4848 { |
| 681 | 4849 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
| 4850 OPT_LOCAL); | |
| 667 | 4851 int r; |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4852 char_u *fex; |
| 667 | 4853 |
| 4854 /* | |
| 4855 * Set v:lnum to the first line number and v:count to the number of lines. | |
| 844 | 4856 * Set v:char to the character to be inserted (can be NUL). |
| 667 | 4857 */ |
| 4858 set_vim_var_nr(VV_LNUM, lnum); | |
| 4859 set_vim_var_nr(VV_COUNT, count); | |
| 1969 | 4860 set_vim_var_char(c); |
| 844 | 4861 |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4862 /* 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
|
4863 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
|
4864 if (fex == NULL) |
|
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4865 return 0; |
|
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4866 |
| 667 | 4867 /* |
| 4868 * Evaluate the function. | |
| 4869 */ | |
| 4870 if (use_sandbox) | |
| 4871 ++sandbox; | |
|
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4872 r = (int)eval_to_number(fex); |
| 667 | 4873 if (use_sandbox) |
| 4874 --sandbox; | |
| 844 | 4875 |
| 4876 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
|
4877 vim_free(fex); |
| 844 | 4878 |
| 667 | 4879 return r; |
| 4880 } | |
| 4881 #endif | |
| 4882 | |
| 7 | 4883 /* |
| 4884 * Format "line_count" lines, starting at the cursor position. | |
| 4885 * When "line_count" is negative, format until the end of the paragraph. | |
| 4886 * Lines after the cursor line are saved for undo, caller must have saved the | |
| 4887 * first line. | |
| 4888 */ | |
| 4889 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4890 format_lines( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4891 linenr_T line_count, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4892 int avoid_fex) /* don't use 'formatexpr' */ |
| 7 | 4893 { |
| 4894 int max_len; | |
| 4895 int is_not_par; /* current line not part of parag. */ | |
| 4896 int next_is_not_par; /* next line not part of paragraph */ | |
| 4897 int is_end_par; /* at end of paragraph */ | |
| 4898 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
| 4899 int next_is_start_par = FALSE; | |
| 4900 #ifdef FEAT_COMMENTS | |
| 4901 int leader_len = 0; /* leader len of current line */ | |
| 4902 int next_leader_len; /* leader len of next line */ | |
| 4903 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
| 4904 char_u *next_leader_flags; /* flags for leader of next line */ | |
| 4905 int do_comments; /* format comments */ | |
| 3584 | 4906 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
| 7 | 4907 #endif |
| 4908 int advance = TRUE; | |
| 3584 | 4909 int second_indent = -1; /* indent for second line (comment |
| 4910 * aware) */ | |
| 7 | 4911 int do_second_indent; |
| 4912 int do_number_indent; | |
| 4913 int do_trail_white; | |
| 4914 int first_par_line = TRUE; | |
| 4915 int smd_save; | |
| 4916 long count; | |
| 4917 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
| 4918 int force_format = FALSE; | |
| 4919 int old_State = State; | |
| 4920 | |
| 4921 /* length of a line to force formatting: 3 * 'tw' */ | |
| 4922 max_len = comp_textwidth(TRUE) * 3; | |
| 4923 | |
| 4924 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
| 4925 #ifdef FEAT_COMMENTS | |
| 4926 do_comments = has_format_option(FO_Q_COMS); | |
| 4927 #endif | |
| 4928 do_second_indent = has_format_option(FO_Q_SECOND); | |
| 4929 do_number_indent = has_format_option(FO_Q_NUMBER); | |
| 4930 do_trail_white = has_format_option(FO_WHITE_PAR); | |
| 4931 | |
| 4932 /* | |
| 4933 * Get info about the previous and current line. | |
| 4934 */ | |
| 4935 if (curwin->w_cursor.lnum > 1) | |
| 4936 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
| 4937 #ifdef FEAT_COMMENTS | |
| 4938 , &leader_len, &leader_flags, do_comments | |
| 4939 #endif | |
| 4940 ); | |
| 4941 else | |
| 4942 is_not_par = TRUE; | |
| 4943 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
| 4944 #ifdef FEAT_COMMENTS | |
| 4945 , &next_leader_len, &next_leader_flags, do_comments | |
| 4946 #endif | |
| 4947 ); | |
| 4948 is_end_par = (is_not_par || next_is_not_par); | |
| 4949 if (!is_end_par && do_trail_white) | |
| 4950 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
| 4951 | |
| 4952 curwin->w_cursor.lnum--; | |
| 4953 for (count = line_count; count != 0 && !got_int; --count) | |
| 4954 { | |
| 4955 /* | |
| 4956 * Advance to next paragraph. | |
| 4957 */ | |
| 4958 if (advance) | |
| 4959 { | |
| 4960 curwin->w_cursor.lnum++; | |
| 4961 prev_is_end_par = is_end_par; | |
| 4962 is_not_par = next_is_not_par; | |
| 4963 #ifdef FEAT_COMMENTS | |
| 4964 leader_len = next_leader_len; | |
| 4965 leader_flags = next_leader_flags; | |
| 4966 #endif | |
| 4967 } | |
| 4968 | |
| 4969 /* | |
| 4970 * The last line to be formatted. | |
| 4971 */ | |
| 4972 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
| 4973 { | |
| 4974 next_is_not_par = TRUE; | |
| 4975 #ifdef FEAT_COMMENTS | |
| 4976 next_leader_len = 0; | |
| 4977 next_leader_flags = NULL; | |
| 4978 #endif | |
| 4979 } | |
| 4980 else | |
| 4981 { | |
| 4982 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
| 4983 #ifdef FEAT_COMMENTS | |
| 4984 , &next_leader_len, &next_leader_flags, do_comments | |
| 4985 #endif | |
| 4986 ); | |
| 4987 if (do_number_indent) | |
| 4988 next_is_start_par = | |
| 4989 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
| 4990 } | |
| 4991 advance = TRUE; | |
| 4992 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
| 4993 if (!is_end_par && do_trail_white) | |
| 4994 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
| 4995 | |
| 4996 /* | |
| 4997 * Skip lines that are not in a paragraph. | |
| 4998 */ | |
| 4999 if (is_not_par) | |
| 5000 { | |
| 5001 if (line_count < 0) | |
| 5002 break; | |
| 5003 } | |
| 5004 else | |
| 5005 { | |
| 5006 /* | |
| 5007 * For the first line of a paragraph, check indent of second line. | |
| 5008 * Don't do this for comments and empty lines. | |
| 5009 */ | |
| 5010 if (first_par_line | |
| 5011 && (do_second_indent || do_number_indent) | |
| 5012 && prev_is_end_par | |
| 3584 | 5013 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
| 5014 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
5015 if (do_second_indent && !LINEEMPTY(curwin->w_cursor.lnum + 1)) |
| 3584 | 5016 { |
| 5017 #ifdef FEAT_COMMENTS | |
| 5018 if (leader_len == 0 && next_leader_len == 0) | |
| 5019 { | |
| 5020 /* no comment found */ | |
| 5021 #endif | |
| 5022 second_indent = | |
| 5023 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
| 7 | 5024 #ifdef FEAT_COMMENTS |
| 3584 | 5025 } |
| 5026 else | |
| 5027 { | |
| 5028 second_indent = next_leader_len; | |
| 5029 do_comments_list = 1; | |
| 5030 } | |
| 5031 #endif | |
| 5032 } | |
| 7 | 5033 else if (do_number_indent) |
| 3584 | 5034 { |
| 5035 #ifdef FEAT_COMMENTS | |
| 5036 if (leader_len == 0 && next_leader_len == 0) | |
| 5037 { | |
| 5038 /* no comment found */ | |
| 5039 #endif | |
| 5040 second_indent = | |
| 5041 get_number_indent(curwin->w_cursor.lnum); | |
| 5042 #ifdef FEAT_COMMENTS | |
| 5043 } | |
| 5044 else | |
| 5045 { | |
| 5046 /* get_number_indent() is now "comment aware"... */ | |
| 5047 second_indent = | |
| 5048 get_number_indent(curwin->w_cursor.lnum); | |
| 5049 do_comments_list = 1; | |
| 5050 } | |
| 5051 #endif | |
| 5052 } | |
| 7 | 5053 } |
| 5054 | |
| 5055 /* | |
| 5056 * When the comment leader changes, it's the end of the paragraph. | |
| 5057 */ | |
| 5058 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
| 5059 #ifdef FEAT_COMMENTS | |
| 5060 || !same_leader(curwin->w_cursor.lnum, | |
| 5061 leader_len, leader_flags, | |
| 5062 next_leader_len, next_leader_flags) | |
| 5063 #endif | |
| 5064 ) | |
| 5065 is_end_par = TRUE; | |
| 5066 | |
| 5067 /* | |
| 5068 * If we have got to the end of a paragraph, or the line is | |
| 5069 * getting long, format it. | |
| 5070 */ | |
| 5071 if (is_end_par || force_format) | |
| 5072 { | |
| 5073 if (need_set_indent) | |
| 5074 /* replace indent in first line with minimal number of | |
| 5075 * tabs and spaces, according to current options */ | |
| 5076 (void)set_indent(get_indent(), SIN_CHANGED); | |
| 5077 | |
| 5078 /* put cursor on last non-space */ | |
| 5079 State = NORMAL; /* don't go past end-of-line */ | |
| 5080 coladvance((colnr_T)MAXCOL); | |
| 5081 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
| 5082 dec_cursor(); | |
| 5083 | |
| 5084 /* do the formatting, without 'showmode' */ | |
| 5085 State = INSERT; /* for open_line() */ | |
| 5086 smd_save = p_smd; | |
| 5087 p_smd = FALSE; | |
| 5088 insertchar(NUL, INSCHAR_FORMAT | |
| 5089 #ifdef FEAT_COMMENTS | |
| 5090 + (do_comments ? INSCHAR_DO_COM : 0) | |
| 3584 | 5091 + (do_comments && do_comments_list |
| 5092 ? INSCHAR_COM_LIST : 0) | |
| 7 | 5093 #endif |
| 1563 | 5094 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
| 7 | 5095 State = old_State; |
| 5096 p_smd = smd_save; | |
| 5097 second_indent = -1; | |
| 5098 /* at end of par.: need to set indent of next par. */ | |
| 5099 need_set_indent = is_end_par; | |
| 5100 if (is_end_par) | |
| 5101 { | |
| 5102 /* When called with a negative line count, break at the | |
| 5103 * end of the paragraph. */ | |
| 5104 if (line_count < 0) | |
| 5105 break; | |
| 5106 first_par_line = TRUE; | |
| 5107 } | |
| 5108 force_format = FALSE; | |
| 5109 } | |
| 5110 | |
| 5111 /* | |
| 5112 * When still in same paragraph, join the lines together. But | |
| 5403 | 5113 * first delete the leader from the second line. |
| 7 | 5114 */ |
| 5115 if (!is_end_par) | |
| 5116 { | |
| 5117 advance = FALSE; | |
| 5118 curwin->w_cursor.lnum++; | |
| 5119 curwin->w_cursor.col = 0; | |
| 5120 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
|
5121 break; |
| 7 | 5122 #ifdef FEAT_COMMENTS |
| 5123 if (next_leader_len > 0) | |
| 5403 | 5124 { |
| 5125 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
| 7 | 5126 mark_col_adjust(curwin->w_cursor.lnum, (colnr_T)0, 0L, |
|
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
5127 (long)-next_leader_len, 0); |
| 5403 | 5128 } else |
| 5129 #endif | |
| 5130 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
| 5131 { | |
|
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
5132 int indent = getwhitecols_curline(); |
| 5403 | 5133 |
| 5134 if (indent > 0) | |
| 5135 { | |
| 5136 (void)del_bytes(indent, FALSE, FALSE); | |
| 5137 mark_col_adjust(curwin->w_cursor.lnum, | |
|
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
5138 (colnr_T)0, 0L, (long)-indent, 0); |
| 5415 | 5139 } |
| 5403 | 5140 } |
| 7 | 5141 curwin->w_cursor.lnum--; |
| 5848 | 5142 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
| 7 | 5143 { |
| 5144 beep_flush(); | |
| 5145 break; | |
| 5146 } | |
| 5147 first_par_line = FALSE; | |
| 5148 /* If the line is getting long, format it next time */ | |
| 5149 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
| 5150 force_format = TRUE; | |
| 5151 else | |
| 5152 force_format = FALSE; | |
| 5153 } | |
| 5154 } | |
| 5155 line_breakcheck(); | |
| 5156 } | |
| 5157 } | |
| 5158 | |
| 5159 /* | |
| 5160 * Return TRUE if line "lnum" ends in a white character. | |
| 5161 */ | |
| 5162 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5163 ends_in_white(linenr_T lnum) |
| 7 | 5164 { |
| 5165 char_u *s = ml_get(lnum); | |
| 5166 size_t l; | |
| 5167 | |
| 5168 if (*s == NUL) | |
| 5169 return FALSE; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5170 /* Don't use STRLEN() inside VIM_ISWHITE(), SAS/C complains: "macro |
| 7 | 5171 * invocation may call function multiple times". */ |
| 5172 l = STRLEN(s) - 1; | |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5173 return VIM_ISWHITE(s[l]); |
| 7 | 5174 } |
| 5175 | |
| 5176 /* | |
| 5177 * Blank lines, and lines containing only the comment leader, are left | |
| 5178 * untouched by the formatting. The function returns TRUE in this | |
| 5179 * case. It also returns TRUE when a line starts with the end of a comment | |
| 5180 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
| 5181 * previous line. A new paragraph starts after a blank line, or when the | |
| 5182 * comment leader changes -- webb. | |
| 5183 */ | |
| 5184 #ifdef FEAT_COMMENTS | |
| 5185 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5186 fmt_check_par( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5187 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5188 int *leader_len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5189 char_u **leader_flags, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5190 int do_comments) |
| 7 | 5191 { |
| 5192 char_u *flags = NULL; /* init for GCC */ | |
| 5193 char_u *ptr; | |
| 5194 | |
| 5195 ptr = ml_get(lnum); | |
| 5196 if (do_comments) | |
| 3562 | 5197 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
| 7 | 5198 else |
| 5199 *leader_len = 0; | |
| 5200 | |
| 5201 if (*leader_len > 0) | |
| 5202 { | |
| 5203 /* | |
| 5204 * Search for 'e' flag in comment leader flags. | |
| 5205 */ | |
| 5206 flags = *leader_flags; | |
| 5207 while (*flags && *flags != ':' && *flags != COM_END) | |
| 5208 ++flags; | |
| 5209 } | |
| 5210 | |
| 5211 return (*skipwhite(ptr + *leader_len) == NUL | |
| 5212 || (*leader_len > 0 && *flags == COM_END) | |
| 5213 || startPS(lnum, NUL, FALSE)); | |
| 5214 } | |
| 5215 #else | |
| 5216 static int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5217 fmt_check_par(linenr_T lnum) |
| 7 | 5218 { |
| 5219 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
| 5220 } | |
| 5221 #endif | |
| 5222 | |
| 5223 /* | |
| 5224 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
| 5225 * previous line is in the same paragraph. Used for auto-formatting. | |
| 5226 */ | |
| 5227 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5228 paragraph_start(linenr_T lnum) |
| 7 | 5229 { |
| 5230 char_u *p; | |
| 5231 #ifdef FEAT_COMMENTS | |
| 5232 int leader_len = 0; /* leader len of current line */ | |
| 5233 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
| 5234 int next_leader_len; /* leader len of next line */ | |
| 5235 char_u *next_leader_flags; /* flags for leader of next line */ | |
| 5236 int do_comments; /* format comments */ | |
| 5237 #endif | |
| 5238 | |
| 5239 if (lnum <= 1) | |
| 5240 return TRUE; /* start of the file */ | |
| 5241 | |
| 5242 p = ml_get(lnum - 1); | |
| 5243 if (*p == NUL) | |
| 5244 return TRUE; /* after empty line */ | |
| 5245 | |
| 5246 #ifdef FEAT_COMMENTS | |
| 5247 do_comments = has_format_option(FO_Q_COMS); | |
| 5248 #endif | |
| 5249 if (fmt_check_par(lnum - 1 | |
| 5250 #ifdef FEAT_COMMENTS | |
| 5251 , &leader_len, &leader_flags, do_comments | |
| 5252 #endif | |
| 5253 )) | |
| 5254 return TRUE; /* after non-paragraph line */ | |
| 5255 | |
| 5256 if (fmt_check_par(lnum | |
| 5257 #ifdef FEAT_COMMENTS | |
| 5258 , &next_leader_len, &next_leader_flags, do_comments | |
| 5259 #endif | |
| 5260 )) | |
| 5261 return TRUE; /* "lnum" is not a paragraph line */ | |
| 5262 | |
| 5263 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
| 5264 return TRUE; /* missing trailing space in previous line. */ | |
| 5265 | |
| 5266 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
| 5267 return TRUE; /* numbered item starts in "lnum". */ | |
| 5268 | |
| 5269 #ifdef FEAT_COMMENTS | |
| 5270 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
| 5271 next_leader_len, next_leader_flags)) | |
| 5272 return TRUE; /* change of comment leader. */ | |
| 5273 #endif | |
| 5274 | |
| 5275 return FALSE; | |
| 5276 } | |
| 5277 | |
| 5278 /* | |
| 5279 * prepare a few things for block mode yank/delete/tilde | |
| 5280 * | |
| 5281 * for delete: | |
| 5282 * - textlen includes the first/last char to be (partly) deleted | |
| 5283 * - start/endspaces is the number of columns that are taken by the | |
| 5284 * first/last deleted char minus the number of columns that have to be | |
| 1839 | 5285 * deleted. |
| 5286 * for yank and tilde: | |
| 7 | 5287 * - textlen includes the first/last char to be wholly yanked |
| 5288 * - start/endspaces is the number of columns of the first/last yanked char | |
| 5289 * that are to be yanked. | |
| 5290 */ | |
| 5291 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5292 block_prep( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5293 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5294 struct block_def *bdp, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5295 linenr_T lnum, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5296 int is_del) |
| 7 | 5297 { |
| 5298 int incr = 0; | |
| 5299 char_u *pend; | |
| 5300 char_u *pstart; | |
| 5301 char_u *line; | |
| 5302 char_u *prev_pstart; | |
| 5303 char_u *prev_pend; | |
| 5304 | |
| 5305 bdp->startspaces = 0; | |
| 5306 bdp->endspaces = 0; | |
| 5307 bdp->textlen = 0; | |
| 5308 bdp->start_vcol = 0; | |
| 5309 bdp->end_vcol = 0; | |
| 5310 bdp->is_short = FALSE; | |
| 5311 bdp->is_oneChar = FALSE; | |
| 5312 bdp->pre_whitesp = 0; | |
| 5313 bdp->pre_whitesp_c = 0; | |
| 5314 bdp->end_char_vcols = 0; | |
| 5315 bdp->start_char_vcols = 0; | |
| 5316 | |
| 5317 line = ml_get(lnum); | |
| 5318 pstart = line; | |
| 5319 prev_pstart = line; | |
| 5320 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
| 5321 { | |
| 5322 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5995 | 5323 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
| 7 | 5324 bdp->start_vcol += incr; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5325 if (VIM_ISWHITE(*pstart)) |
| 7 | 5326 { |
| 5327 bdp->pre_whitesp += incr; | |
| 5328 bdp->pre_whitesp_c++; | |
| 5329 } | |
| 5330 else | |
| 5331 { | |
| 5332 bdp->pre_whitesp = 0; | |
| 5333 bdp->pre_whitesp_c = 0; | |
| 5334 } | |
| 5335 prev_pstart = pstart; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
5336 MB_PTR_ADV(pstart); |
| 7 | 5337 } |
| 5338 bdp->start_char_vcols = incr; | |
| 5339 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
| 5340 { | |
| 5341 bdp->end_vcol = bdp->start_vcol; | |
| 5342 bdp->is_short = TRUE; | |
| 5343 if (!is_del || oap->op_type == OP_APPEND) | |
| 5344 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
| 5345 } | |
| 5346 else | |
| 5347 { | |
| 5348 /* notice: this converts partly selected Multibyte characters to | |
| 5349 * spaces, too. */ | |
| 5350 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
| 5351 if (is_del && bdp->startspaces) | |
| 5352 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5353 pend = pstart; | |
| 5354 bdp->end_vcol = bdp->start_vcol; | |
| 5355 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
| 5356 { | |
| 5357 bdp->is_oneChar = TRUE; | |
| 5358 if (oap->op_type == OP_INSERT) | |
| 5359 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5360 else if (oap->op_type == OP_APPEND) | |
| 5361 { | |
| 5362 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
| 5363 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
| 5364 } | |
| 5365 else | |
| 5366 { | |
| 5367 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
| 5368 if (is_del && oap->op_type != OP_LSHIFT) | |
| 5369 { | |
| 5370 /* just putting the sum of those two into | |
| 5371 * bdp->startspaces doesn't work for Visual replace, | |
| 5372 * so we have to split the tab in two */ | |
| 5373 bdp->startspaces = bdp->start_char_vcols | |
| 5374 - (bdp->start_vcol - oap->start_vcol); | |
| 5375 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
| 5376 } | |
| 5377 } | |
| 5378 } | |
| 5379 else | |
| 5380 { | |
| 5381 prev_pend = pend; | |
| 5382 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
| 5383 { | |
| 5384 /* Count a tab for what it's worth (if list mode not on) */ | |
| 5385 prev_pend = pend; | |
| 6535 | 5386 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
| 7 | 5387 bdp->end_vcol += incr; |
| 5388 } | |
| 5389 if (bdp->end_vcol <= oap->end_vcol | |
| 5390 && (!is_del | |
| 5391 || oap->op_type == OP_APPEND | |
| 5392 || oap->op_type == OP_REPLACE)) /* line too short */ | |
| 5393 { | |
| 5394 bdp->is_short = TRUE; | |
| 5395 /* Alternative: include spaces to fill up the block. | |
| 5396 * Disadvantage: can lead to trailing spaces when the line is | |
| 5397 * short where the text is put */ | |
| 5398 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
| 5399 if (oap->op_type == OP_APPEND || virtual_op) | |
| 5400 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
| 593 | 5401 + oap->inclusive; |
| 7 | 5402 else |
| 5403 bdp->endspaces = 0; /* replace doesn't add characters */ | |
| 5404 } | |
| 5405 else if (bdp->end_vcol > oap->end_vcol) | |
| 5406 { | |
| 5407 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
| 5408 if (!is_del && bdp->endspaces) | |
| 5409 { | |
| 5410 bdp->endspaces = incr - bdp->endspaces; | |
| 5411 if (pend != pstart) | |
| 5412 pend = prev_pend; | |
| 5413 } | |
| 5414 } | |
| 5415 } | |
| 5416 bdp->end_char_vcols = incr; | |
| 5417 if (is_del && bdp->startspaces) | |
| 5418 pstart = prev_pstart; | |
| 5419 bdp->textlen = (int)(pend - pstart); | |
| 5420 } | |
| 5421 bdp->textcol = (colnr_T) (pstart - line); | |
| 5422 bdp->textstart = pstart; | |
| 5423 } | |
| 5424 | |
| 5425 /* | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5426 * Handle the add/subtract operator. |
| 7 | 5427 */ |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5428 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5429 op_addsub( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5430 oparg_T *oap, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5431 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
|
5432 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
|
5433 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5434 pos_T pos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5435 struct block_def bd; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5436 int change_cnt = 0; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5437 linenr_T amount = Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5438 |
|
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5439 // do_addsub() might trigger re-evaluation of 'foldexpr' halfway, when the |
|
15967
ddd82b1c9e9d
patch 8.1.0989: various small code ugliness
Bram Moolenaar <Bram@vim.org>
parents:
15840
diff
changeset
|
5440 // buffer is not completely updated yet. Postpone updating folds until before |
|
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5441 // the call to changed_lines(). |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5442 #ifdef FEAT_FOLDING |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5443 disable_fold_update++; |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5444 #endif |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5445 |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5446 if (!VIsual_active) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5447 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5448 pos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5449 if (u_save_cursor() == FAIL) |
|
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5450 { |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5451 #ifdef FEAT_FOLDING |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5452 disable_fold_update--; |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5453 #endif |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5454 return; |
|
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5455 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5456 change_cnt = do_addsub(oap->op_type, &pos, 0, amount); |
|
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5457 #ifdef FEAT_FOLDING |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5458 disable_fold_update--; |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5459 #endif |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5460 if (change_cnt) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5461 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
|
5462 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5463 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5464 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5465 int one_change; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5466 int length; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5467 pos_T startpos; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5468 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5469 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
|
5470 (linenr_T)(oap->end.lnum + 1)) == FAIL) |
|
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5471 { |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5472 #ifdef FEAT_FOLDING |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5473 disable_fold_update--; |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5474 #endif |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5475 return; |
|
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5476 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5477 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5478 pos = oap->start; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5479 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
|
5480 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5481 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
|
5482 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5483 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
|
5484 pos.col = bd.textcol; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5485 length = bd.textlen; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5486 } |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5487 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
|
5488 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5489 curwin->w_cursor.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5490 pos.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5491 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
|
5492 } |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5493 else /* oap->motion_type == MCHAR */ |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5494 { |
|
12996
973a0037f4c3
patch 8.0.1374: CTRL-A does not work with an empty line
Christian Brabandt <cb@256bit.org>
parents:
12642
diff
changeset
|
5495 if (pos.lnum == oap->start.lnum && !oap->inclusive) |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5496 dec(&(oap->end)); |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5497 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
|
5498 pos.col = 0; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5499 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
|
5500 { |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5501 pos.col += oap->start.col; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5502 length -= oap->start.col; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5503 } |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5504 if (pos.lnum == oap->end.lnum) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5505 { |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5506 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
|
5507 if (oap->end.col >= length) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5508 oap->end.col = length - 1; |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5509 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
|
5510 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5511 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5512 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
|
5513 if (one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5514 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5515 /* 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
|
5516 if (change_cnt == 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5517 startpos = curbuf->b_op_start; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5518 ++change_cnt; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5519 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5520 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5521 #ifdef FEAT_NETBEANS_INTG |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5522 if (netbeans_active() && one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5523 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5524 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
|
5525 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5526 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
|
5527 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
|
5528 &ptr[pos.col], length); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5529 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5530 #endif |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5531 if (g_cmd && one_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5532 amount += Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5533 } |
|
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5534 |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5535 #ifdef FEAT_FOLDING |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5536 disable_fold_update--; |
|
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5537 #endif |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5538 if (change_cnt) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5539 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
|
5540 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5541 if (!change_cnt && oap->is_VIsual) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5542 /* 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
|
5543 redraw_curbuf_later(INVERTED); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5544 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5545 /* 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
|
5546 * position from do_addsub(). */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5547 if (change_cnt > 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5548 curbuf->b_op_start = startpos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5549 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5550 if (change_cnt > p_report) |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
5551 smsg(NGETTEXT("%ld line changed", "%ld lines changed", |
|
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
5552 change_cnt), change_cnt); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5553 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5554 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5555 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5556 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5557 * 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
|
5558 * 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
|
5559 * |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5560 * 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
|
5561 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5562 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5563 do_addsub( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5564 int op_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5565 pos_T *pos, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5566 int length, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5567 linenr_T Prenum1) |
| 7 | 5568 { |
| 5569 int col; | |
| 5570 char_u *buf1; | |
| 5571 char_u buf2[NUMBUFLEN]; | |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5572 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
| 7 | 5573 static int hexupper = FALSE; /* 0xABC */ |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5574 uvarnumber_T n; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5575 uvarnumber_T oldn; |
| 7 | 5576 char_u *ptr; |
| 5577 int c; | |
| 5578 int todel; | |
| 5579 int dohex; | |
| 5580 int dooct; | |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5581 int dobin; |
| 7 | 5582 int doalp; |
| 5583 int firstdigit; | |
| 5584 int subtract; | |
| 6868 | 5585 int negative = FALSE; |
| 6891 | 5586 int was_positive = TRUE; |
| 6868 | 5587 int visual = VIsual_active; |
| 6921 | 5588 int did_change = FALSE; |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5589 pos_T save_cursor = curwin->w_cursor; |
| 6927 | 5590 int maxlen = 0; |
|
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5591 pos_T startpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5592 pos_T endpos; |
| 7 | 5593 |
| 5594 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
| 5595 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
|
5596 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
| 7 | 5597 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
| 5598 | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5599 curwin->w_cursor = *pos; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5600 ptr = ml_get(pos->lnum); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5601 col = pos->col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5602 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5603 if (*ptr == NUL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5604 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5605 |
| 7 | 5606 /* |
| 5607 * First check if we are on a hexadecimal number, after the "0x". | |
| 5608 */ | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5609 if (!VIsual_active) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5610 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5611 if (dobin) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5612 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
|
5613 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5614 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5615 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5616 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
|
5617 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5618 |
| 6868 | 5619 if (dohex) |
| 5620 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
|
5621 { |
| 6868 | 5622 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5623 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5624 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
|
5625 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5626 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5627 if ( dobin |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5628 && dohex |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5629 && ! ((col > 0 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5630 && (ptr[col] == 'X' |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5631 || ptr[col] == 'x') |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5632 && ptr[col - 1] == '0' |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5633 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5634 !(*mb_head_off)(ptr, ptr + col - 1)) |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5635 && vim_isxdigit(ptr[col + 1])))) |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5636 { |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5637 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5638 /* 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
|
5639 |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5640 col = pos->col; |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5641 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5642 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
|
5643 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5644 col--; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5645 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5646 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
|
5647 } |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5648 } |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5649 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5650 if (( dohex |
| 6868 | 5651 && col > 0 |
| 5652 && (ptr[col] == 'X' | |
| 5653 || ptr[col] == 'x') | |
| 5654 && ptr[col - 1] == '0' | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5655 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5656 !(*mb_head_off)(ptr, ptr + col - 1)) |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5657 && vim_isxdigit(ptr[col + 1])) || |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5658 ( dobin |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5659 && col > 0 |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5660 && (ptr[col] == 'B' |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5661 || ptr[col] == 'b') |
|
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5662 && ptr[col - 1] == '0' |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5663 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5664 !(*mb_head_off)(ptr, ptr + col - 1)) |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5665 && vim_isbdigit(ptr[col + 1]))) |
| 6868 | 5666 { |
|
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5667 /* Found hexadecimal or binary number, move to its start. */ |
| 7 | 5668 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5669 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5670 col -= (*mb_head_off)(ptr, ptr + col); |
| 6868 | 5671 } |
| 5672 else | |
| 7 | 5673 { |
| 6868 | 5674 /* |
| 5675 * Search forward and then backward to find the start of number. | |
| 5676 */ | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5677 col = pos->col; |
| 6868 | 5678 |
| 5679 while (ptr[col] != NUL | |
| 5680 && !vim_isdigit(ptr[col]) | |
| 5681 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5682 col += MB_PTR2LEN(ptr + col); |
| 6868 | 5683 |
| 5684 while (col > 0 | |
| 5685 && vim_isdigit(ptr[col - 1]) | |
| 5686 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5687 { |
| 6868 | 5688 --col; |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5689 if (has_mbyte) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5690 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
|
5691 } |
| 6868 | 5692 } |
| 5693 } | |
| 5694 | |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5695 if (visual) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5696 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5697 while (ptr[col] != NUL && length > 0 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5698 && !vim_isdigit(ptr[col]) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5699 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5700 { |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5701 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
|
5702 |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5703 col += mb_len; |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5704 length -= mb_len; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5705 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5706 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5707 if (length == 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5708 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5709 |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5710 if (col > pos->col && ptr[col - 1] == '-' |
|
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5711 && (!has_mbyte || !(*mb_head_off)(ptr, ptr + col - 1))) |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5712 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5713 negative = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5714 was_positive = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5715 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5716 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5717 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5718 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5719 * 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
|
5720 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5721 firstdigit = ptr[col]; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5722 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
|
5723 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5724 beep_flush(); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5725 goto theend; |
|
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 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5728 if (doalp && ASCII_ISALPHA(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5729 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5730 /* decrement or increment alphabetic character */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5731 if (op_type == OP_NR_SUB) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5732 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5733 if (CharOrd(firstdigit) < Prenum1) |
| 6927 | 5734 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5735 if (isupper(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5736 firstdigit = 'A'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5737 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5738 firstdigit = 'a'; |
| 6927 | 5739 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5740 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5741 #ifdef EBCDIC |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5742 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5743 #else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5744 firstdigit -= Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5745 #endif |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5746 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5747 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5748 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5749 if (26 - CharOrd(firstdigit) - 1 < Prenum1) |
| 6927 | 5750 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5751 if (isupper(firstdigit)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5752 firstdigit = 'Z'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5753 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5754 firstdigit = 'z'; |
| 6927 | 5755 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5756 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5757 #ifdef EBCDIC |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5758 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5759 #else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5760 firstdigit += Prenum1; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5761 #endif |
|
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 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5764 if (!did_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5765 startpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5766 did_change = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5767 (void)del_char(FALSE); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5768 ins_char(firstdigit); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5769 endpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5770 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5771 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5772 else |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5773 { |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5774 if (col > 0 && ptr[col - 1] == '-' |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5775 && (!has_mbyte || |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5776 !(*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
|
5777 && !visual) |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5778 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5779 /* negative number */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5780 --col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5781 negative = TRUE; |
|
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 /* get the number value (unsigned) */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5784 if (visual && VIsual_mode != 'V') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5785 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
|
5786 ? (int)STRLEN(ptr) - col |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5787 : length); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5788 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5789 vim_str2nr(ptr + col, &pre, &length, |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5790 0 + (dobin ? STR2NR_BIN : 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5791 + (dooct ? STR2NR_OCT : 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5792 + (dohex ? STR2NR_HEX : 0), |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5793 NULL, &n, maxlen); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5794 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5795 /* 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
|
5796 if (pre && negative) |
|
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 ++col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5799 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5800 negative = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5801 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5802 /* add or subtract */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5803 subtract = FALSE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5804 if (op_type == OP_NR_SUB) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5805 subtract ^= TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5806 if (negative) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5807 subtract ^= TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5808 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5809 oldn = n; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5810 if (subtract) |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5811 n -= (uvarnumber_T)Prenum1; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5812 else |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5813 n += (uvarnumber_T)Prenum1; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5814 /* handle wraparound for decimal numbers */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5815 if (!pre) |
|
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 (subtract) |
| 6927 | 5818 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5819 if (n > oldn) |
| 6868 | 5820 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5821 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
|
5822 negative ^= TRUE; |
| 6868 | 5823 } |
| 7 | 5824 } |
| 5825 else | |
| 6868 | 5826 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5827 /* add */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5828 if (n < oldn) |
| 6868 | 5829 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5830 n = (n ^ (uvarnumber_T)-1); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5831 negative ^= TRUE; |
| 6868 | 5832 } |
| 6927 | 5833 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5834 if (n == 0) |
| 6868 | 5835 negative = FALSE; |
|
7574
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 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5838 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
|
5839 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5840 /* need to remove the '-' */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5841 col--; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5842 length++; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5843 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5844 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5845 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5846 * Delete the old number. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5847 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5848 curwin->w_cursor.col = col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5849 if (!did_change) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5850 startpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5851 did_change = TRUE; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5852 todel = length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5853 c = gchar_cursor(); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5854 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5855 * 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
|
5856 * 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
|
5857 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5858 if (c == '-') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5859 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5860 while (todel-- > 0) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5861 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5862 if (c < 0x100 && isalpha(c)) |
| 6868 | 5863 { |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5864 if (isupper(c)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5865 hexupper = TRUE; |
| 6868 | 5866 else |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5867 hexupper = FALSE; |
| 6891 | 5868 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5869 /* 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
|
5870 (void)del_char(FALSE); |
| 6868 | 5871 c = gchar_cursor(); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5872 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5873 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5874 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5875 * Prepare the leading characters in buf1[]. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5876 * 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
|
5877 * Allocate a bit too much. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5878 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5879 buf1 = alloc((unsigned)length + NUMBUFLEN); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5880 if (buf1 == NULL) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5881 goto theend; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5882 ptr = buf1; |
|
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
5883 if (negative && (!visual || was_positive)) |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5884 *ptr++ = '-'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5885 if (pre) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5886 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5887 *ptr++ = '0'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5888 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5889 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5890 if (pre == 'b' || pre == 'B' || |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5891 pre == 'x' || pre == 'X') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5892 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5893 *ptr++ = pre; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5894 --length; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5895 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5896 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5897 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5898 * Put the number characters in buf2[]. |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5899 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5900 if (pre == 'b' || pre == 'B') |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5901 { |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5902 int i; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5903 int bit = 0; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5904 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
|
5905 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5906 /* leading zeros */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5907 for (bit = bits; bit > 0; bit--) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5908 if ((n >> (bit - 1)) & 0x1) break; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5909 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5910 for (i = 0; bit > 0; bit--) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5911 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
|
5912 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5913 buf2[i] = '\0'; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5914 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5915 else if (pre == 0) |
|
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
5916 vim_snprintf((char *)buf2, NUMBUFLEN, "%llu", |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5917 (long_long_u_T)n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5918 else if (pre == '0') |
|
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
5919 vim_snprintf((char *)buf2, NUMBUFLEN, "%llo", |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5920 (long_long_u_T)n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5921 else if (pre && hexupper) |
|
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
5922 vim_snprintf((char *)buf2, NUMBUFLEN, "%llX", |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5923 (long_long_u_T)n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5924 else |
|
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
5925 vim_snprintf((char *)buf2, NUMBUFLEN, "%llx", |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
5926 (long_long_u_T)n); |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5927 length -= (int)STRLEN(buf2); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5928 |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5929 /* |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5930 * 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
|
5931 * 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
|
5932 * Don't do this when |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5933 * 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
|
5934 */ |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5935 if (firstdigit == '0' && !(dooct && pre == 0)) |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5936 while (length-- > 0) |
| 6868 | 5937 *ptr++ = '0'; |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5938 *ptr = NUL; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5939 STRCAT(buf1, buf2); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5940 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
|
5941 vim_free(buf1); |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5942 endpos = curwin->w_cursor; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5943 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
|
5944 --curwin->w_cursor.col; |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5945 } |
|
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5946 |
|
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5947 if (did_change) |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5948 { |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5949 /* set the '[ and '] marks */ |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5950 curbuf->b_op_start = startpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5951 curbuf->b_op_end = endpos; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5952 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
|
5953 --curbuf->b_op_end.col; |
|
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5954 } |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5955 |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5956 theend: |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5957 if (visual) |
|
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5958 curwin->w_cursor = save_cursor; |
|
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5959 else if (did_change) |
|
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
5960 curwin->w_set_curswant = TRUE; |
|
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5961 |
|
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5962 return did_change; |
| 7 | 5963 } |
| 5964 | |
| 5965 #ifdef FEAT_VIMINFO | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5966 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5967 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
|
5968 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5969 #define REG_PREVIOUS 1 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5970 #define REG_EXEC 2 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5971 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5972 /* |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5973 * 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
|
5974 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5975 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5976 prepare_viminfo_registers(void) |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5977 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5978 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
|
5979 * (int)sizeof(yankreg_T)); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5980 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5981 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5982 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
5983 finish_viminfo_registers(void) |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5984 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5985 int i; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5986 int j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5987 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5988 if (y_read_regs != NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5989 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5990 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
|
5991 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
|
5992 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5993 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
|
5994 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
|
5995 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
|
5996 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
5997 VIM_CLEAR(y_read_regs); |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5998 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
5999 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6000 |
| 7 | 6001 int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6002 read_viminfo_register(vir_T *virp, int force) |
| 7 | 6003 { |
| 6004 int eof; | |
| 6005 int do_it = TRUE; | |
| 6006 int size; | |
| 6007 int limit; | |
| 6008 int i; | |
| 6009 int set_prev = FALSE; | |
| 6010 char_u *str; | |
| 6011 char_u **array = NULL; | |
| 6508 | 6012 int new_type = MCHAR; /* init to shut up compiler */ |
| 6013 colnr_T new_width = 0; /* init to shut up compiler */ | |
| 7 | 6014 |
| 6015 /* We only get here (hopefully) if line[0] == '"' */ | |
| 6016 str = virp->vir_line + 1; | |
| 1893 | 6017 |
| 6018 /* If the line starts with "" this is the y_previous register. */ | |
| 7 | 6019 if (*str == '"') |
| 6020 { | |
| 6021 set_prev = TRUE; | |
| 6022 str++; | |
| 6023 } | |
| 1893 | 6024 |
| 7 | 6025 if (!ASCII_ISALNUM(*str) && *str != '-') |
| 6026 { | |
| 6027 if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line)) | |
| 6028 return TRUE; /* too many errors, pretend end-of-file */ | |
| 6029 do_it = FALSE; | |
| 6030 } | |
| 6031 get_yank_register(*str++, FALSE); | |
| 6032 if (!force && y_current->y_array != NULL) | |
| 6033 do_it = FALSE; | |
| 1893 | 6034 |
| 6035 if (*str == '@') | |
| 6036 { | |
| 6037 /* "x@: register x used for @@ */ | |
| 6038 if (force || execreg_lastc == NUL) | |
| 6039 execreg_lastc = str[-1]; | |
| 6040 } | |
| 6041 | |
| 7 | 6042 size = 0; |
| 6043 limit = 100; /* Optimized for registers containing <= 100 lines */ | |
| 6044 if (do_it) | |
| 6045 { | |
| 6462 | 6046 /* |
| 6047 * Build the new register in array[]. | |
| 6048 * y_array is kept as-is until done. | |
| 6049 * The "do_it" flag is reset when something is wrong, in which case | |
| 6050 * array[] needs to be freed. | |
| 6051 */ | |
| 7 | 6052 if (set_prev) |
| 6053 y_previous = y_current; | |
| 6462 | 6054 array = (char_u **)alloc((unsigned)(limit * sizeof(char_u *))); |
| 1893 | 6055 str = skipwhite(skiptowhite(str)); |
| 7 | 6056 if (STRNCMP(str, "CHAR", 4) == 0) |
| 6462 | 6057 new_type = MCHAR; |
| 7 | 6058 else if (STRNCMP(str, "BLOCK", 5) == 0) |
| 6462 | 6059 new_type = MBLOCK; |
| 7 | 6060 else |
| 6462 | 6061 new_type = MLINE; |
| 7 | 6062 /* get the block width; if it's missing we get a zero, which is OK */ |
| 6063 str = skipwhite(skiptowhite(str)); | |
| 6462 | 6064 new_width = getdigits(&str); |
| 7 | 6065 } |
| 6066 | |
| 6067 while (!(eof = viminfo_readline(virp)) | |
| 6068 && (virp->vir_line[0] == TAB || virp->vir_line[0] == '<')) | |
| 6069 { | |
| 6070 if (do_it) | |
| 6071 { | |
| 6462 | 6072 if (size == limit) |
| 7 | 6073 { |
| 6462 | 6074 char_u **new_array = (char_u **) |
| 7 | 6075 alloc((unsigned)(limit * 2 * sizeof(char_u *))); |
| 6462 | 6076 |
| 6077 if (new_array == NULL) | |
| 6078 { | |
| 6079 do_it = FALSE; | |
| 6080 break; | |
| 6081 } | |
| 7 | 6082 for (i = 0; i < limit; i++) |
| 6462 | 6083 new_array[i] = array[i]; |
| 7 | 6084 vim_free(array); |
| 6462 | 6085 array = new_array; |
| 7 | 6086 limit *= 2; |
| 6087 } | |
| 6088 str = viminfo_readstring(virp, 1, TRUE); | |
| 6089 if (str != NULL) | |
| 6090 array[size++] = str; | |
| 6091 else | |
| 6462 | 6092 /* error, don't store the result */ |
| 7 | 6093 do_it = FALSE; |
| 6094 } | |
| 6095 } | |
| 6508 | 6096 |
| 7 | 6097 if (do_it) |
| 6098 { | |
| 6462 | 6099 /* free y_array[] */ |
| 6100 for (i = 0; i < y_current->y_size; i++) | |
| 6101 vim_free(y_current->y_array[i]); | |
| 6102 vim_free(y_current->y_array); | |
| 6103 | |
| 6104 y_current->y_type = new_type; | |
| 6105 y_current->y_width = new_width; | |
| 6106 y_current->y_size = size; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6107 y_current->y_time_set = 0; |
| 7 | 6108 if (size == 0) |
| 6109 { | |
| 6110 y_current->y_array = NULL; | |
| 6111 } | |
| 6462 | 6112 else |
| 7 | 6113 { |
| 6462 | 6114 /* Move the lines from array[] to y_array[]. */ |
| 7 | 6115 y_current->y_array = |
| 6116 (char_u **)alloc((unsigned)(size * sizeof(char_u *))); | |
| 6117 for (i = 0; i < size; i++) | |
| 6462 | 6118 { |
| 6119 if (y_current->y_array == NULL) | |
| 6120 vim_free(array[i]); | |
| 6121 else | |
| 6122 y_current->y_array[i] = array[i]; | |
| 6123 } | |
| 7 | 6124 } |
| 6462 | 6125 } |
| 6126 else | |
| 6127 { | |
| 6128 /* Free array[] if it was filled. */ | |
| 6129 for (i = 0; i < size; i++) | |
| 6130 vim_free(array[i]); | |
| 6131 } | |
| 6132 vim_free(array); | |
| 6133 | |
| 7 | 6134 return eof; |
| 6135 } | |
| 6136 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6137 /* |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6138 * 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
|
6139 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6140 void |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6141 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
|
6142 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6143 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
|
6144 int flags; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6145 int name; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6146 int type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6147 int linecount; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6148 int width; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6149 time_t timestamp; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6150 yankreg_T *y_ptr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6151 int i; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6152 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6153 /* Check the format: |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6154 * |{bartype},{flags},{name},{type}, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6155 * {linecount},{width},{timestamp},"line1","line2" |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6156 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6157 if (values->ga_len < 6 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6158 || vp[0].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6159 || vp[1].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6160 || vp[2].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6161 || vp[3].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6162 || vp[4].bv_type != BVAL_NR |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6163 || vp[5].bv_type != BVAL_NR) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6164 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6165 flags = vp[0].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6166 name = vp[1].bv_nr; |
|
9307
eb52a2670c96
commit https://github.com/vim/vim/commit/67e3720a9ddd8a9d2e8344358c28fa1f4196db0d
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
6167 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
|
6168 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6169 type = vp[2].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6170 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
|
6171 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6172 linecount = vp[3].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6173 if (values->ga_len < 6 + linecount) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6174 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6175 width = vp[4].bv_nr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6176 if (width < 0) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6177 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6178 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6179 if (y_read_regs != NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6180 /* 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
|
6181 * 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
|
6182 y_ptr = &y_read_regs[name]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6183 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6184 y_ptr = &y_regs[name]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6185 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6186 /* 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
|
6187 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
|
6188 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
|
6189 && (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
|
6190 return; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6191 |
|
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6192 if (y_ptr->y_array != NULL) |
|
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6193 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
|
6194 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
|
6195 vim_free(y_ptr->y_array); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6196 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6197 if (y_read_regs == NULL) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6198 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6199 if (flags & REG_PREVIOUS) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6200 y_previous = y_ptr; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6201 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
|
6202 execreg_lastc = get_register_name(name); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6203 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6204 y_ptr->y_type = type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6205 y_ptr->y_width = width; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6206 y_ptr->y_size = linecount; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6207 y_ptr->y_time_set = timestamp; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6208 if (linecount == 0) |
|
16429
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6209 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6210 y_ptr->y_array = NULL; |
|
16429
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6211 return; |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6212 } |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6213 y_ptr->y_array = (char_u **)alloc((unsigned)(linecount * sizeof(char_u *))); |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6214 if (y_ptr->y_array == NULL) |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6215 { |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6216 y_ptr->y_size = 0; // ensure object state is consistent |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6217 return; |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6218 } |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6219 for (i = 0; i < linecount; i++) |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6220 { |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6221 if (vp[i + 6].bv_allocated) |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6222 { |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6223 y_ptr->y_array[i] = vp[i + 6].bv_string; |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6224 vp[i + 6].bv_string = NULL; |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6225 } |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6226 else |
|
a1229400434a
patch 8.1.1219: not checking for NULL return from alloc()
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
6227 y_ptr->y_array[i] = vim_strsave(vp[i + 6].bv_string); |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6228 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6229 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6230 |
| 7 | 6231 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6232 write_viminfo_registers(FILE *fp) |
| 7 | 6233 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6234 int i, j; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6235 char_u *type; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6236 char_u c; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6237 int num_lines; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6238 int max_num_lines; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6239 int max_kbyte; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6240 long len; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6241 yankreg_T *y_ptr; |
| 7 | 6242 |
|
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
6243 fputs(_("\n# Registers:\n"), fp); |
| 7 | 6244 |
| 6245 /* Get '<' value, use old '"' value if '<' is not found. */ | |
| 6246 max_num_lines = get_viminfo_parameter('<'); | |
| 6247 if (max_num_lines < 0) | |
| 6248 max_num_lines = get_viminfo_parameter('"'); | |
| 6249 if (max_num_lines == 0) | |
| 6250 return; | |
| 6251 max_kbyte = get_viminfo_parameter('s'); | |
| 6252 if (max_kbyte == 0) | |
| 6253 return; | |
| 1893 | 6254 |
| 7 | 6255 for (i = 0; i < NUM_REGISTERS; i++) |
| 6256 { | |
| 6257 #ifdef FEAT_CLIPBOARD | |
| 6258 /* Skip '*'/'+' register, we don't want them back next time */ | |
| 6259 if (i == STAR_REGISTER || i == PLUS_REGISTER) | |
| 6260 continue; | |
| 6261 #endif | |
| 6262 #ifdef FEAT_DND | |
| 6263 /* Neither do we want the '~' register */ | |
| 6264 if (i == TILDE_REGISTER) | |
| 6265 continue; | |
| 6266 #endif | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6267 /* 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
|
6268 * viminfo if it's newer. */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6269 if (y_read_regs != NULL |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6270 && 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
|
6271 && (y_regs[i].y_array == NULL || |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6272 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
|
6273 y_ptr = &y_read_regs[i]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6274 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
|
6275 continue; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6276 else |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6277 y_ptr = &y_regs[i]; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6278 |
| 55 | 6279 /* Skip empty registers. */ |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6280 num_lines = y_ptr->y_size; |
| 55 | 6281 if (num_lines == 0 |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6282 || (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
|
6283 && *y_ptr->y_array[0] == NUL)) |
| 55 | 6284 continue; |
| 6285 | |
| 7 | 6286 if (max_kbyte > 0) |
| 6287 { | |
| 6288 /* Skip register if there is more text than the maximum size. */ | |
| 6289 len = 0; | |
| 6290 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
|
6291 len += (long)STRLEN(y_ptr->y_array[j]) + 1L; |
| 7 | 6292 if (len > (long)max_kbyte * 1024L) |
| 6293 continue; | |
| 6294 } | |
| 6295 | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6296 switch (y_ptr->y_type) |
| 7 | 6297 { |
| 6298 case MLINE: | |
| 6299 type = (char_u *)"LINE"; | |
| 6300 break; | |
| 6301 case MCHAR: | |
| 6302 type = (char_u *)"CHAR"; | |
| 6303 break; | |
| 6304 case MBLOCK: | |
| 6305 type = (char_u *)"BLOCK"; | |
| 6306 break; | |
| 6307 default: | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
6308 semsg(_("E574: Unknown register type %d"), y_ptr->y_type); |
| 7 | 6309 type = (char_u *)"LINE"; |
| 6310 break; | |
| 6311 } | |
| 6312 if (y_previous == &y_regs[i]) | |
| 6313 fprintf(fp, "\""); | |
| 6314 c = get_register_name(i); | |
| 1893 | 6315 fprintf(fp, "\"%c", c); |
| 6316 if (c == execreg_lastc) | |
| 6317 fprintf(fp, "@"); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6318 fprintf(fp, "\t%s\t%d\n", type, (int)y_ptr->y_width); |
| 7 | 6319 |
| 6320 /* If max_num_lines < 0, then we save ALL the lines in the register */ | |
| 6321 if (max_num_lines > 0 && num_lines > max_num_lines) | |
| 6322 num_lines = max_num_lines; | |
| 6323 for (j = 0; j < num_lines; j++) | |
| 6324 { | |
| 6325 putc('\t', fp); | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6326 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
|
6327 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6328 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6329 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6330 int flags = 0; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6331 int remaining; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6332 |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6333 /* 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
|
6334 * |{bartype},{flags},{name},{type}, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6335 * {linecount},{width},{timestamp},"line1","line2" |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6336 * flags: REG_PREVIOUS - register is y_previous |
|
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
6337 * REG_EXEC - used for @@ |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6338 */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6339 if (y_previous == &y_regs[i]) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6340 flags |= REG_PREVIOUS; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6341 if (c == execreg_lastc) |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6342 flags |= REG_EXEC; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6343 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
|
6344 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
|
6345 (long)y_ptr->y_time_set); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6346 /* 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
|
6347 remaining = LSIZE - 71; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6348 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
|
6349 { |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6350 putc(',', fp); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6351 --remaining; |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6352 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
|
6353 remaining); |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6354 } |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6355 putc('\n', fp); |
| 7 | 6356 } |
| 6357 } | |
| 6358 } | |
| 6359 #endif /* FEAT_VIMINFO */ | |
| 6360 | |
| 6361 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
| 6362 /* | |
| 6363 * SELECTION / PRIMARY ('*') | |
| 6364 * | |
| 6365 * Text selection stuff that uses the GUI selection register '*'. When using a | |
| 6366 * GUI this may be text from another window, otherwise it is the last text we | |
| 6367 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
| 6368 * button performs the paste, otherwise you will need to do <"*p>. " | |
| 6369 * If not under X, it is synonymous with the clipboard register '+'. | |
| 6370 * | |
| 6371 * X CLIPBOARD ('+') | |
| 6372 * | |
| 6373 * Text selection stuff that uses the GUI clipboard register '+'. | |
| 6374 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
| 6375 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
| 6376 * otherwise you will need to do <"+p>. " | |
| 6377 * If not under X, it is synonymous with the selection register '*'. | |
| 6378 */ | |
| 6379 | |
| 6380 /* | |
| 6381 * Routine to export any final X selection we had to the environment | |
|
11065
f5bd684e47a1
patch 8.0.0421: diff mode wrong when adding line at end of buffer
Christian Brabandt <cb@256bit.org>
parents:
10827
diff
changeset
|
6382 * so that the text is still available after Vim has exited. X selections |
| 7 | 6383 * only exist while the owning application exists, so we write to the |
| 6384 * permanent (while X runs) store CUT_BUFFER0. | |
| 6385 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
| 6386 * 'permanent' of the two), otherwise the PRIMARY one. | |
| 6387 * For now, use a hard-coded sanity limit of 1Mb of data. | |
| 6388 */ | |
|
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
6389 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
| 7 | 6390 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6391 x11_export_final_selection(void) |
| 7 | 6392 { |
| 6393 Display *dpy; | |
| 6394 char_u *str = NULL; | |
| 6395 long_u len = 0; | |
| 6396 int motion_type = -1; | |
| 6397 | |
| 6398 # ifdef FEAT_GUI | |
| 6399 if (gui.in_use) | |
| 6400 dpy = X_DISPLAY; | |
| 6401 else | |
| 6402 # endif | |
| 6403 # ifdef FEAT_XCLIPBOARD | |
| 6404 dpy = xterm_dpy; | |
| 6405 # else | |
| 6406 return; | |
| 6407 # endif | |
| 6408 | |
| 6409 /* Get selection to export */ | |
| 6410 if (clip_plus.owned) | |
| 6411 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
| 6412 else if (clip_star.owned) | |
| 6413 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
| 6414 | |
| 6415 /* Check it's OK */ | |
| 6416 if (dpy != NULL && str != NULL && motion_type >= 0 | |
| 6417 && len < 1024*1024 && len > 0) | |
| 6418 { | |
| 4201 | 6419 int ok = TRUE; |
| 6420 | |
| 1924 | 6421 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
| 6422 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
| 6423 * encoding conversion usually doesn't work, so keep the text as-is. | |
| 6424 */ | |
| 6425 if (has_mbyte) | |
| 6426 { | |
| 6427 vimconv_T vc; | |
| 6428 | |
| 6429 vc.vc_type = CONV_NONE; | |
| 6430 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
| 6431 { | |
|
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6432 int intlen = len; |
|
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6433 char_u *conv_str; |
| 2007 | 6434 |
| 4201 | 6435 vc.vc_fail = TRUE; |
| 2007 | 6436 conv_str = string_convert(&vc, str, &intlen); |
| 6437 len = intlen; | |
| 1924 | 6438 if (conv_str != NULL) |
| 6439 { | |
| 6440 vim_free(str); | |
| 6441 str = conv_str; | |
| 6442 } | |
| 4201 | 6443 else |
| 6444 { | |
| 6445 ok = FALSE; | |
| 6446 } | |
| 1924 | 6447 convert_setup(&vc, NULL, NULL); |
| 6448 } | |
| 4201 | 6449 else |
| 6450 { | |
| 6451 ok = FALSE; | |
| 6452 } | |
| 1924 | 6453 } |
| 4201 | 6454 |
| 6455 /* Do not store the string if conversion failed. Better to use any | |
| 6456 * other selection than garbled text. */ | |
| 6457 if (ok) | |
| 6458 { | |
| 6459 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
| 6460 XFlush(dpy); | |
| 6461 } | |
| 7 | 6462 } |
| 6463 | |
| 6464 vim_free(str); | |
| 6465 } | |
| 6466 #endif | |
| 6467 | |
| 6468 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6469 clip_free_selection(VimClipboard *cbd) |
| 7 | 6470 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6471 yankreg_T *y_ptr = y_current; |
| 7 | 6472 |
| 6473 if (cbd == &clip_plus) | |
| 6474 y_current = &y_regs[PLUS_REGISTER]; | |
| 6475 else | |
| 6476 y_current = &y_regs[STAR_REGISTER]; | |
| 6477 free_yank_all(); | |
| 6478 y_current->y_size = 0; | |
| 6479 y_current = y_ptr; | |
| 6480 } | |
| 6481 | |
| 6482 /* | |
|
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
6483 * Get the selected text and put it in register '*' or '+'. |
| 7 | 6484 */ |
| 6485 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6486 clip_get_selection(VimClipboard *cbd) |
| 7 | 6487 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6488 yankreg_T *old_y_previous, *old_y_current; |
| 7 | 6489 pos_T old_cursor; |
| 6490 pos_T old_visual; | |
| 6491 int old_visual_mode; | |
| 6492 colnr_T old_curswant; | |
| 6493 int old_set_curswant; | |
| 6494 pos_T old_op_start, old_op_end; | |
| 6495 oparg_T oa; | |
| 6496 cmdarg_T ca; | |
| 6497 | |
| 6498 if (cbd->owned) | |
| 6499 { | |
| 6500 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
| 6501 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
| 6502 return; | |
| 6503 | |
| 6504 /* Get the text between clip_star.start & clip_star.end */ | |
| 6505 old_y_previous = y_previous; | |
| 6506 old_y_current = y_current; | |
| 6507 old_cursor = curwin->w_cursor; | |
| 6508 old_curswant = curwin->w_curswant; | |
| 6509 old_set_curswant = curwin->w_set_curswant; | |
| 6510 old_op_start = curbuf->b_op_start; | |
| 6511 old_op_end = curbuf->b_op_end; | |
| 6512 old_visual = VIsual; | |
| 6513 old_visual_mode = VIsual_mode; | |
| 6514 clear_oparg(&oa); | |
| 6515 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
| 6516 oa.op_type = OP_YANK; | |
| 6517 vim_memset(&ca, 0, sizeof(ca)); | |
| 6518 ca.oap = &oa; | |
| 6519 ca.cmdchar = 'y'; | |
| 6520 ca.count1 = 1; | |
| 6521 ca.retval = CA_NO_ADJ_OP_END; | |
| 6522 do_pending_operator(&ca, 0, TRUE); | |
| 6523 y_previous = old_y_previous; | |
| 6524 y_current = old_y_current; | |
| 6525 curwin->w_cursor = old_cursor; | |
| 688 | 6526 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
| 7 | 6527 curwin->w_curswant = old_curswant; |
| 6528 curwin->w_set_curswant = old_set_curswant; | |
| 6529 curbuf->b_op_start = old_op_start; | |
| 6530 curbuf->b_op_end = old_op_end; | |
| 6531 VIsual = old_visual; | |
| 6532 VIsual_mode = old_visual_mode; | |
| 6533 } | |
|
11273
96d83cd2904a
patch 8.0.0522: Win32: when 'clipboard' is "unnamed" yyp does not work
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
6534 else if (!is_clipboard_needs_update()) |
| 7 | 6535 { |
| 6536 clip_free_selection(cbd); | |
| 6537 | |
| 6538 /* Try to get selected text from another window */ | |
| 6539 clip_gen_request_selection(cbd); | |
| 6540 } | |
| 6541 } | |
| 6542 | |
| 2896 | 6543 /* |
| 6544 * Convert from the GUI selection string into the '*'/'+' register. | |
| 6545 */ | |
| 7 | 6546 void |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6547 clip_yank_selection( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6548 int type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6549 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6550 long len, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6551 VimClipboard *cbd) |
| 7 | 6552 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6553 yankreg_T *y_ptr; |
| 7 | 6554 |
| 6555 if (cbd == &clip_plus) | |
| 6556 y_ptr = &y_regs[PLUS_REGISTER]; | |
| 6557 else | |
| 6558 y_ptr = &y_regs[STAR_REGISTER]; | |
| 6559 | |
| 6560 clip_free_selection(cbd); | |
| 6561 | |
| 5798 | 6562 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
| 7 | 6563 } |
| 6564 | |
| 6565 /* | |
| 6566 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
| 6567 * with length *len. | |
| 6568 * Returns the motion type, or -1 for failure. | |
| 6569 */ | |
| 6570 int | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6571 clip_convert_selection(char_u **str, long_u *len, VimClipboard *cbd) |
| 7 | 6572 { |
| 6573 char_u *p; | |
| 6574 int lnum; | |
| 6575 int i, j; | |
| 6576 int_u eolsize; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6577 yankreg_T *y_ptr; |
| 7 | 6578 |
| 6579 if (cbd == &clip_plus) | |
| 6580 y_ptr = &y_regs[PLUS_REGISTER]; | |
| 6581 else | |
| 6582 y_ptr = &y_regs[STAR_REGISTER]; | |
| 6583 | |
| 6584 #ifdef USE_CRNL | |
| 6585 eolsize = 2; | |
| 6586 #else | |
| 6587 eolsize = 1; | |
| 6588 #endif | |
| 6589 | |
| 6590 *str = NULL; | |
| 6591 *len = 0; | |
| 6592 if (y_ptr->y_array == NULL) | |
| 6593 return -1; | |
| 6594 | |
| 6595 for (i = 0; i < y_ptr->y_size; i++) | |
| 6596 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
| 6597 | |
| 6598 /* | |
| 6599 * Don't want newline character at end of last line if we're in MCHAR mode. | |
| 6600 */ | |
| 6601 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
| 6602 *len -= eolsize; | |
| 6603 | |
| 6604 p = *str = lalloc(*len + 1, TRUE); /* add one to avoid zero */ | |
| 6605 if (p == NULL) | |
| 6606 return -1; | |
| 6607 lnum = 0; | |
| 6608 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
| 6609 { | |
| 6610 if (y_ptr->y_array[lnum][j] == '\n') | |
| 6611 p[i] = NUL; | |
| 6612 else if (y_ptr->y_array[lnum][j] == NUL) | |
| 6613 { | |
| 6614 #ifdef USE_CRNL | |
| 6615 p[i++] = '\r'; | |
| 6616 #endif | |
| 6617 p[i] = '\n'; | |
| 6618 lnum++; | |
| 6619 j = -1; | |
| 6620 } | |
| 6621 else | |
| 6622 p[i] = y_ptr->y_array[lnum][j]; | |
| 6623 } | |
| 6624 return y_ptr->y_type; | |
| 6625 } | |
| 6626 | |
| 6627 | |
| 6628 /* | |
| 6629 * If we have written to a clipboard register, send the text to the clipboard. | |
| 6630 */ | |
| 6631 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6632 may_set_selection(void) |
| 7 | 6633 { |
| 6634 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
| 6635 { | |
| 6636 clip_own_selection(&clip_star); | |
| 6637 clip_gen_set_selection(&clip_star); | |
| 6638 } | |
| 6639 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
| 6640 { | |
| 6641 clip_own_selection(&clip_plus); | |
| 6642 clip_gen_set_selection(&clip_plus); | |
| 6643 } | |
| 6644 } | |
| 6645 | |
| 6646 #endif /* FEAT_CLIPBOARD || PROTO */ | |
| 6647 | |
| 6648 | |
| 6649 #if defined(FEAT_DND) || defined(PROTO) | |
| 6650 /* | |
| 6651 * Replace the contents of the '~' register with str. | |
| 6652 */ | |
| 6653 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6654 dnd_yank_drag_data(char_u *str, long len) |
| 7 | 6655 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6656 yankreg_T *curr; |
| 7 | 6657 |
| 6658 curr = y_current; | |
| 6659 y_current = &y_regs[TILDE_REGISTER]; | |
| 6660 free_yank_all(); | |
| 5798 | 6661 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
| 7 | 6662 y_current = curr; |
| 6663 } | |
| 6664 #endif | |
| 6665 | |
| 6666 | |
| 6667 #if defined(FEAT_EVAL) || defined(PROTO) | |
| 6668 /* | |
| 6669 * Return the type of a register. | |
| 6670 * Used for getregtype() | |
| 6671 * Returns MAUTO for error. | |
| 6672 */ | |
| 6673 char_u | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6674 get_reg_type(int regname, long *reglen) |
| 7 | 6675 { |
| 6676 switch (regname) | |
| 6677 { | |
| 6678 case '%': /* file name */ | |
| 6679 case '#': /* alternate file name */ | |
| 6680 case '=': /* expression */ | |
| 6681 case ':': /* last command line */ | |
| 6682 case '/': /* last search-pattern */ | |
| 6683 case '.': /* last inserted text */ | |
| 6684 #ifdef FEAT_SEARCHPATH | |
| 6685 case Ctrl_F: /* Filename under cursor */ | |
| 6686 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
| 6687 #endif | |
| 6688 case Ctrl_W: /* word under cursor */ | |
| 6689 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
| 6690 case '_': /* black hole: always empty */ | |
| 6691 return MCHAR; | |
| 6692 } | |
| 6693 | |
| 6694 #ifdef FEAT_CLIPBOARD | |
| 6695 regname = may_get_selection(regname); | |
| 6696 #endif | |
| 6697 | |
| 5596 | 6698 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
|
6699 return MAUTO; |
| 5596 | 6700 |
| 7 | 6701 get_yank_register(regname, FALSE); |
| 6702 | |
| 6703 if (y_current->y_array != NULL) | |
| 6704 { | |
| 6705 if (reglen != NULL && y_current->y_type == MBLOCK) | |
| 6706 *reglen = y_current->y_width; | |
| 6707 return y_current->y_type; | |
| 6708 } | |
| 6709 return MAUTO; | |
| 6710 } | |
| 6711 | |
| 5796 | 6712 /* |
| 6713 * When "flags" has GREG_LIST return a list with text "s". | |
| 6714 * Otherwise just return "s". | |
| 6715 */ | |
| 6716 static char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6717 getreg_wrap_one_line(char_u *s, int flags) |
| 5796 | 6718 { |
| 6719 if (flags & GREG_LIST) | |
| 6720 { | |
| 6721 list_T *list = list_alloc(); | |
| 6722 | |
| 6723 if (list != NULL) | |
| 6724 { | |
| 6725 if (list_append_string(list, NULL, -1) == FAIL) | |
| 6726 { | |
|
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6727 list_free(list); |
| 5796 | 6728 return NULL; |
| 6729 } | |
| 6730 list->lv_first->li_tv.vval.v_string = s; | |
| 6731 } | |
| 6732 return (char_u *)list; | |
| 6733 } | |
| 6734 return s; | |
| 6735 } | |
| 6736 | |
| 7 | 6737 /* |
| 6738 * Return the contents of a register as a single allocated string. | |
| 6739 * Used for "@r" in expressions and for getreg(). | |
| 6740 * Returns NULL for error. | |
| 5796 | 6741 * Flags: |
| 6742 * GREG_NO_EXPR Do not allow expression register | |
| 6743 * GREG_EXPR_SRC For the expression register: return expression itself, | |
| 6744 * not the result of its evaluation. | |
| 6745 * GREG_LIST Return a list of lines in place of a single string. | |
| 7 | 6746 */ |
| 6747 char_u * | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6748 get_reg_contents(int regname, int flags) |
| 7 | 6749 { |
| 6750 long i; | |
| 6751 char_u *retval; | |
| 6752 int allocated; | |
| 6753 long len; | |
| 6754 | |
| 6755 /* Don't allow using an expression register inside an expression */ | |
| 6756 if (regname == '=') | |
| 6757 { | |
| 5796 | 6758 if (flags & GREG_NO_EXPR) |
| 6759 return NULL; | |
| 6760 if (flags & GREG_EXPR_SRC) | |
| 6761 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
| 6762 return getreg_wrap_one_line(get_expr_line(), flags); | |
| 7 | 6763 } |
| 6764 | |
| 6765 if (regname == '@') /* "@@" is used for unnamed register */ | |
| 6766 regname = '"'; | |
| 6767 | |
| 6768 /* check for valid regname */ | |
| 6769 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
| 6770 return NULL; | |
| 6771 | |
| 6772 #ifdef FEAT_CLIPBOARD | |
| 6773 regname = may_get_selection(regname); | |
| 6774 #endif | |
| 6775 | |
| 6776 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
| 6777 { | |
| 6778 if (retval == NULL) | |
| 6779 return NULL; | |
| 5796 | 6780 if (allocated) |
| 6781 return getreg_wrap_one_line(retval, flags); | |
| 6782 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
| 7 | 6783 } |
| 6784 | |
| 6785 get_yank_register(regname, FALSE); | |
| 6786 if (y_current->y_array == NULL) | |
| 6787 return NULL; | |
| 6788 | |
| 5796 | 6789 if (flags & GREG_LIST) |
| 6790 { | |
| 6791 list_T *list = list_alloc(); | |
| 6792 int error = FALSE; | |
| 6793 | |
| 6794 if (list == NULL) | |
| 6795 return NULL; | |
| 6796 for (i = 0; i < y_current->y_size; ++i) | |
| 6797 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
| 6798 error = TRUE; | |
| 6799 if (error) | |
| 6800 { | |
|
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6801 list_free(list); |
| 5796 | 6802 return NULL; |
| 6803 } | |
| 6804 return (char_u *)list; | |
| 6805 } | |
| 6806 | |
| 7 | 6807 /* |
| 6808 * Compute length of resulting string. | |
| 6809 */ | |
| 6810 len = 0; | |
| 6811 for (i = 0; i < y_current->y_size; ++i) | |
| 6812 { | |
| 6813 len += (long)STRLEN(y_current->y_array[i]); | |
| 6814 /* | |
| 6815 * Insert a newline between lines and after last line if | |
| 6816 * y_type is MLINE. | |
| 6817 */ | |
| 6818 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 6819 ++len; | |
| 6820 } | |
| 6821 | |
| 6822 retval = lalloc(len + 1, TRUE); | |
| 6823 | |
| 6824 /* | |
| 6825 * Copy the lines of the yank register into the string. | |
| 6826 */ | |
| 6827 if (retval != NULL) | |
| 6828 { | |
| 6829 len = 0; | |
| 6830 for (i = 0; i < y_current->y_size; ++i) | |
| 6831 { | |
| 6832 STRCPY(retval + len, y_current->y_array[i]); | |
| 6833 len += (long)STRLEN(retval + len); | |
| 6834 | |
| 6835 /* | |
| 6836 * Insert a NL between lines and after the last line if y_type is | |
| 6837 * MLINE. | |
| 6838 */ | |
| 6839 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
| 6840 retval[len++] = '\n'; | |
| 6841 } | |
| 6842 retval[len] = NUL; | |
| 6843 } | |
| 6844 | |
| 6845 return retval; | |
| 6846 } | |
| 6847 | |
| 5798 | 6848 static int |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6849 init_write_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6850 int name, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6851 yankreg_T **old_y_previous, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6852 yankreg_T **old_y_current, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6853 int must_append, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6854 int *yank_type UNUSED) |
| 5798 | 6855 { |
| 6856 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
| 6857 { | |
| 6858 emsg_invreg(name); | |
| 6859 return FAIL; | |
| 6860 } | |
| 6861 | |
| 6862 /* Don't want to change the current (unnamed) register */ | |
| 6863 *old_y_previous = y_previous; | |
| 6864 *old_y_current = y_current; | |
| 6865 | |
| 6866 get_yank_register(name, TRUE); | |
| 6867 if (!y_append && !must_append) | |
| 6868 free_yank_all(); | |
| 6869 return OK; | |
| 6870 } | |
| 6871 | |
| 6872 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6873 finish_write_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6874 int name, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6875 yankreg_T *old_y_previous, |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6876 yankreg_T *old_y_current) |
| 5798 | 6877 { |
| 6878 # ifdef FEAT_CLIPBOARD | |
| 6879 /* Send text of clipboard register to the clipboard. */ | |
| 6880 may_set_selection(); | |
| 6881 # endif | |
| 6882 | |
| 6883 /* ':let @" = "val"' should change the meaning of the "" register */ | |
| 6884 if (name != '"') | |
| 6885 y_previous = old_y_previous; | |
| 6886 y_current = old_y_current; | |
| 6887 } | |
| 6888 | |
| 7 | 6889 /* |
| 6890 * Store string "str" in register "name". | |
| 6891 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
| 6892 * If "must_append" is TRUE, always append to the register. Otherwise append | |
| 6893 * if "name" is an uppercase letter. | |
| 6894 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
| 6895 * Careful: 'str' is modified, you may have to use a copy! | |
| 6896 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
| 6897 */ | |
| 6898 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6899 write_reg_contents( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6900 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6901 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6902 int maxlen, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6903 int must_append) |
| 7 | 6904 { |
| 6905 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
| 6906 } | |
| 6907 | |
| 6908 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6909 write_reg_contents_lst( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6910 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6911 char_u **strings, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6912 int maxlen UNUSED, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6913 int must_append, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6914 int yank_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6915 long block_len) |
| 5798 | 6916 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6917 yankreg_T *old_y_previous, *old_y_current; |
| 5798 | 6918 |
| 6919 if (name == '/' | |
| 6920 #ifdef FEAT_EVAL | |
| 6921 || name == '=' | |
| 6922 #endif | |
| 6923 ) | |
| 6924 { | |
| 6925 char_u *s; | |
| 6926 | |
| 6927 if (strings[0] == NULL) | |
| 6928 s = (char_u *)""; | |
| 6929 else if (strings[1] != NULL) | |
| 6930 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
6931 emsg(_("E883: search pattern and expression register may not " |
| 5798 | 6932 "contain two or more lines")); |
| 6933 return; | |
| 6934 } | |
| 6935 else | |
| 6936 s = strings[0]; | |
| 6937 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
| 6938 return; | |
| 6939 } | |
| 6940 | |
| 6941 if (name == '_') /* black hole: nothing to do */ | |
| 6942 return; | |
| 6943 | |
| 6944 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
| 6945 &yank_type) == FAIL) | |
| 6946 return; | |
| 6947 | |
| 6948 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
| 6949 | |
| 6950 finish_write_reg(name, old_y_previous, old_y_current); | |
| 6951 } | |
| 6952 | |
| 6953 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6954 write_reg_contents_ex( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6955 int name, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6956 char_u *str, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6957 int maxlen, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6958 int must_append, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6959 int yank_type, |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6960 long block_len) |
| 7 | 6961 { |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6962 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
|
6963 long len; |
| 7 | 6964 |
| 336 | 6965 if (maxlen >= 0) |
| 6966 len = maxlen; | |
| 6967 else | |
| 6968 len = (long)STRLEN(str); | |
| 6969 | |
| 7 | 6970 /* Special case: '/' search pattern */ |
| 6971 if (name == '/') | |
| 6972 { | |
| 6973 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
| 6974 return; | |
| 6975 } | |
| 6976 | |
| 6557 | 6977 if (name == '#') |
| 6978 { | |
| 6979 buf_T *buf; | |
| 6980 | |
| 6981 if (VIM_ISDIGIT(*str)) | |
| 6982 { | |
| 6983 int num = atoi((char *)str); | |
| 6984 | |
| 6985 buf = buflist_findnr(num); | |
| 6986 if (buf == NULL) | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15428
diff
changeset
|
6987 semsg(_(e_nobufnr), (long)num); |
| 6557 | 6988 } |
| 6989 else | |
| 6990 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
| 6991 TRUE, FALSE, FALSE)); | |
| 6992 if (buf == NULL) | |
| 6993 return; | |
| 6994 curwin->w_alt_fnum = buf->b_fnum; | |
| 6995 return; | |
| 6996 } | |
| 6997 | |
| 336 | 6998 #ifdef FEAT_EVAL |
| 6999 if (name == '=') | |
| 7000 { | |
| 7001 char_u *p, *s; | |
| 7002 | |
| 7003 p = vim_strnsave(str, (int)len); | |
| 7004 if (p == NULL) | |
| 7005 return; | |
| 7006 if (must_append) | |
| 7007 { | |
| 7008 s = concat_str(get_expr_line_src(), p); | |
| 7009 vim_free(p); | |
| 7010 p = s; | |
| 7011 } | |
| 7012 set_expr_line(p); | |
| 7013 return; | |
| 7014 } | |
| 7015 #endif | |
| 7016 | |
| 7 | 7017 if (name == '_') /* black hole: nothing to do */ |
| 7018 return; | |
| 7019 | |
| 5798 | 7020 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
| 7021 &yank_type) == FAIL) | |
| 7022 return; | |
| 7023 | |
| 7024 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
| 7025 | |
| 7026 finish_write_reg(name, old_y_previous, old_y_current); | |
| 7 | 7027 } |
| 7028 #endif /* FEAT_EVAL */ | |
| 7029 | |
| 7030 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
| 7031 /* | |
| 7032 * Put a string into a register. When the register is not empty, the string | |
| 7033 * is appended. | |
| 7034 */ | |
| 7035 static void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7036 str_to_reg( |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7037 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
|
7038 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
|
7039 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
|
7040 long len, /* length of string */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7041 long blocklen, /* width of Visual block */ |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7042 int str_list) /* TRUE if str is char_u ** */ |
| 7 | 7043 { |
| 2896 | 7044 int type; /* MCHAR, MLINE or MBLOCK */ |
| 7 | 7045 int lnum; |
| 7046 long start; | |
| 7047 long i; | |
| 7048 int extra; | |
| 7049 int newlines; /* number of lines added */ | |
| 7050 int extraline = 0; /* extra line at the end */ | |
| 7051 int append = FALSE; /* append to last line in register */ | |
| 7052 char_u *s; | |
| 5798 | 7053 char_u **ss; |
| 7 | 7054 char_u **pp; |
| 7055 long maxlen; | |
| 7056 | |
| 2000 | 7057 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
| 7 | 7058 y_ptr->y_size = 0; |
| 7059 | |
| 2896 | 7060 if (yank_type == MAUTO) |
| 5798 | 7061 type = ((str_list || (len > 0 && (str[len - 1] == NL |
| 7062 || str[len - 1] == CAR))) | |
| 2896 | 7063 ? MLINE : MCHAR); |
| 7064 else | |
| 7065 type = yank_type; | |
| 7066 | |
| 7 | 7067 /* |
| 7068 * Count the number of lines within the string | |
| 7069 */ | |
| 7070 newlines = 0; | |
| 5798 | 7071 if (str_list) |
| 7072 { | |
| 7073 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
| 7 | 7074 ++newlines; |
| 5798 | 7075 } |
| 7076 else | |
| 7077 { | |
| 7078 for (i = 0; i < len; i++) | |
| 7079 if (str[i] == '\n') | |
| 7080 ++newlines; | |
| 7081 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
| 7082 { | |
| 7083 extraline = 1; | |
| 7084 ++newlines; /* count extra newline at the end */ | |
| 7085 } | |
| 7086 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
| 7087 { | |
| 7088 append = TRUE; | |
| 7089 --newlines; /* uncount newline when appending first line */ | |
| 7090 } | |
| 7 | 7091 } |
| 7092 | |
| 6807 | 7093 /* Without any lines make the register empty. */ |
| 7094 if (y_ptr->y_size + newlines == 0) | |
| 7095 { | |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
7096 VIM_CLEAR(y_ptr->y_array); |
| 6807 | 7097 return; |
| 7098 } | |
| 7099 | |
| 7 | 7100 /* |
| 7101 * Allocate an array to hold the pointers to the new register lines. | |
| 7102 * If the register was not empty, move the existing lines to the new array. | |
| 7103 */ | |
| 7104 pp = (char_u **)lalloc_clear((y_ptr->y_size + newlines) | |
| 7105 * sizeof(char_u *), TRUE); | |
| 7106 if (pp == NULL) /* out of memory */ | |
| 7107 return; | |
| 7108 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
| 7109 pp[lnum] = y_ptr->y_array[lnum]; | |
| 7110 vim_free(y_ptr->y_array); | |
| 7111 y_ptr->y_array = pp; | |
| 7112 maxlen = 0; | |
| 7113 | |
| 7114 /* | |
| 7115 * Find the end of each line and save it into the array. | |
| 7116 */ | |
| 5798 | 7117 if (str_list) |
| 7118 { | |
| 7119 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
| 7 | 7120 { |
| 5856 | 7121 i = (long)STRLEN(*ss); |
| 5798 | 7122 pp[lnum] = vim_strnsave(*ss, i); |
| 7123 if (i > maxlen) | |
| 7124 maxlen = i; | |
| 7 | 7125 } |
| 5798 | 7126 } |
| 7127 else | |
| 7128 { | |
| 7129 for (start = 0; start < len + extraline; start += i + 1) | |
| 7 | 7130 { |
| 5798 | 7131 for (i = start; i < len; ++i) /* find the end of the line */ |
| 7132 if (str[i] == '\n') | |
| 7133 break; | |
| 7134 i -= start; /* i is now length of line */ | |
| 7135 if (i > maxlen) | |
| 7136 maxlen = i; | |
| 7137 if (append) | |
| 7138 { | |
| 7139 --lnum; | |
| 7140 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
| 7141 } | |
| 7142 else | |
| 7143 extra = 0; | |
| 7144 s = alloc((unsigned)(i + extra + 1)); | |
| 7145 if (s == NULL) | |
| 7146 break; | |
| 7147 if (extra) | |
| 7148 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
| 7149 if (append) | |
| 7150 vim_free(y_ptr->y_array[lnum]); | |
| 7151 if (i) | |
| 7152 mch_memmove(s + extra, str + start, (size_t)i); | |
| 7153 extra += i; | |
| 7154 s[extra] = NUL; | |
| 7155 y_ptr->y_array[lnum++] = s; | |
| 7156 while (--extra >= 0) | |
| 7157 { | |
| 7158 if (*s == NUL) | |
| 7159 *s = '\n'; /* replace NUL with newline */ | |
| 7160 ++s; | |
| 7161 } | |
| 7162 append = FALSE; /* only first line is appended */ | |
| 7 | 7163 } |
| 7164 } | |
| 7165 y_ptr->y_type = type; | |
| 7166 y_ptr->y_size = lnum; | |
| 7167 if (type == MBLOCK) | |
| 7168 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
| 7169 else | |
| 7170 y_ptr->y_width = 0; | |
|
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7171 #ifdef FEAT_VIMINFO |
|
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7172 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
|
7173 #endif |
| 7 | 7174 } |
| 7175 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
| 7176 | |
| 7177 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7178 clear_oparg(oparg_T *oap) |
| 7 | 7179 { |
| 7180 vim_memset(oap, 0, sizeof(oparg_T)); | |
| 7181 } | |
| 7182 | |
| 7183 /* | |
| 161 | 7184 * Count the number of bytes, characters and "words" in a line. |
| 7 | 7185 * |
| 7186 * "Words" are counted by looking for boundaries between non-space and | |
| 7187 * space characters. (it seems to produce results that match 'wc'.) | |
| 7188 * | |
| 161 | 7189 * Return value is byte count; word count for the line is added to "*wc". |
| 7190 * Char count is added to "*cc". | |
| 7 | 7191 * |
| 7192 * The function will only examine the first "limit" characters in the | |
| 7193 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
| 7194 * case, eol_size will be added to the character count to account for | |
| 7195 * the size of the EOL character. | |
| 7196 */ | |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7197 static varnumber_T |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7198 line_count_info( |
|
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7199 char_u *line, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7200 varnumber_T *wc, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7201 varnumber_T *cc, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7202 varnumber_T limit, |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7203 int eol_size) |
| 7 | 7204 { |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7205 varnumber_T i; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7206 varnumber_T words = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7207 varnumber_T chars = 0; |
| 7 | 7208 int is_word = 0; |
| 7209 | |
| 3626 | 7210 for (i = 0; i < limit && line[i] != NUL; ) |
| 7 | 7211 { |
| 7212 if (is_word) | |
| 7213 { | |
| 7214 if (vim_isspace(line[i])) | |
| 7215 { | |
| 7216 words++; | |
| 7217 is_word = 0; | |
| 7218 } | |
| 7219 } | |
| 7220 else if (!vim_isspace(line[i])) | |
| 7221 is_word = 1; | |
| 161 | 7222 ++chars; |
| 474 | 7223 i += (*mb_ptr2len)(line + i); |
| 7 | 7224 } |
| 7225 | |
| 7226 if (is_word) | |
| 7227 words++; | |
| 7228 *wc += words; | |
| 7229 | |
| 7230 /* Add eol_size if the end of line was reached before hitting limit. */ | |
| 2996 | 7231 if (i < limit && line[i] == NUL) |
| 161 | 7232 { |
| 7 | 7233 i += eol_size; |
| 161 | 7234 chars += eol_size; |
| 7235 } | |
| 7236 *cc += chars; | |
| 7 | 7237 return i; |
| 7238 } | |
| 7239 | |
| 7240 /* | |
| 7241 * Give some info about the position of the cursor (for "g CTRL-G"). | |
| 7242 * In Visual mode, give some info about the selected region. (In this case, | |
| 7243 * 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
|
7244 * When "dict" is not NULL store the info there instead of showing it. |
| 7 | 7245 */ |
| 7246 void | |
|
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7247 cursor_pos_info(dict_T *dict) |
| 7 | 7248 { |
| 7249 char_u *p; | |
| 274 | 7250 char_u buf1[50]; |
| 7251 char_u buf2[40]; | |
| 7 | 7252 linenr_T lnum; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7253 varnumber_T byte_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7254 varnumber_T bom_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7255 varnumber_T byte_count_cursor = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7256 varnumber_T char_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7257 varnumber_T char_count_cursor = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7258 varnumber_T word_count = 0; |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7259 varnumber_T word_count_cursor = 0; |
| 7 | 7260 int eol_size; |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7261 varnumber_T last_check = 100000L; |
| 7 | 7262 long line_count_selected = 0; |
| 7263 pos_T min_pos, max_pos; | |
| 7264 oparg_T oparg; | |
| 7265 struct block_def bd; | |
| 7266 | |
| 7267 /* | |
| 7268 * Compute the length of the file in characters. | |
| 7269 */ | |
| 7270 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
| 7271 { | |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7272 if (dict == NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7273 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
7274 msg(_(no_lines_msg)); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7275 return; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7276 } |
| 7 | 7277 } |
| 7278 else | |
| 7279 { | |
| 7280 if (get_fileformat(curbuf) == EOL_DOS) | |
| 7281 eol_size = 2; | |
| 7282 else | |
| 7283 eol_size = 1; | |
| 7284 | |
| 7285 if (VIsual_active) | |
| 7286 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
7287 if (LT_POS(VIsual, curwin->w_cursor)) |
| 7 | 7288 { |
| 7289 min_pos = VIsual; | |
| 7290 max_pos = curwin->w_cursor; | |
| 7291 } | |
| 7292 else | |
| 7293 { | |
| 7294 min_pos = curwin->w_cursor; | |
| 7295 max_pos = VIsual; | |
| 7296 } | |
| 7297 if (*p_sel == 'e' && max_pos.col > 0) | |
| 7298 --max_pos.col; | |
| 7299 | |
| 7300 if (VIsual_mode == Ctrl_V) | |
| 7301 { | |
| 1866 | 7302 #ifdef FEAT_LINEBREAK |
| 7303 char_u * saved_sbr = p_sbr; | |
| 7304 | |
| 7305 /* Make 'sbr' empty for a moment to get the correct size. */ | |
| 7306 p_sbr = empty_option; | |
| 7307 #endif | |
| 7 | 7308 oparg.is_VIsual = 1; |
| 7309 oparg.block_mode = TRUE; | |
| 7310 oparg.op_type = OP_NOP; | |
| 7311 getvcols(curwin, &min_pos, &max_pos, | |
| 688 | 7312 &oparg.start_vcol, &oparg.end_vcol); |
| 1866 | 7313 #ifdef FEAT_LINEBREAK |
| 7314 p_sbr = saved_sbr; | |
| 7315 #endif | |
| 688 | 7316 if (curwin->w_curswant == MAXCOL) |
| 7317 oparg.end_vcol = MAXCOL; | |
| 7 | 7318 /* Swap the start, end vcol if needed */ |
| 7319 if (oparg.end_vcol < oparg.start_vcol) | |
| 7320 { | |
| 7321 oparg.end_vcol += oparg.start_vcol; | |
| 7322 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
| 7323 oparg.end_vcol -= oparg.start_vcol; | |
| 7324 } | |
| 7325 } | |
| 7326 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
| 7327 } | |
| 7328 | |
| 7329 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
| 7330 { | |
| 7331 /* Check for a CTRL-C every 100000 characters. */ | |
| 161 | 7332 if (byte_count > last_check) |
| 7 | 7333 { |
| 7334 ui_breakcheck(); | |
| 7335 if (got_int) | |
| 7336 return; | |
| 161 | 7337 last_check = byte_count + 100000L; |
| 7 | 7338 } |
| 7339 | |
| 7340 /* Do extra processing for VIsual mode. */ | |
| 7341 if (VIsual_active | |
| 7342 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
| 7343 { | |
| 45 | 7344 char_u *s = NULL; |
| 7345 long len = 0L; | |
| 7346 | |
| 7 | 7347 switch (VIsual_mode) |
| 7348 { | |
| 7349 case Ctrl_V: | |
| 7350 virtual_op = virtual_active(); | |
| 7351 block_prep(&oparg, &bd, lnum, 0); | |
| 7352 virtual_op = MAYBE; | |
| 45 | 7353 s = bd.textstart; |
| 7354 len = (long)bd.textlen; | |
| 7 | 7355 break; |
| 7356 case 'V': | |
| 45 | 7357 s = ml_get(lnum); |
| 7358 len = MAXCOL; | |
| 7 | 7359 break; |
| 7360 case 'v': | |
| 7361 { | |
| 7362 colnr_T start_col = (lnum == min_pos.lnum) | |
| 7363 ? min_pos.col : 0; | |
| 7364 colnr_T end_col = (lnum == max_pos.lnum) | |
| 7365 ? max_pos.col - start_col + 1 : MAXCOL; | |
| 7366 | |
| 45 | 7367 s = ml_get(lnum) + start_col; |
| 7368 len = end_col; | |
| 7 | 7369 } |
| 7370 break; | |
| 7371 } | |
| 45 | 7372 if (s != NULL) |
| 7373 { | |
| 161 | 7374 byte_count_cursor += line_count_info(s, &word_count_cursor, |
| 7375 &char_count_cursor, len, eol_size); | |
| 45 | 7376 if (lnum == curbuf->b_ml.ml_line_count |
| 7377 && !curbuf->b_p_eol | |
| 6933 | 7378 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
| 50 | 7379 && (long)STRLEN(s) < len) |
| 161 | 7380 byte_count_cursor -= eol_size; |
| 45 | 7381 } |
| 7 | 7382 } |
| 7383 else | |
| 7384 { | |
| 7385 /* In non-visual mode, check for the line the cursor is on */ | |
| 7386 if (lnum == curwin->w_cursor.lnum) | |
| 7387 { | |
| 7388 word_count_cursor += word_count; | |
| 161 | 7389 char_count_cursor += char_count; |
| 7390 byte_count_cursor = byte_count + | |
| 7391 line_count_info(ml_get(lnum), | |
| 7392 &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
|
7393 (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
|
7394 eol_size); |
| 7 | 7395 } |
| 7396 } | |
| 7397 /* Add to the running totals */ | |
| 161 | 7398 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
|
7399 &char_count, (varnumber_T)MAXCOL, |
|
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7400 eol_size); |
| 7 | 7401 } |
| 7402 | |
| 7403 /* Correction for when last line doesn't have an EOL. */ | |
| 6933 | 7404 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
| 161 | 7405 byte_count -= eol_size; |
| 7 | 7406 |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7407 if (dict == NULL) |
| 7 | 7408 { |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7409 if (VIsual_active) |
| 7 | 7410 { |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7411 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
|
7412 { |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7413 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
|
7414 &max_pos.col); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7415 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
|
7416 (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
|
7417 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7418 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7419 buf1[0] = NUL; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7420 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7421 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
|
7422 && char_count == byte_count) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7423 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7424 _("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
|
7425 buf1, line_count_selected, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7426 (long)curbuf->b_ml.ml_line_count, |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7427 (long_long_T)word_count_cursor, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7428 (long_long_T)word_count, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7429 (long_long_T)byte_count_cursor, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7430 (long_long_T)byte_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7431 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7432 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7433 _("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
|
7434 buf1, line_count_selected, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7435 (long)curbuf->b_ml.ml_line_count, |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7436 (long_long_T)word_count_cursor, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7437 (long_long_T)word_count, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7438 (long_long_T)char_count_cursor, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7439 (long_long_T)char_count, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7440 (long_long_T)byte_count_cursor, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7441 (long_long_T)byte_count); |
| 7 | 7442 } |
| 7443 else | |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7444 { |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7445 p = ml_get_curline(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7446 validate_virtcol(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7447 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
|
7448 (int)curwin->w_virtcol + 1); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7449 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
|
7450 linetabsize(p)); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7451 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7452 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
|
7453 && char_count == byte_count) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7454 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7455 _("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
|
7456 (char *)buf1, (char *)buf2, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7457 (long)curwin->w_cursor.lnum, |
| 7 | 7458 (long)curbuf->b_ml.ml_line_count, |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7459 (long_long_T)word_count_cursor, (long_long_T)word_count, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7460 (long_long_T)byte_count_cursor, (long_long_T)byte_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7461 else |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7462 vim_snprintf((char *)IObuff, IOSIZE, |
|
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7463 _("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
|
7464 (char *)buf1, (char *)buf2, |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7465 (long)curwin->w_cursor.lnum, |
| 161 | 7466 (long)curbuf->b_ml.ml_line_count, |
|
15517
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7467 (long_long_T)word_count_cursor, (long_long_T)word_count, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7468 (long_long_T)char_count_cursor, (long_long_T)char_count, |
|
2ad5f0ffaa2e
patch 8.1.0766: various problems when using Vim on VMS
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
7469 (long_long_T)byte_count_cursor, (long_long_T)byte_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7470 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7471 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7472 |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7473 bom_count = bomb_size(); |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7474 if (bom_count > 0) |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7475 vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE, |
|
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7476 _("(+%lld for BOM)"), (long_long_T)bom_count); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7477 if (dict == NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7478 { |
|
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7479 /* 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
|
7480 p = p_shm; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7481 p_shm = (char_u *)""; |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15517
diff
changeset
|
7482 msg((char *)IObuff); |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7483 p_shm = p; |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7484 } |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7485 } |
|
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7486 #if defined(FEAT_EVAL) |
|
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7487 if (dict != NULL) |
|
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7488 { |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7489 dict_add_number(dict, "words", word_count); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7490 dict_add_number(dict, "chars", char_count); |
|
15597
536dd2bc5ac9
patch 8.1.0806: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7491 dict_add_number(dict, "bytes", byte_count + bom_count); |
|
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7492 dict_add_number(dict, VIsual_active ? "visual_bytes" : "cursor_bytes", |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7493 byte_count_cursor); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7494 dict_add_number(dict, VIsual_active ? "visual_chars" : "cursor_chars", |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7495 char_count_cursor); |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7496 dict_add_number(dict, VIsual_active ? "visual_words" : "cursor_words", |
|
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7497 word_count_cursor); |
| 7 | 7498 } |
|
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7499 #endif |
| 7 | 7500 } |