Mercurial > vim
annotate src/ops.c @ 15361:58b125df3e9b v8.1.0688
patch 8.1.0688: text properties are not restored by undo
commit https://github.com/vim/vim/commit/ccae4672fd622f2feac8322be71b6e43e68dc4fc
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jan 4 15:09:57 2019 +0100
patch 8.1.0688: text properties are not restored by undo
Problem: Text properties are not restored by undo.
Solution: Also save text properties for undo.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 04 Jan 2019 15:15:06 +0100 |
parents | fe428bee74b3 |
children | b55b89692fd2 |
rev | line source |
---|---|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9834
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
7 | 2 * |
3 * VIM - Vi IMproved by Bram Moolenaar | |
4 * | |
5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
6 * Do ":help credits" in Vim to see a list of people who contributed. | |
7 * See README.txt for an overview of the Vim source code. | |
8 */ | |
9 | |
10 /* | |
11 * ops.c: implementation of various operators: op_shift, op_delete, op_tilde, | |
12 * op_change, op_yank, do_put, do_join | |
13 */ | |
14 | |
15 #include "vim.h" | |
16 | |
17 /* | |
18 * Number of registers. | |
19 * 0 = unnamed register, for normal yanks and puts | |
20 * 1..9 = registers '1' to '9', for deletes | |
21 * 10..35 = registers 'a' to 'z' | |
22 * 36 = delete register '-' | |
23 * 37 = Selection register '*'. Only if FEAT_CLIPBOARD defined | |
24 * 38 = Clipboard register '+'. Only if FEAT_CLIPBOARD and FEAT_X11 defined | |
25 */ | |
26 /* | |
27 * Symbolic names for some registers. | |
28 */ | |
29 #define DELETION_REGISTER 36 | |
30 #ifdef FEAT_CLIPBOARD | |
31 # define STAR_REGISTER 37 | |
32 # ifdef FEAT_X11 | |
33 # define PLUS_REGISTER 38 | |
34 # else | |
35 # define PLUS_REGISTER STAR_REGISTER /* there is only one */ | |
36 # endif | |
37 #endif | |
38 #ifdef FEAT_DND | |
39 # define TILDE_REGISTER (PLUS_REGISTER + 1) | |
40 #endif | |
41 | |
42 #ifdef FEAT_CLIPBOARD | |
43 # ifdef FEAT_DND | |
44 # define NUM_REGISTERS (TILDE_REGISTER + 1) | |
45 # else | |
46 # define NUM_REGISTERS (PLUS_REGISTER + 1) | |
47 # endif | |
48 #else | |
49 # define NUM_REGISTERS 37 | |
50 #endif | |
51 | |
52 /* | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
53 * Each yank register has an array of pointers to lines. |
7 | 54 */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
55 typedef struct |
7 | 56 { |
57 char_u **y_array; /* pointer to array of line pointers */ | |
58 linenr_T y_size; /* number of lines in y_array */ | |
59 char_u y_type; /* MLINE, MCHAR or MBLOCK */ | |
60 colnr_T y_width; /* only set if y_type == MBLOCK */ | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
61 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
62 time_t y_time_set; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
63 #endif |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
64 } yankreg_T; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
65 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
66 static yankreg_T y_regs[NUM_REGISTERS]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
67 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
68 static yankreg_T *y_current; /* ptr to current yankreg */ |
7 | 69 static int y_append; /* TRUE when appending */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
70 static yankreg_T *y_previous = NULL; /* ptr to last written yankreg */ |
7 | 71 |
72 /* | |
73 * structure used by block_prep, op_delete and op_yank for blockwise operators | |
74 * also op_change, op_shift, op_insert, op_replace - AKelly | |
75 */ | |
76 struct block_def | |
77 { | |
1839 | 78 int startspaces; /* 'extra' cols before first char */ |
79 int endspaces; /* 'extra' cols after last char */ | |
7 | 80 int textlen; /* chars in block */ |
1839 | 81 char_u *textstart; /* pointer to 1st char (partially) in block */ |
82 colnr_T textcol; /* index of chars (partially) in block */ | |
7 | 83 colnr_T start_vcol; /* start col of 1st char wholly inside block */ |
84 colnr_T end_vcol; /* start col of 1st char wholly after block */ | |
85 #ifdef FEAT_VISUALEXTRA | |
86 int is_short; /* TRUE if line is too short to fit in block */ | |
87 int is_MAX; /* TRUE if curswant==MAXCOL when starting */ | |
88 int is_oneChar; /* TRUE if block within one character */ | |
89 int pre_whitesp; /* screen cols of ws before block */ | |
90 int pre_whitesp_c; /* chars of ws before block */ | |
91 colnr_T end_char_vcols; /* number of vcols of post-block char */ | |
92 #endif | |
93 colnr_T start_char_vcols; /* number of vcols of pre-block char */ | |
94 }; | |
95 | |
96 #ifdef FEAT_VISUALEXTRA | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
97 static void shift_block(oparg_T *oap, int amount); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
98 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
99 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
|
100 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
|
101 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
|
102 int silent); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
103 static void stuffescaped(char_u *arg, int literally); |
7 | 104 #ifdef FEAT_MBYTE |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
105 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
|
106 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
107 static void free_yank_all(void); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
108 static int yank_copy_line(struct block_def *bd, long y_idx); |
7 | 109 #ifdef FEAT_CLIPBOARD |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
110 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
|
111 static void may_set_selection(void); |
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 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
|
114 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
|
115 static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1); |
7 | 116 #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
|
117 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
|
118 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
119 static int ends_in_white(linenr_T lnum); |
7 | 120 #ifdef FEAT_COMMENTS |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
121 static int fmt_check_par(linenr_T, int *, char_u **, int do_comments); |
7 | 122 #else |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
123 static int fmt_check_par(linenr_T); |
7 | 124 #endif |
125 | |
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
|
126 // 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
|
127 #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
|
128 #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
|
129 |
7 | 130 /* |
131 * The names of operators. | |
132 * 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
|
133 * The third field holds OPF_ flags. |
7 | 134 */ |
135 static char opchars[][3] = | |
136 { | |
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
|
137 {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
|
138 {'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
|
139 {'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
|
140 {'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
|
141 {'<', 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
|
142 {'>', 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
|
143 {'!', 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
|
144 {'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
|
145 {'=', 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
|
146 {'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
|
147 {':', 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
|
148 {'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
|
149 {'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
|
150 {'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
|
151 {'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
|
152 {'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
|
153 {'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
|
154 {'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
|
155 {'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
|
156 {'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
|
157 {'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
|
158 {'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
|
159 {'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
|
160 {'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
|
161 {'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
|
162 {'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
|
163 {'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
|
164 {'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
|
165 {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
|
166 {Ctrl_X, NUL, OPF_CHANGE}, // OP_NR_SUB |
7 | 167 }; |
168 | |
169 /* | |
170 * Translate a command name into an operator type. | |
171 * Must only be called with a valid operator name! | |
172 */ | |
173 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
174 get_op_type(int char1, int char2) |
7 | 175 { |
176 int i; | |
177 | |
178 if (char1 == 'r') /* ignore second character */ | |
179 return OP_REPLACE; | |
180 if (char1 == '~') /* when tilde is an operator */ | |
181 return OP_TILDE; | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
182 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
|
183 return OP_NR_ADD; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
184 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
|
185 return OP_NR_SUB; |
7 | 186 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
|
187 { |
7 | 188 if (opchars[i][0] == char1 && opchars[i][1] == char2) |
189 break; | |
13072
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
190 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
|
191 { |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
192 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
|
193 break; |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
194 } |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
195 } |
7 | 196 return i; |
197 } | |
198 | |
199 /* | |
200 * Return TRUE if operator "op" always works on whole lines. | |
201 */ | |
202 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
203 op_on_lines(int op) |
7 | 204 { |
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
|
205 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
|
206 } |
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 |
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 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
|
210 */ |
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
|
211 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
|
212 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
|
213 { |
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
|
214 return opchars[op][2] & OPF_CHANGE; |
7 | 215 } |
216 | |
217 /* | |
218 * Get first operator command character. | |
219 * Returns 'g' or 'z' if there is another command character. | |
220 */ | |
221 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
222 get_op_char(int optype) |
7 | 223 { |
224 return opchars[optype][0]; | |
225 } | |
226 | |
227 /* | |
228 * Get second operator command character. | |
229 */ | |
230 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
231 get_extra_op_char(int optype) |
7 | 232 { |
233 return opchars[optype][1]; | |
234 } | |
235 | |
236 /* | |
237 * op_shift - handle a shift operation | |
238 */ | |
239 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
240 op_shift(oparg_T *oap, int curs_top, int amount) |
7 | 241 { |
242 long i; | |
243 int first_char; | |
244 int block_col = 0; | |
245 | |
246 if (u_save((linenr_T)(oap->start.lnum - 1), | |
247 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
248 return; | |
249 | |
250 if (oap->block_mode) | |
251 block_col = curwin->w_cursor.col; | |
252 | |
253 for (i = oap->line_count; --i >= 0; ) | |
254 { | |
255 first_char = *ml_get_curline(); | |
256 if (first_char == NUL) /* empty line */ | |
257 curwin->w_cursor.col = 0; | |
258 #ifdef FEAT_VISUALEXTRA | |
259 else if (oap->block_mode) | |
260 shift_block(oap, amount); | |
261 #endif | |
262 else | |
263 /* Move the line right if it doesn't start with '#', 'smartindent' | |
264 * isn't set or 'cindent' isn't set or '#' isn't in 'cino'. */ | |
265 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
266 if (first_char != '#' || !preprocs_left()) | |
267 #endif | |
268 { | |
1516 | 269 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE); |
7 | 270 } |
271 ++curwin->w_cursor.lnum; | |
272 } | |
273 | |
274 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
275 if (oap->block_mode) | |
276 { | |
277 curwin->w_cursor.lnum = oap->start.lnum; | |
278 curwin->w_cursor.col = block_col; | |
279 } | |
5735 | 280 else if (curs_top) /* put cursor on first line, for ">>" */ |
7 | 281 { |
282 curwin->w_cursor.lnum = oap->start.lnum; | |
283 beginline(BL_SOL | BL_FIX); /* shift_line() may have set cursor.col */ | |
284 } | |
285 else | |
286 --curwin->w_cursor.lnum; /* put cursor on last line, for ":>" */ | |
287 | |
10486
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
288 #ifdef FEAT_FOLDING |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
289 /* 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
|
290 foldOpenCursor(); |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
291 #endif |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
292 |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
293 |
7 | 294 if (oap->line_count > p_report) |
295 { | |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
296 char *op; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
297 char *msg_line_single; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
298 char *msg_line_plural; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
299 |
7 | 300 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
|
301 op = ">"; |
7 | 302 else |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
303 op = "<"; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
304 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
|
305 "%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
|
306 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
|
307 "%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
|
308 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
|
309 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
|
310 oap->line_count, op, amount); |
7 | 311 msg(IObuff); |
312 } | |
313 | |
314 /* | |
315 * Set "'[" and "']" marks. | |
316 */ | |
317 curbuf->b_op_start = oap->start; | |
318 curbuf->b_op_end.lnum = oap->end.lnum; | |
319 curbuf->b_op_end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
320 if (curbuf->b_op_end.col > 0) | |
321 --curbuf->b_op_end.col; | |
322 } | |
323 | |
324 /* | |
325 * shift the current line one shiftwidth left (if left != 0) or right | |
326 * leaves cursor on first blank in the line | |
327 */ | |
328 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
329 shift_line( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
330 int left, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
331 int round, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
332 int amount, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
333 int call_changed_bytes) /* call changed_bytes() */ |
7 | 334 { |
335 int count; | |
336 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
|
337 int p_sw = (int)get_sw_value_indent(curbuf); |
7 | 338 |
339 count = get_indent(); /* get current indent */ | |
340 | |
341 if (round) /* round off indent */ | |
342 { | |
343 i = count / p_sw; /* number of p_sw rounded down */ | |
344 j = count % p_sw; /* extra spaces */ | |
345 if (j && left) /* first remove extra spaces */ | |
346 --amount; | |
347 if (left) | |
348 { | |
349 i -= amount; | |
350 if (i < 0) | |
351 i = 0; | |
352 } | |
353 else | |
354 i += amount; | |
355 count = i * p_sw; | |
356 } | |
357 else /* original vi indent */ | |
358 { | |
359 if (left) | |
360 { | |
361 count -= p_sw * amount; | |
362 if (count < 0) | |
363 count = 0; | |
364 } | |
365 else | |
366 count += p_sw * amount; | |
367 } | |
368 | |
369 /* Set new indent */ | |
370 if (State & VREPLACE_FLAG) | |
1516 | 371 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes); |
7 | 372 else |
1516 | 373 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0); |
7 | 374 } |
375 | |
376 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
377 /* | |
378 * Shift one line of the current block one shiftwidth right or left. | |
379 * Leaves cursor on first character in block. | |
380 */ | |
381 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
382 shift_block(oparg_T *oap, int amount) |
7 | 383 { |
384 int left = (oap->op_type == OP_LSHIFT); | |
385 int oldstate = State; | |
1839 | 386 int total; |
387 char_u *newp, *oldp; | |
7 | 388 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
|
389 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
|
390 #ifdef FEAT_VARTABS |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
391 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
|
392 #endif |
7 | 393 int p_ts = (int)curbuf->b_p_ts; |
394 struct block_def bd; | |
395 int incr; | |
1839 | 396 colnr_T ws_vcol; |
7 | 397 int i = 0, j = 0; |
398 int len; | |
399 #ifdef FEAT_RIGHTLEFT | |
400 int old_p_ri = p_ri; | |
401 | |
4352 | 402 p_ri = 0; /* don't want revins in indent */ |
7 | 403 #endif |
404 | |
405 State = INSERT; /* don't want REPLACE for State */ | |
406 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); | |
407 if (bd.is_short) | |
408 return; | |
409 | |
410 /* 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
|
411 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
|
412 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
|
413 return; /* multiplication overflow */ |
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
414 |
7 | 415 oldp = ml_get_curline(); |
416 | |
417 if (!left) | |
418 { | |
419 /* | |
420 * 1. Get start vcol | |
421 * 2. Total ws vcols | |
422 * 3. Divvy into TABs & spp | |
423 * 4. Construct new string | |
424 */ | |
425 total += bd.pre_whitesp; /* all virtual WS upto & incl a split TAB */ | |
426 ws_vcol = bd.start_vcol - bd.pre_whitesp; | |
427 if (bd.startspaces) | |
428 { | |
429 #ifdef FEAT_MBYTE | |
430 if (has_mbyte) | |
8399
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
431 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
432 if ((*mb_ptr2len)(bd.textstart) == 1) |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
433 ++bd.textstart; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
434 else |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
435 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
436 ws_vcol = 0; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
437 bd.startspaces = 0; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
438 } |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
439 } |
1995 | 440 else |
441 #endif | |
442 ++bd.textstart; | |
7 | 443 } |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
444 for ( ; VIM_ISWHITE(*bd.textstart); ) |
7 | 445 { |
5995 | 446 /* TODO: is passing bd.textstart for start of the line OK? */ |
447 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, | |
448 (colnr_T)(bd.start_vcol)); | |
7 | 449 total += incr; |
450 bd.start_vcol += incr; | |
451 } | |
452 /* OK, now total=all the VWS reqd, and textstart points at the 1st | |
453 * 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
|
454 #ifdef FEAT_VARTABS |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
455 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
|
456 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
|
457 else |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
458 j = total; |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
459 #else |
7 | 460 if (!curbuf->b_p_et) |
461 i = ((ws_vcol % p_ts) + total) / p_ts; /* number of tabs */ | |
462 if (i) | |
463 j = ((ws_vcol % p_ts) + total) % p_ts; /* number of spp */ | |
464 else | |
465 j = total; | |
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
466 #endif |
7 | 467 /* if we're splitting a TAB, allow for it */ |
468 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0); | |
469 len = (int)STRLEN(bd.textstart) + 1; | |
470 newp = alloc_check((unsigned)(bd.textcol + i + j + len)); | |
471 if (newp == NULL) | |
472 return; | |
473 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len)); | |
474 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
6929 | 475 vim_memset(newp + bd.textcol, TAB, (size_t)i); |
476 vim_memset(newp + bd.textcol + i, ' ', (size_t)j); | |
7 | 477 /* the end */ |
478 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len); | |
479 } | |
480 else /* left */ | |
481 { | |
1839 | 482 colnr_T destination_col; /* column to which text in block will |
483 be shifted */ | |
484 char_u *verbatim_copy_end; /* end of the part of the line which is | |
485 copied verbatim */ | |
486 colnr_T verbatim_copy_width;/* the (displayed) width of this part | |
487 of line */ | |
488 unsigned fill; /* nr of spaces that replace a TAB */ | |
489 unsigned new_line_len; /* the length of the line after the | |
490 block shift */ | |
491 size_t block_space_width; | |
492 size_t shift_amount; | |
493 char_u *non_white = bd.textstart; | |
494 colnr_T non_white_col; | |
495 | |
496 /* | |
497 * Firstly, let's find the first non-whitespace character that is | |
498 * displayed after the block's start column and the character's column | |
499 * number. Also, let's calculate the width of all the whitespace | |
500 * characters that are displayed in the block and precede the searched | |
501 * non-whitespace character. | |
502 */ | |
503 | |
504 /* If "bd.startspaces" is set, "bd.textstart" points to the character, | |
505 * the part of which is displayed at the block's beginning. Let's start | |
506 * searching from the next character. */ | |
507 if (bd.startspaces) | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
508 MB_PTR_ADV(non_white); |
1839 | 509 |
510 /* The character's column is in "bd.start_vcol". */ | |
511 non_white_col = bd.start_vcol; | |
512 | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
513 while (VIM_ISWHITE(*non_white)) |
7 | 514 { |
5995 | 515 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col); |
1839 | 516 non_white_col += incr; |
7 | 517 } |
1839 | 518 |
519 block_space_width = non_white_col - oap->start_vcol; | |
520 /* We will shift by "total" or "block_space_width", whichever is less. | |
521 */ | |
1860 | 522 shift_amount = (block_space_width < (size_t)total |
523 ? block_space_width : (size_t)total); | |
1839 | 524 |
525 /* The column to which we will shift the text. */ | |
1860 | 526 destination_col = (colnr_T)(non_white_col - shift_amount); |
1839 | 527 |
528 /* Now let's find out how much of the beginning of the line we can | |
529 * reuse without modification. */ | |
530 verbatim_copy_end = bd.textstart; | |
531 verbatim_copy_width = bd.start_vcol; | |
532 | |
533 /* If "bd.startspaces" is set, "bd.textstart" points to the character | |
534 * preceding the block. We have to subtract its width to obtain its | |
535 * column number. */ | |
536 if (bd.startspaces) | |
537 verbatim_copy_width -= bd.start_char_vcols; | |
538 while (verbatim_copy_width < destination_col) | |
7 | 539 { |
5995 | 540 char_u *line = verbatim_copy_end; |
541 | |
542 /* TODO: is passing verbatim_copy_end for start of the line OK? */ | |
543 incr = lbr_chartabsize(line, verbatim_copy_end, | |
544 verbatim_copy_width); | |
1839 | 545 if (verbatim_copy_width + incr > destination_col) |
546 break; | |
547 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
|
548 MB_PTR_ADV(verbatim_copy_end); |
7 | 549 } |
550 | |
1839 | 551 /* If "destination_col" is different from the width of the initial |
552 * part of the line that will be copied, it means we encountered a tab | |
553 * character, which we will have to partly replace with spaces. */ | |
554 fill = destination_col - verbatim_copy_width; | |
555 | |
556 /* The replacement line will consist of: | |
557 * - the beginning of the original line up to "verbatim_copy_end", | |
558 * - "fill" number of spaces, | |
559 * - the rest of the line, pointed to by non_white. */ | |
560 new_line_len = (unsigned)(verbatim_copy_end - oldp) | |
561 + fill | |
562 + (unsigned)STRLEN(non_white) + 1; | |
563 | |
564 newp = alloc_check(new_line_len); | |
7 | 565 if (newp == NULL) |
566 return; | |
1839 | 567 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); |
6929 | 568 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill); |
1839 | 569 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); |
7 | 570 } |
571 /* replace the line */ | |
572 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
573 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol); | |
574 State = oldstate; | |
575 curwin->w_cursor.col = oldcol; | |
576 #ifdef FEAT_RIGHTLEFT | |
577 p_ri = old_p_ri; | |
578 #endif | |
579 } | |
580 #endif | |
581 | |
582 #ifdef FEAT_VISUALEXTRA | |
583 /* | |
584 * Insert string "s" (b_insert ? before : after) block :AKelly | |
585 * Caller must prepare for undo. | |
586 */ | |
587 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
588 block_insert( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
589 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
590 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
591 int b_insert, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
592 struct block_def *bdp) |
7 | 593 { |
594 int p_ts; | |
595 int count = 0; /* extra spaces to replace a cut TAB */ | |
596 int spaces = 0; /* non-zero if cutting a TAB */ | |
597 colnr_T offset; /* pointer along new line */ | |
598 unsigned s_len; /* STRLEN(s) */ | |
599 char_u *newp, *oldp; /* new, old lines */ | |
600 linenr_T lnum; /* loop var */ | |
601 int oldstate = State; | |
602 | |
603 State = INSERT; /* don't want REPLACE for State */ | |
604 s_len = (unsigned)STRLEN(s); | |
605 | |
606 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) | |
607 { | |
608 block_prep(oap, bdp, lnum, TRUE); | |
609 if (bdp->is_short && b_insert) | |
610 continue; /* OP_INSERT, line ends before block start */ | |
611 | |
612 oldp = ml_get(lnum); | |
613 | |
614 if (b_insert) | |
615 { | |
616 p_ts = bdp->start_char_vcols; | |
617 spaces = bdp->startspaces; | |
618 if (spaces != 0) | |
619 count = p_ts - 1; /* we're cutting a TAB */ | |
620 offset = bdp->textcol; | |
621 } | |
622 else /* append */ | |
623 { | |
624 p_ts = bdp->end_char_vcols; | |
625 if (!bdp->is_short) /* spaces = padding after block */ | |
626 { | |
627 spaces = (bdp->endspaces ? p_ts - bdp->endspaces : 0); | |
628 if (spaces != 0) | |
629 count = p_ts - 1; /* we're cutting a TAB */ | |
630 offset = bdp->textcol + bdp->textlen - (spaces != 0); | |
631 } | |
632 else /* spaces = padding to block edge */ | |
633 { | |
634 /* if $ used, just append to EOL (ie spaces==0) */ | |
635 if (!bdp->is_MAX) | |
636 spaces = (oap->end_vcol - bdp->end_vcol) + 1; | |
637 count = spaces; | |
638 offset = bdp->textcol + bdp->textlen; | |
639 } | |
640 } | |
641 | |
6140 | 642 #ifdef FEAT_MBYTE |
643 if (has_mbyte && spaces > 0) | |
644 { | |
6460 | 645 int off; |
646 | |
6140 | 647 /* Avoid starting halfway a multi-byte character. */ |
648 if (b_insert) | |
649 { | |
6460 | 650 off = (*mb_head_off)(oldp, oldp + offset + spaces); |
6140 | 651 } |
652 else | |
653 { | |
6460 | 654 off = (*mb_off_next)(oldp, oldp + offset); |
6140 | 655 offset += off; |
656 } | |
6460 | 657 spaces -= off; |
658 count -= off; | |
6140 | 659 } |
660 #endif | |
661 | |
7 | 662 newp = alloc_check((unsigned)(STRLEN(oldp)) + s_len + count + 1); |
663 if (newp == NULL) | |
664 continue; | |
665 | |
666 /* copy up to shifted part */ | |
667 mch_memmove(newp, oldp, (size_t)(offset)); | |
668 oldp += offset; | |
669 | |
670 /* insert pre-padding */ | |
6929 | 671 vim_memset(newp + offset, ' ', (size_t)spaces); |
7 | 672 |
673 /* copy the new text */ | |
674 mch_memmove(newp + offset + spaces, s, (size_t)s_len); | |
675 offset += s_len; | |
676 | |
677 if (spaces && !bdp->is_short) | |
678 { | |
679 /* insert post-padding */ | |
6929 | 680 vim_memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces)); |
7 | 681 /* We're splitting a TAB, don't copy it. */ |
682 oldp++; | |
683 /* We allowed for that TAB, remember this now */ | |
684 count++; | |
685 } | |
686 | |
687 if (spaces > 0) | |
688 offset += count; | |
1622 | 689 STRMOVE(newp + offset, oldp); |
7 | 690 |
691 ml_replace(lnum, newp, FALSE); | |
692 | |
693 if (lnum == oap->end.lnum) | |
694 { | |
695 /* Set "']" mark to the end of the block instead of the end of | |
696 * the insert in the first line. */ | |
697 curbuf->b_op_end.lnum = oap->end.lnum; | |
698 curbuf->b_op_end.col = offset; | |
699 } | |
700 } /* for all lnum */ | |
701 | |
702 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
703 | |
704 State = oldstate; | |
705 } | |
706 #endif | |
707 | |
708 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(PROTO) | |
709 /* | |
710 * op_reindent - handle reindenting a block of lines. | |
711 */ | |
712 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
713 op_reindent(oparg_T *oap, int (*how)(void)) |
7 | 714 { |
715 long i; | |
716 char_u *l; | |
6971 | 717 int amount; |
7 | 718 linenr_T first_changed = 0; |
719 linenr_T last_changed = 0; | |
720 linenr_T start_lnum = curwin->w_cursor.lnum; | |
721 | |
216 | 722 /* Don't even try when 'modifiable' is off. */ |
723 if (!curbuf->b_p_ma) | |
724 { | |
725 EMSG(_(e_modifiable)); | |
726 return; | |
727 } | |
728 | |
7 | 729 for (i = oap->line_count; --i >= 0 && !got_int; ) |
730 { | |
731 /* it's a slow thing to do, so give feedback so there's no worry that | |
732 * the computer's just hung. */ | |
733 | |
734 if (i > 1 | |
735 && (i % 50 == 0 || i == oap->line_count - 1) | |
736 && oap->line_count > p_report) | |
737 smsg((char_u *)_("%ld lines to indent... "), i); | |
738 | |
739 /* | |
740 * Be vi-compatible: For lisp indenting the first line is not | |
741 * indented, unless there is only one line. | |
742 */ | |
743 #ifdef FEAT_LISP | |
744 if (i != oap->line_count - 1 || oap->line_count == 1 | |
745 || how != get_lisp_indent) | |
746 #endif | |
747 { | |
748 l = skipwhite(ml_get_curline()); | |
749 if (*l == NUL) /* empty or blank line */ | |
6971 | 750 amount = 0; |
7 | 751 else |
6971 | 752 amount = how(); /* get the indent for this line */ |
753 | |
754 if (amount >= 0 && set_indent(amount, SIN_UNDO)) | |
7 | 755 { |
756 /* did change the indent, call changed_lines() later */ | |
757 if (first_changed == 0) | |
758 first_changed = curwin->w_cursor.lnum; | |
759 last_changed = curwin->w_cursor.lnum; | |
760 } | |
761 } | |
762 ++curwin->w_cursor.lnum; | |
1550 | 763 curwin->w_cursor.col = 0; /* make sure it's valid */ |
7 | 764 } |
765 | |
766 /* put cursor on first non-blank of indented line */ | |
767 curwin->w_cursor.lnum = start_lnum; | |
768 beginline(BL_SOL | BL_FIX); | |
769 | |
770 /* Mark changed lines so that they will be redrawn. When Visual | |
771 * highlighting was present, need to continue until the last line. When | |
772 * there is no change still need to remove the Visual highlighting. */ | |
773 if (last_changed != 0) | |
774 changed_lines(first_changed, 0, | |
775 oap->is_VIsual ? start_lnum + oap->line_count : | |
776 last_changed + 1, 0L); | |
777 else if (oap->is_VIsual) | |
778 redraw_curbuf_later(INVERTED); | |
779 | |
780 if (oap->line_count > p_report) | |
781 { | |
782 i = oap->line_count - (i + 1); | |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
783 smsg((char_u *)NGETTEXT("%ld line indented ", |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
784 "%ld lines indented ", i), i); |
7 | 785 } |
786 /* set '[ and '] marks */ | |
787 curbuf->b_op_start = oap->start; | |
788 curbuf->b_op_end = oap->end; | |
789 } | |
790 #endif /* defined(FEAT_LISP) || defined(FEAT_CINDENT) */ | |
791 | |
792 #if defined(FEAT_EVAL) || defined(PROTO) | |
793 /* | |
794 * Keep the last expression line here, for repeating. | |
795 */ | |
796 static char_u *expr_line = NULL; | |
797 | |
798 /* | |
799 * Get an expression for the "\"=expr1" or "CTRL-R =expr1" | |
800 * Returns '=' when OK, NUL otherwise. | |
801 */ | |
802 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
803 get_expr_register(void) |
7 | 804 { |
805 char_u *new_line; | |
806 | |
807 new_line = getcmdline('=', 0L, 0); | |
808 if (new_line == NULL) | |
809 return NUL; | |
810 if (*new_line == NUL) /* use previous line */ | |
811 vim_free(new_line); | |
812 else | |
813 set_expr_line(new_line); | |
814 return '='; | |
815 } | |
816 | |
817 /* | |
818 * Set the expression for the '=' register. | |
819 * Argument must be an allocated string. | |
820 */ | |
821 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
822 set_expr_line(char_u *new_line) |
7 | 823 { |
824 vim_free(expr_line); | |
825 expr_line = new_line; | |
826 } | |
827 | |
828 /* | |
829 * Get the result of the '=' register expression. | |
830 * Returns a pointer to allocated memory, or NULL for failure. | |
831 */ | |
832 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
833 get_expr_line(void) |
7 | 834 { |
835 char_u *expr_copy; | |
836 char_u *rv; | |
994 | 837 static int nested = 0; |
7 | 838 |
839 if (expr_line == NULL) | |
840 return NULL; | |
841 | |
842 /* Make a copy of the expression, because evaluating it may cause it to be | |
843 * changed. */ | |
844 expr_copy = vim_strsave(expr_line); | |
845 if (expr_copy == NULL) | |
846 return NULL; | |
847 | |
994 | 848 /* When we are invoked recursively limit the evaluation to 10 levels. |
849 * Then return the string as-is. */ | |
850 if (nested >= 10) | |
851 return expr_copy; | |
852 | |
853 ++nested; | |
714 | 854 rv = eval_to_string(expr_copy, NULL, TRUE); |
994 | 855 --nested; |
7 | 856 vim_free(expr_copy); |
857 return rv; | |
858 } | |
283 | 859 |
860 /* | |
861 * Get the '=' register expression itself, without evaluating it. | |
862 */ | |
863 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
864 get_expr_line_src(void) |
283 | 865 { |
866 if (expr_line == NULL) | |
867 return NULL; | |
868 return vim_strsave(expr_line); | |
869 } | |
7 | 870 #endif /* FEAT_EVAL */ |
871 | |
872 /* | |
873 * Check if 'regname' is a valid name of a yank register. | |
874 * Note: There is no check for 0 (default register), caller should do this | |
875 */ | |
876 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
877 valid_yank_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
878 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
879 int writing) /* if TRUE check for writable registers */ |
7 | 880 { |
881 if ( (regname > 0 && ASCII_ISALNUM(regname)) | |
882 || (!writing && vim_strchr((char_u *) | |
883 #ifdef FEAT_EVAL | |
6557 | 884 "/.%:=" |
7 | 885 #else |
6557 | 886 "/.%:" |
7 | 887 #endif |
888 , regname) != NULL) | |
6557 | 889 || regname == '#' |
7 | 890 || regname == '"' |
891 || regname == '-' | |
892 || regname == '_' | |
893 #ifdef FEAT_CLIPBOARD | |
894 || regname == '*' | |
895 || regname == '+' | |
896 #endif | |
897 #ifdef FEAT_DND | |
898 || (!writing && regname == '~') | |
899 #endif | |
900 ) | |
901 return TRUE; | |
902 return FALSE; | |
903 } | |
904 | |
905 /* | |
906 * Set y_current and y_append, according to the value of "regname". | |
907 * Cannot handle the '_' register. | |
140 | 908 * Must only be called with a valid register name! |
7 | 909 * |
910 * If regname is 0 and writing, use register 0 | |
911 * 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
|
912 * |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
913 * 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
|
914 * clipboard). |
7 | 915 */ |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
916 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
917 get_yank_register(int regname, int writing) |
7 | 918 { |
919 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
|
920 int ret = FALSE; |
7 | 921 |
922 y_append = FALSE; | |
923 if ((regname == 0 || regname == '"') && !writing && y_previous != NULL) | |
924 { | |
925 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
|
926 return ret; |
7 | 927 } |
928 i = regname; | |
929 if (VIM_ISDIGIT(i)) | |
930 i -= '0'; | |
931 else if (ASCII_ISLOWER(i)) | |
932 i = CharOrdLow(i) + 10; | |
933 else if (ASCII_ISUPPER(i)) | |
934 { | |
935 i = CharOrdUp(i) + 10; | |
936 y_append = TRUE; | |
937 } | |
938 else if (regname == '-') | |
939 i = DELETION_REGISTER; | |
940 #ifdef FEAT_CLIPBOARD | |
941 /* When selection is not available, use register 0 instead of '*' */ | |
942 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
|
943 { |
7 | 944 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
|
945 ret = TRUE; |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
946 } |
7 | 947 /* When clipboard is not available, use register 0 instead of '+' */ |
948 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
|
949 { |
7 | 950 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
|
951 ret = TRUE; |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
952 } |
7 | 953 #endif |
954 #ifdef FEAT_DND | |
955 else if (!writing && regname == '~') | |
956 i = TILDE_REGISTER; | |
957 #endif | |
958 else /* not 0-9, a-z, A-Z or '-': use register 0 */ | |
959 i = 0; | |
960 y_current = &(y_regs[i]); | |
961 if (writing) /* remember the register we write into for do_put() */ | |
962 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
|
963 return ret; |
7 | 964 } |
965 | |
15 | 966 #if defined(FEAT_CLIPBOARD) || defined(PROTO) |
7 | 967 /* |
968 * When "regname" is a clipboard register, obtain the selection. If it's not | |
969 * available return zero, otherwise return "regname". | |
970 */ | |
15 | 971 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
972 may_get_selection(int regname) |
7 | 973 { |
974 if (regname == '*') | |
975 { | |
976 if (!clip_star.available) | |
977 regname = 0; | |
978 else | |
979 clip_get_selection(&clip_star); | |
980 } | |
981 else if (regname == '+') | |
982 { | |
983 if (!clip_plus.available) | |
984 regname = 0; | |
985 else | |
986 clip_get_selection(&clip_plus); | |
987 } | |
988 return regname; | |
989 } | |
990 #endif | |
991 | |
992 /* | |
993 * Obtain the contents of a "normal" register. The register is made empty. | |
994 * The returned pointer has allocated memory, use put_register() later. | |
995 */ | |
996 void * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
997 get_register( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
998 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
999 int copy) /* make a copy, if FALSE make register empty. */ |
7 | 1000 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1001 yankreg_T *reg; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1002 int i; |
7 | 1003 |
1004 #ifdef FEAT_CLIPBOARD | |
1005 /* When Visual area changed, may have to update selection. Obtain the | |
1006 * selection too. */ | |
1435 | 1007 if (name == '*' && clip_star.available) |
7 | 1008 { |
3674 | 1009 if (clip_isautosel_star()) |
1010 clip_update_selection(&clip_star); | |
1011 may_get_selection(name); | |
1012 } | |
1013 if (name == '+' && clip_plus.available) | |
1014 { | |
1015 if (clip_isautosel_plus()) | |
1016 clip_update_selection(&clip_plus); | |
7 | 1017 may_get_selection(name); |
1018 } | |
1019 #endif | |
1020 | |
1021 get_yank_register(name, 0); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1022 reg = (yankreg_T *)alloc((unsigned)sizeof(yankreg_T)); |
7 | 1023 if (reg != NULL) |
1024 { | |
1025 *reg = *y_current; | |
1026 if (copy) | |
1027 { | |
1028 /* If we run out of memory some or all of the lines are empty. */ | |
1029 if (reg->y_size == 0) | |
1030 reg->y_array = NULL; | |
1031 else | |
1032 reg->y_array = (char_u **)alloc((unsigned)(sizeof(char_u *) | |
1033 * reg->y_size)); | |
1034 if (reg->y_array != NULL) | |
1035 { | |
1036 for (i = 0; i < reg->y_size; ++i) | |
1037 reg->y_array[i] = vim_strsave(y_current->y_array[i]); | |
1038 } | |
1039 } | |
1040 else | |
1041 y_current->y_array = NULL; | |
1042 } | |
1043 return (void *)reg; | |
1044 } | |
1045 | |
1046 /* | |
1451 | 1047 * Put "reg" into register "name". Free any previous contents and "reg". |
7 | 1048 */ |
1049 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1050 put_register(int name, void *reg) |
7 | 1051 { |
1052 get_yank_register(name, 0); | |
1053 free_yank_all(); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1054 *y_current = *(yankreg_T *)reg; |
1451 | 1055 vim_free(reg); |
7 | 1056 |
5735 | 1057 #ifdef FEAT_CLIPBOARD |
7 | 1058 /* Send text written to clipboard register to the clipboard. */ |
1059 may_set_selection(); | |
5735 | 1060 #endif |
7 | 1061 } |
4209 | 1062 |
1063 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1064 free_register(void *reg) |
4209 | 1065 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1066 yankreg_T tmp; |
4209 | 1067 |
1068 tmp = *y_current; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1069 *y_current = *(yankreg_T *)reg; |
4209 | 1070 free_yank_all(); |
1071 vim_free(reg); | |
1072 *y_current = tmp; | |
1073 } | |
7 | 1074 |
1075 #if defined(FEAT_MOUSE) || defined(PROTO) | |
1076 /* | |
1077 * return TRUE if the current yank register has type MLINE | |
1078 */ | |
1079 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1080 yank_register_mline(int regname) |
7 | 1081 { |
1082 if (regname != 0 && !valid_yank_reg(regname, FALSE)) | |
1083 return FALSE; | |
1084 if (regname == '_') /* black hole is always empty */ | |
1085 return FALSE; | |
1086 get_yank_register(regname, FALSE); | |
1087 return (y_current->y_type == MLINE); | |
1088 } | |
1089 #endif | |
1090 | |
1091 /* | |
1157 | 1092 * Start or stop recording into a yank register. |
7 | 1093 * |
1157 | 1094 * Return FAIL for failure, OK otherwise. |
7 | 1095 */ |
1096 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1097 do_record(int c) |
7 | 1098 { |
1157 | 1099 char_u *p; |
1100 static int regname; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1101 yankreg_T *old_y_previous, *old_y_current; |
1157 | 1102 int retval; |
7 | 1103 |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1104 if (reg_recording == 0) /* start recording */ |
7 | 1105 { |
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
1106 /* registers 0-9, a-z and " are allowed */ |
7 | 1107 if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) |
1108 retval = FAIL; | |
1109 else | |
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 = c; |
7 | 1112 showmode(); |
1113 regname = c; | |
1114 retval = OK; | |
1115 } | |
1116 } | |
1117 else /* stop recording */ | |
1118 { | |
1119 /* | |
1157 | 1120 * Get the recorded key hits. K_SPECIAL and CSI will be escaped, this |
1121 * needs to be removed again to put it in a register. exec_reg then | |
1122 * adds the escaping back later. | |
7 | 1123 */ |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1124 reg_recording = 0; |
7 | 1125 MSG(""); |
1126 p = get_recorded(); | |
1127 if (p == NULL) | |
1128 retval = FAIL; | |
1129 else | |
1130 { | |
1081 | 1131 /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ |
1132 vim_unescape_csi(p); | |
1133 | |
7 | 1134 /* |
1135 * We don't want to change the default register here, so save and | |
1136 * restore the current register name. | |
1137 */ | |
1138 old_y_previous = y_previous; | |
1139 old_y_current = y_current; | |
1140 | |
1141 retval = stuff_yank(regname, p); | |
1142 | |
1143 y_previous = old_y_previous; | |
1144 y_current = old_y_current; | |
1145 } | |
1146 } | |
1147 return retval; | |
1148 } | |
1149 | |
1150 /* | |
1151 * Stuff string "p" into yank register "regname" as a single line (append if | |
1152 * uppercase). "p" must have been alloced. | |
1153 * | |
1154 * return FAIL for failure, OK otherwise | |
1155 */ | |
1156 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1157 stuff_yank(int regname, char_u *p) |
7 | 1158 { |
1159 char_u *lp; | |
1160 char_u **pp; | |
1161 | |
1162 /* check for read-only register */ | |
1163 if (regname != 0 && !valid_yank_reg(regname, TRUE)) | |
1164 { | |
1165 vim_free(p); | |
1166 return FAIL; | |
1167 } | |
1168 if (regname == '_') /* black hole: don't do anything */ | |
1169 { | |
1170 vim_free(p); | |
1171 return OK; | |
1172 } | |
1173 get_yank_register(regname, TRUE); | |
1174 if (y_append && y_current->y_array != NULL) | |
1175 { | |
1176 pp = &(y_current->y_array[y_current->y_size - 1]); | |
1177 lp = lalloc((long_u)(STRLEN(*pp) + STRLEN(p) + 1), TRUE); | |
1178 if (lp == NULL) | |
1179 { | |
1180 vim_free(p); | |
1181 return FAIL; | |
1182 } | |
1183 STRCPY(lp, *pp); | |
1184 STRCAT(lp, p); | |
1185 vim_free(p); | |
1186 vim_free(*pp); | |
1187 *pp = lp; | |
1188 } | |
1189 else | |
1190 { | |
1191 free_yank_all(); | |
1192 if ((y_current->y_array = | |
1193 (char_u **)alloc((unsigned)sizeof(char_u *))) == NULL) | |
1194 { | |
1195 vim_free(p); | |
1196 return FAIL; | |
1197 } | |
1198 y_current->y_array[0] = p; | |
1199 y_current->y_size = 1; | |
1200 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
|
1201 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1202 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
|
1203 #endif |
7 | 1204 } |
1205 return OK; | |
1206 } | |
1207 | |
1893 | 1208 static int execreg_lastc = NUL; |
1209 | |
7 | 1210 /* |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1211 * Execute a yank register: copy it into the stuff buffer. |
7 | 1212 * |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1213 * Return FAIL for failure, OK otherwise. |
7 | 1214 */ |
1215 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1216 do_execreg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1217 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1218 int colon, /* insert ':' before each line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1219 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
|
1220 int silent) /* set "silent" flag in typeahead buffer */ |
7 | 1221 { |
1222 long i; | |
1223 char_u *p; | |
1224 int retval = OK; | |
1225 int remap; | |
1226 | |
1227 if (regname == '@') /* repeat previous one */ | |
168 | 1228 { |
1893 | 1229 if (execreg_lastc == NUL) |
168 | 1230 { |
1231 EMSG(_("E748: No previously used register")); | |
1232 return FAIL; | |
1233 } | |
1893 | 1234 regname = execreg_lastc; |
168 | 1235 } |
7 | 1236 /* check for valid regname */ |
1237 if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) | |
168 | 1238 { |
1239 emsg_invreg(regname); | |
7 | 1240 return FAIL; |
168 | 1241 } |
1893 | 1242 execreg_lastc = regname; |
7 | 1243 |
1244 #ifdef FEAT_CLIPBOARD | |
1245 regname = may_get_selection(regname); | |
1246 #endif | |
1247 | |
1248 if (regname == '_') /* black hole: don't stuff anything */ | |
1249 return OK; | |
1250 | |
1251 #ifdef FEAT_CMDHIST | |
1252 if (regname == ':') /* use last command line */ | |
1253 { | |
1254 if (last_cmdline == NULL) | |
1255 { | |
1256 EMSG(_(e_nolastcmd)); | |
1257 return FAIL; | |
1258 } | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
1259 VIM_CLEAR(new_last_cmdline); /* don't keep the cmdline containing @: */ |
16 | 1260 /* Escape all control characters with a CTRL-V */ |
1261 p = vim_strsave_escaped_ext(last_cmdline, | |
20 | 1262 (char_u *)"\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037", Ctrl_V, FALSE); |
16 | 1263 if (p != NULL) |
480 | 1264 { |
1265 /* When in Visual mode "'<,'>" will be prepended to the command. | |
1266 * Remove it when it's already there. */ | |
1267 if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) | |
1077 | 1268 retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); |
480 | 1269 else |
1077 | 1270 retval = put_in_typebuf(p, TRUE, TRUE, silent); |
480 | 1271 } |
16 | 1272 vim_free(p); |
7 | 1273 } |
1274 #endif | |
1275 #ifdef FEAT_EVAL | |
1276 else if (regname == '=') | |
1277 { | |
1278 p = get_expr_line(); | |
1279 if (p == NULL) | |
1280 return FAIL; | |
1077 | 1281 retval = put_in_typebuf(p, TRUE, colon, silent); |
7 | 1282 vim_free(p); |
1283 } | |
1284 #endif | |
1285 else if (regname == '.') /* use last inserted text */ | |
1286 { | |
1287 p = get_last_insert_save(); | |
1288 if (p == NULL) | |
1289 { | |
1290 EMSG(_(e_noinstext)); | |
1291 return FAIL; | |
1292 } | |
1077 | 1293 retval = put_in_typebuf(p, FALSE, colon, silent); |
7 | 1294 vim_free(p); |
1295 } | |
1296 else | |
1297 { | |
1298 get_yank_register(regname, FALSE); | |
1299 if (y_current->y_array == NULL) | |
1300 return FAIL; | |
1301 | |
1302 /* Disallow remaping for ":@r". */ | |
1303 remap = colon ? REMAP_NONE : REMAP_YES; | |
1304 | |
1305 /* | |
1306 * Insert lines into typeahead buffer, from last one to first one. | |
1307 */ | |
1034 | 1308 put_reedit_in_typebuf(silent); |
7 | 1309 for (i = y_current->y_size; --i >= 0; ) |
1310 { | |
1077 | 1311 char_u *escaped; |
1312 | |
7 | 1313 /* insert NL between lines and after last line if type is MLINE */ |
1314 if (y_current->y_type == MLINE || i < y_current->y_size - 1 | |
1315 || addcr) | |
1316 { | |
1034 | 1317 if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) |
7 | 1318 return FAIL; |
1319 } | |
1077 | 1320 escaped = vim_strsave_escape_csi(y_current->y_array[i]); |
1321 if (escaped == NULL) | |
1322 return FAIL; | |
1323 retval = ins_typebuf(escaped, remap, 0, TRUE, silent); | |
1324 vim_free(escaped); | |
1325 if (retval == FAIL) | |
7 | 1326 return FAIL; |
1034 | 1327 if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) |
7 | 1328 == FAIL) |
1329 return FAIL; | |
1330 } | |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1331 reg_executing = regname == 0 ? '"' : regname; // disable "q" command |
7 | 1332 } |
1333 return retval; | |
1334 } | |
1335 | |
1336 /* | |
1337 * If "restart_edit" is not zero, put it in the typeahead buffer, so that it's | |
1338 * used only after other typeahead has been processed. | |
1339 */ | |
1340 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1341 put_reedit_in_typebuf(int silent) |
7 | 1342 { |
1343 char_u buf[3]; | |
1344 | |
1345 if (restart_edit != NUL) | |
1346 { | |
1347 if (restart_edit == 'V') | |
1348 { | |
1349 buf[0] = 'g'; | |
1350 buf[1] = 'R'; | |
1351 buf[2] = NUL; | |
1352 } | |
1353 else | |
1354 { | |
1355 buf[0] = restart_edit == 'I' ? 'i' : restart_edit; | |
1356 buf[1] = NUL; | |
1357 } | |
1034 | 1358 if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK) |
7 | 1359 restart_edit = NUL; |
1360 } | |
1361 } | |
1362 | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1363 /* |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1364 * 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
|
1365 * executed again. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1366 * 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
|
1367 * no remapping. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1368 */ |
7 | 1369 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1370 put_in_typebuf( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1371 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1372 int esc, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1373 int colon, /* add ':' before the line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1374 int silent) |
7 | 1375 { |
1376 int retval = OK; | |
1377 | |
1034 | 1378 put_reedit_in_typebuf(silent); |
7 | 1379 if (colon) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1380 retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent); |
7 | 1381 if (retval == OK) |
1077 | 1382 { |
1383 char_u *p; | |
1384 | |
1385 if (esc) | |
1386 p = vim_strsave_escape_csi(s); | |
1387 else | |
1388 p = s; | |
1389 if (p == NULL) | |
1390 retval = FAIL; | |
1391 else | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1392 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
|
1393 0, TRUE, silent); |
1077 | 1394 if (esc) |
1395 vim_free(p); | |
1396 } | |
7 | 1397 if (colon && retval == OK) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1398 retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent); |
7 | 1399 return retval; |
1400 } | |
1401 | |
1402 /* | |
1403 * Insert a yank register: copy it into the Read buffer. | |
1404 * Used by CTRL-R command and middle mouse button in insert mode. | |
1405 * | |
1406 * return FAIL for failure, OK otherwise | |
1407 */ | |
1408 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1409 insert_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1410 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
|
1411 int literally_arg) /* insert literally, not as if typed */ |
7 | 1412 { |
1413 long i; | |
1414 int retval = OK; | |
1415 char_u *arg; | |
1416 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
|
1417 int literally = literally_arg; |
7 | 1418 |
1419 /* | |
1420 * It is possible to get into an endless loop by having CTRL-R a in | |
1421 * register a and then, in insert mode, doing CTRL-R a. | |
1422 * If you hit CTRL-C, the loop will be broken here. | |
1423 */ | |
1424 ui_breakcheck(); | |
1425 if (got_int) | |
1426 return FAIL; | |
1427 | |
1428 /* check for valid regname */ | |
1429 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
1430 return FAIL; | |
1431 | |
1432 #ifdef FEAT_CLIPBOARD | |
1433 regname = may_get_selection(regname); | |
1434 #endif | |
1435 | |
1436 if (regname == '.') /* insert last inserted text */ | |
1437 retval = stuff_inserted(NUL, 1L, TRUE); | |
1438 else if (get_spec_reg(regname, &arg, &allocated, TRUE)) | |
1439 { | |
1440 if (arg == NULL) | |
1441 return FAIL; | |
1442 stuffescaped(arg, literally); | |
1443 if (allocated) | |
1444 vim_free(arg); | |
1445 } | |
1446 else /* name or number register */ | |
1447 { | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1448 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
|
1449 literally = TRUE; |
7 | 1450 if (y_current->y_array == NULL) |
1451 retval = FAIL; | |
1452 else | |
1453 { | |
1454 for (i = 0; i < y_current->y_size; ++i) | |
1455 { | |
1456 stuffescaped(y_current->y_array[i], literally); | |
1457 /* | |
1458 * Insert a newline between lines and after last line if | |
1459 * y_type is MLINE. | |
1460 */ | |
1461 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
1462 stuffcharReadbuff('\n'); | |
1463 } | |
1464 } | |
1465 } | |
1466 | |
1467 return retval; | |
1468 } | |
1469 | |
1470 /* | |
1471 * Stuff a string into the typeahead buffer, such that edit() will insert it | |
1472 * literally ("literally" TRUE) or interpret is as typed characters. | |
1473 */ | |
1474 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1475 stuffescaped(char_u *arg, int literally) |
7 | 1476 { |
1477 int c; | |
1478 char_u *start; | |
1479 | |
1480 while (*arg != NUL) | |
1481 { | |
1482 /* Stuff a sequence of normal ASCII characters, that's fast. Also | |
1483 * stuff K_SPECIAL to get the effect of a special key when "literally" | |
1484 * is TRUE. */ | |
1485 start = arg; | |
1486 while ((*arg >= ' ' | |
1487 #ifndef EBCDIC | |
1488 && *arg < DEL /* EBCDIC: chars above space are normal */ | |
1489 #endif | |
1490 ) | |
1491 || (*arg == K_SPECIAL && !literally)) | |
1492 ++arg; | |
1493 if (arg > start) | |
1494 stuffReadbuffLen(start, (long)(arg - start)); | |
1495 | |
1496 /* stuff a single special character */ | |
1497 if (*arg != NUL) | |
1498 { | |
1499 #ifdef FEAT_MBYTE | |
1500 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
|
1501 c = mb_cptr2char_adv(&arg); |
7 | 1502 else |
1503 #endif | |
1504 c = *arg++; | |
1505 if (literally && ((c < ' ' && c != TAB) || c == DEL)) | |
1506 stuffcharReadbuff(Ctrl_V); | |
1507 stuffcharReadbuff(c); | |
1508 } | |
1509 } | |
1510 } | |
1511 | |
1512 /* | |
1157 | 1513 * If "regname" is a special register, return TRUE and store a pointer to its |
1514 * value in "argp". | |
7 | 1515 */ |
15 | 1516 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1517 get_spec_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1518 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1519 char_u **argp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1520 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
|
1521 int errmsg) /* give error message when failing */ |
7 | 1522 { |
1523 int cnt; | |
1524 | |
1525 *argp = NULL; | |
1526 *allocated = FALSE; | |
1527 switch (regname) | |
1528 { | |
1529 case '%': /* file name */ | |
1530 if (errmsg) | |
1531 check_fname(); /* will give emsg if not set */ | |
1532 *argp = curbuf->b_fname; | |
1533 return TRUE; | |
1534 | |
1535 case '#': /* alternate file name */ | |
1536 *argp = getaltfname(errmsg); /* may give emsg if not set */ | |
1537 return TRUE; | |
1538 | |
1539 #ifdef FEAT_EVAL | |
1540 case '=': /* result of expression */ | |
1541 *argp = get_expr_line(); | |
1542 *allocated = TRUE; | |
1543 return TRUE; | |
1544 #endif | |
1545 | |
1546 case ':': /* last command line */ | |
1547 if (last_cmdline == NULL && errmsg) | |
1548 EMSG(_(e_nolastcmd)); | |
1549 *argp = last_cmdline; | |
1550 return TRUE; | |
1551 | |
1552 case '/': /* last search-pattern */ | |
1553 if (last_search_pat() == NULL && errmsg) | |
1554 EMSG(_(e_noprevre)); | |
1555 *argp = last_search_pat(); | |
1556 return TRUE; | |
1557 | |
1558 case '.': /* last inserted text */ | |
1559 *argp = get_last_insert_save(); | |
1560 *allocated = TRUE; | |
1561 if (*argp == NULL && errmsg) | |
1562 EMSG(_(e_noinstext)); | |
1563 return TRUE; | |
1564 | |
1565 #ifdef FEAT_SEARCHPATH | |
1566 case Ctrl_F: /* Filename under cursor */ | |
1567 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
1568 if (!errmsg) | |
1569 return FALSE; | |
1570 *argp = file_name_at_cursor(FNAME_MESS | FNAME_HYP | |
681 | 1571 | (regname == Ctrl_P ? FNAME_EXP : 0), 1L, NULL); |
7 | 1572 *allocated = TRUE; |
1573 return TRUE; | |
1574 #endif | |
1575 | |
1576 case Ctrl_W: /* word under cursor */ | |
1577 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
1578 if (!errmsg) | |
1579 return FALSE; | |
1580 cnt = find_ident_under_cursor(argp, regname == Ctrl_W | |
1581 ? (FIND_IDENT|FIND_STRING) : FIND_STRING); | |
1582 *argp = cnt ? vim_strnsave(*argp, cnt) : NULL; | |
1583 *allocated = TRUE; | |
1584 return TRUE; | |
1585 | |
13831
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1586 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
|
1587 if (!errmsg) |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1588 return FALSE; |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1589 |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1590 *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
|
1591 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
|
1592 return TRUE; |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1593 |
7 | 1594 case '_': /* black hole: always empty */ |
1595 *argp = (char_u *)""; | |
1596 return TRUE; | |
1597 } | |
1598 | |
1599 return FALSE; | |
1600 } | |
1601 | |
1602 /* | |
15 | 1603 * Paste a yank register into the command line. |
1604 * Only for non-special registers. | |
1605 * Used by CTRL-R command in command-line mode | |
7 | 1606 * insert_reg() can't be used here, because special characters from the |
1607 * register contents will be interpreted as commands. | |
1608 * | |
1609 * return FAIL for failure, OK otherwise | |
1610 */ | |
1611 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1612 cmdline_paste_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1613 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
|
1614 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
|
1615 int remcr) /* don't add CR characters */ |
7 | 1616 { |
1617 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
|
1618 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
|
1619 |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1620 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
|
1621 literally = TRUE; |
7 | 1622 if (y_current->y_array == NULL) |
1623 return FAIL; | |
1624 | |
1625 for (i = 0; i < y_current->y_size; ++i) | |
1626 { | |
1627 cmdline_paste_str(y_current->y_array[i], literally); | |
1628 | |
1015 | 1629 /* 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
|
1630 * 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
|
1631 if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr) |
7 | 1632 cmdline_paste_str((char_u *)"\r", literally); |
1633 | |
1634 /* Check for CTRL-C, in case someone tries to paste a few thousand | |
1635 * lines and gets bored. */ | |
1636 ui_breakcheck(); | |
1637 if (got_int) | |
1638 return FAIL; | |
1639 } | |
1640 return OK; | |
1641 } | |
1642 | |
1643 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
1644 /* | |
1645 * Adjust the register name pointed to with "rp" for the clipboard being | |
1646 * used always and the clipboard being available. | |
1647 */ | |
1648 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1649 adjust_clip_reg(int *rp) |
7 | 1650 { |
2654 | 1651 /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', |
1652 * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ | |
6116 | 1653 if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0)) |
1654 { | |
1655 if (clip_unnamed != 0) | |
1656 *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
2654 | 1657 ? '+' : '*'; |
6116 | 1658 else |
1659 *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
1660 ? '+' : '*'; | |
1661 } | |
7 | 1662 if (!clip_star.available && *rp == '*') |
1663 *rp = 0; | |
1664 if (!clip_plus.available && *rp == '+') | |
1665 *rp = 0; | |
1666 } | |
1667 #endif | |
1668 | |
1669 /* | |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1670 * 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
|
1671 */ |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1672 void |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1673 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
|
1674 { |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1675 int n; |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1676 |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1677 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
|
1678 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
|
1679 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
|
1680 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
|
1681 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
|
1682 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
|
1683 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
|
1684 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
|
1685 } |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1686 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1687 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1688 static void |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1689 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
|
1690 { |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1691 static int recursive = FALSE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1692 dict_T *v_event; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1693 list_T *list; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1694 int n; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1695 char_u buf[NUMBUFLEN + 2]; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1696 long reglen = 0; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1697 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1698 if (recursive) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1699 return; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1700 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1701 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
|
1702 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1703 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
|
1704 if (list == NULL) |
88cc06dc1a50
patch 8.0.1501: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1705 return; |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1706 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
|
1707 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
|
1708 list->lv_lock = VAR_FIXED; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1709 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
|
1710 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1711 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
|
1712 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
|
1713 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
|
1714 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1715 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
|
1716 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
|
1717 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
|
1718 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
|
1719 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1720 buf[0] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1721 buf[1] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1722 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
|
1723 { |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1724 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
|
1725 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
|
1726 case MBLOCK: |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1727 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
|
1728 reglen + 1); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1729 break; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1730 } |
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
1731 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
|
1732 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1733 /* 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
|
1734 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
|
1735 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1736 recursive = TRUE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1737 textlock++; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1738 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
|
1739 textlock--; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1740 recursive = FALSE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1741 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1742 /* 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
|
1743 dict_free_contents(v_event); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1744 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
|
1745 } |
13047
669c4f75a69e
patch 8.0.1399: warnings and errors when building tiny version
Christian Brabandt <cb@256bit.org>
parents:
13037
diff
changeset
|
1746 #endif |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1747 |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1748 /* |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1749 * Handle a delete operation. |
7 | 1750 * |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1751 * Return FAIL if undo failed, OK otherwise. |
7 | 1752 */ |
1753 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1754 op_delete(oparg_T *oap) |
7 | 1755 { |
1756 int n; | |
1757 linenr_T lnum; | |
1758 char_u *ptr; | |
1759 char_u *newp, *oldp; | |
1760 struct block_def bd; | |
1761 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
1762 int did_yank = FALSE; | |
3782 | 1763 int orig_regname = oap->regname; |
7 | 1764 |
1765 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
1766 return OK; | |
1767 | |
1768 /* Nothing to delete, return here. Do prepare undo, for op_change(). */ | |
1769 if (oap->empty) | |
1770 return u_save_cursor(); | |
1771 | |
1772 if (!curbuf->b_p_ma) | |
1773 { | |
1774 EMSG(_(e_modifiable)); | |
1775 return FAIL; | |
1776 } | |
1777 | |
1778 #ifdef FEAT_CLIPBOARD | |
1779 adjust_clip_reg(&oap->regname); | |
1780 #endif | |
1781 | |
1782 #ifdef FEAT_MBYTE | |
1783 if (has_mbyte) | |
1784 mb_adjust_opend(oap); | |
1785 #endif | |
1786 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1787 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1788 * 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
|
1789 * 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
|
1790 * 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
|
1791 */ |
7 | 1792 if ( oap->motion_type == MCHAR |
1793 && !oap->is_VIsual | |
50 | 1794 && !oap->block_mode |
7 | 1795 && oap->line_count > 1 |
3254 | 1796 && oap->motion_force == NUL |
7 | 1797 && oap->op_type == OP_DELETE) |
1798 { | |
2957 | 1799 ptr = ml_get(oap->end.lnum) + oap->end.col; |
1800 if (*ptr != NUL) | |
1801 ptr += oap->inclusive; | |
7 | 1802 ptr = skipwhite(ptr); |
1803 if (*ptr == NUL && inindent(0)) | |
1804 oap->motion_type = MLINE; | |
1805 } | |
1806 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1807 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1808 * 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
|
1809 * 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
|
1810 */ |
7 | 1811 if ( oap->motion_type == MCHAR |
1812 && oap->line_count == 1 | |
1813 && oap->op_type == OP_DELETE | |
1814 && *ml_get(oap->start.lnum) == NUL) | |
1815 { | |
1816 /* | |
446 | 1817 * It's an error to operate on an empty region, when 'E' included in |
7 | 1818 * 'cpoptions' (Vi compatible). |
1819 */ | |
446 | 1820 #ifdef FEAT_VIRTUALEDIT |
1821 if (virtual_op) | |
1822 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
1823 * marks as if it happened. */ | |
1824 goto setmarks; | |
1825 #endif | |
7 | 1826 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
1827 beep_flush(); | |
1828 return OK; | |
1829 } | |
1830 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1831 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1832 * 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
|
1833 * 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
|
1834 * 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
|
1835 */ |
7 | 1836 if (oap->regname != '_') |
1837 { | |
1838 if (oap->regname != 0) | |
1839 { | |
1840 /* check for read-only register */ | |
1841 if (!valid_yank_reg(oap->regname, TRUE)) | |
1842 { | |
1843 beep_flush(); | |
1844 return OK; | |
1845 } | |
1846 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
1847 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
1848 did_yank = TRUE; | |
1849 } | |
1850 | |
1851 /* | |
1852 * Put deleted text into register 1 and shift number registers if the | |
1853 * delete contains a line break, or when a regname has been specified. | |
3782 | 1854 * Use the register name from before adjust_clip_reg() may have |
1855 * changed it. | |
7 | 1856 */ |
3782 | 1857 if (orig_regname != 0 || oap->motion_type == MLINE |
7 | 1858 || oap->line_count > 1 || oap->use_reg_one) |
1859 { | |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1860 shift_delete_registers(); |
7 | 1861 if (op_yank(oap, TRUE, FALSE) == OK) |
1862 did_yank = TRUE; | |
1863 } | |
1864 | |
3468 | 1865 /* Yank into small delete register when no named register specified |
1866 * and the delete is within one line. */ | |
1867 if (( | |
1868 #ifdef FEAT_CLIPBOARD | |
3584 | 1869 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
1870 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
3468 | 1871 #endif |
1872 oap->regname == 0) && oap->motion_type != MLINE | |
7 | 1873 && oap->line_count == 1) |
1874 { | |
1875 oap->regname = '-'; | |
1876 get_yank_register(oap->regname, TRUE); | |
1877 if (op_yank(oap, TRUE, FALSE) == OK) | |
1878 did_yank = TRUE; | |
1879 oap->regname = 0; | |
1880 } | |
1881 | |
1882 /* | |
1883 * If there's too much stuff to fit in the yank register, then get a | |
1884 * confirmation before doing the delete. This is crude, but simple. | |
1885 * And it avoids doing a delete of something we can't put back if we | |
1886 * want. | |
1887 */ | |
1888 if (!did_yank) | |
1889 { | |
1890 int msg_silent_save = msg_silent; | |
1891 | |
1892 msg_silent = 0; /* must display the prompt */ | |
1893 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
1894 msg_silent = msg_silent_save; | |
1895 if (n != 'y') | |
1896 { | |
1897 EMSG(_(e_abort)); | |
1898 return FAIL; | |
1899 } | |
1900 } | |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1901 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1902 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1903 if (did_yank && has_textyankpost()) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1904 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
|
1905 #endif |
7 | 1906 } |
1907 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1908 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1909 * 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
|
1910 */ |
7 | 1911 if (oap->block_mode) |
1912 { | |
1913 if (u_save((linenr_T)(oap->start.lnum - 1), | |
1914 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
1915 return FAIL; | |
1916 | |
1917 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
1918 { | |
1919 block_prep(oap, &bd, lnum, TRUE); | |
1920 if (bd.textlen == 0) /* nothing to delete */ | |
1921 continue; | |
1922 | |
1923 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
1924 if (lnum == curwin->w_cursor.lnum) | |
1925 { | |
1926 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
1927 # ifdef FEAT_VIRTUALEDIT | |
1928 curwin->w_cursor.coladd = 0; | |
1929 # endif | |
1930 } | |
1931 | |
1932 /* n == number of chars deleted | |
1933 * If we delete a TAB, it may be replaced by several characters. | |
1934 * Thus the number of characters may increase! | |
1935 */ | |
1936 n = bd.textlen - bd.startspaces - bd.endspaces; | |
1937 oldp = ml_get(lnum); | |
1938 newp = alloc_check((unsigned)STRLEN(oldp) + 1 - n); | |
1939 if (newp == NULL) | |
1940 continue; | |
1941 /* copy up to deleted part */ | |
1942 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
1943 /* insert spaces */ | |
6929 | 1944 vim_memset(newp + bd.textcol, ' ', |
7 | 1945 (size_t)(bd.startspaces + bd.endspaces)); |
1946 /* copy the part after the deleted part */ | |
1947 oldp += bd.textcol + bd.textlen; | |
1622 | 1948 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
7 | 1949 /* replace the line */ |
1950 ml_replace(lnum, newp, FALSE); | |
1951 } | |
1952 | |
1953 check_cursor_col(); | |
1954 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
1955 oap->end.lnum + 1, 0L); | |
1956 oap->line_count = 0; /* no lines deleted */ | |
1957 } | |
5735 | 1958 else if (oap->motion_type == MLINE) |
7 | 1959 { |
1960 if (oap->op_type == OP_CHANGE) | |
1961 { | |
1962 /* Delete the lines except the first one. Temporarily move the | |
1963 * cursor to the next line. Save the current line number, if the | |
1964 * last line is deleted it may be changed. | |
1965 */ | |
1966 if (oap->line_count > 1) | |
1967 { | |
1968 lnum = curwin->w_cursor.lnum; | |
1969 ++curwin->w_cursor.lnum; | |
1970 del_lines((long)(oap->line_count - 1), TRUE); | |
1971 curwin->w_cursor.lnum = lnum; | |
1972 } | |
1973 if (u_save_cursor() == FAIL) | |
1974 return FAIL; | |
1975 if (curbuf->b_p_ai) /* don't delete indent */ | |
1976 { | |
1977 beginline(BL_WHITE); /* cursor on first non-white */ | |
1978 did_ai = TRUE; /* delete the indent when ESC hit */ | |
1979 ai_col = curwin->w_cursor.col; | |
1980 } | |
1981 else | |
1982 beginline(0); /* cursor in column 0 */ | |
1983 truncate_line(FALSE); /* delete the rest of the line */ | |
1984 /* leave cursor past last char in line */ | |
1985 if (oap->line_count > 1) | |
1986 u_clearline(); /* "U" command not possible after "2cc" */ | |
1987 } | |
1988 else | |
1989 { | |
1990 del_lines(oap->line_count, TRUE); | |
1991 beginline(BL_WHITE | BL_FIX); | |
1992 u_clearline(); /* "U" command not possible after "dd" */ | |
1993 } | |
1994 } | |
1995 else | |
1996 { | |
1997 #ifdef FEAT_VIRTUALEDIT | |
1998 if (virtual_op) | |
1999 { | |
2000 int endcol = 0; | |
2001 | |
2002 /* For virtualedit: break the tabs that are partly included. */ | |
2003 if (gchar_pos(&oap->start) == '\t') | |
2004 { | |
2005 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
2006 return FAIL; | |
2007 if (oap->line_count == 1) | |
2008 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
2009 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
2010 oap->start = curwin->w_cursor; | |
2011 if (oap->line_count == 1) | |
2012 { | |
2013 coladvance(endcol); | |
2014 oap->end.col = curwin->w_cursor.col; | |
2015 oap->end.coladd = curwin->w_cursor.coladd; | |
2016 curwin->w_cursor = oap->start; | |
2017 } | |
2018 } | |
2019 | |
2020 /* Break a tab only when it's included in the area. */ | |
2021 if (gchar_pos(&oap->end) == '\t' | |
2022 && (int)oap->end.coladd < oap->inclusive) | |
2023 { | |
2024 /* save last line for undo */ | |
2025 if (u_save((linenr_T)(oap->end.lnum - 1), | |
2026 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2027 return FAIL; | |
2028 curwin->w_cursor = oap->end; | |
2029 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
2030 oap->end = curwin->w_cursor; | |
2031 curwin->w_cursor = oap->start; | |
2032 } | |
2033 } | |
2034 #endif | |
2035 | |
2036 if (oap->line_count == 1) /* delete characters within one line */ | |
2037 { | |
2038 if (u_save_cursor() == FAIL) /* save line for undo */ | |
2039 return FAIL; | |
2040 | |
2041 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
5735 | 2042 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
7 | 2043 && oap->op_type == OP_CHANGE |
2044 && oap->end.lnum == curwin->w_cursor.lnum | |
5735 | 2045 && !oap->is_VIsual) |
7 | 2046 display_dollar(oap->end.col - !oap->inclusive); |
2047 | |
2048 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
2049 | |
2050 #ifdef FEAT_VIRTUALEDIT | |
2051 if (virtual_op) | |
2052 { | |
2053 /* fix up things for virtualedit-delete: | |
2054 * break the tabs which are going to get in our way | |
2055 */ | |
2056 char_u *curline = ml_get_curline(); | |
2057 int len = (int)STRLEN(curline); | |
2058 | |
2059 if (oap->end.coladd != 0 | |
2060 && (int)oap->end.col >= len - 1 | |
2061 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
2062 n++; | |
2063 /* Delete at least one char (e.g, when on a control char). */ | |
2064 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
2065 n = 1; | |
2066 | |
2067 /* When deleted a char in the line, reset coladd. */ | |
2068 if (gchar_cursor() != NUL) | |
2069 curwin->w_cursor.coladd = 0; | |
2070 } | |
2071 #endif | |
6826 | 2072 (void)del_bytes((long)n, !virtual_op, |
2073 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
7 | 2074 } |
2075 else /* delete characters between lines */ | |
2076 { | |
2077 pos_T curpos; | |
2078 | |
2079 /* save deleted and changed lines for undo */ | |
2080 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
2081 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
2082 return FAIL; | |
2083 | |
2084 truncate_line(TRUE); /* delete from cursor to end of line */ | |
2085 | |
2086 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
2087 ++curwin->w_cursor.lnum; | |
2088 del_lines((long)(oap->line_count - 2), FALSE); | |
2089 | |
6826 | 2090 /* delete from start of line until op_end */ |
2957 | 2091 n = (oap->end.col + 1 - !oap->inclusive); |
6826 | 2092 curwin->w_cursor.col = 0; |
2093 (void)del_bytes((long)n, !virtual_op, | |
2094 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
2095 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
2096 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
7 | 2097 } |
2098 } | |
2099 | |
2100 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
2101 | |
446 | 2102 #ifdef FEAT_VIRTUALEDIT |
2103 setmarks: | |
2104 #endif | |
7 | 2105 if (oap->block_mode) |
2106 { | |
2107 curbuf->b_op_end.lnum = oap->end.lnum; | |
2108 curbuf->b_op_end.col = oap->start.col; | |
2109 } | |
2110 else | |
2111 curbuf->b_op_end = oap->start; | |
2112 curbuf->b_op_start = oap->start; | |
2113 | |
2114 return OK; | |
2115 } | |
2116 | |
2117 #ifdef FEAT_MBYTE | |
2118 /* | |
2119 * Adjust end of operating area for ending on a multi-byte character. | |
2120 * Used for deletion. | |
2121 */ | |
2122 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2123 mb_adjust_opend(oparg_T *oap) |
7 | 2124 { |
2125 char_u *p; | |
2126 | |
2127 if (oap->inclusive) | |
2128 { | |
2129 p = ml_get(oap->end.lnum); | |
2130 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
2131 } | |
2132 } | |
2133 #endif | |
2134 | |
2135 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
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
|
2136 |
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
|
2137 # ifdef FEAT_MBYTE |
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
|
2138 /* |
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
|
2139 * 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
|
2140 * 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
|
2141 */ |
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
|
2142 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
|
2143 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
|
2144 { |
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
|
2145 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
|
2146 |
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
|
2147 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
|
2148 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
|
2149 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
|
2150 /* 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
|
2151 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
|
2152 } |
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
|
2153 |
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
|
2154 # endif |
7 | 2155 /* |
2156 * Replace a whole area with one character. | |
2157 */ | |
2158 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2159 op_replace(oparg_T *oap, int c) |
7 | 2160 { |
2161 int n, numc; | |
2162 #ifdef FEAT_MBYTE | |
2163 int num_chars; | |
2164 #endif | |
2165 char_u *newp, *oldp; | |
2166 size_t oldlen; | |
2167 struct block_def bd; | |
5428 | 2168 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
|
2169 int had_ctrl_v_cr = FALSE; |
7 | 2170 |
2171 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
2172 return OK; /* nothing to do */ | |
2173 | |
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2174 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
|
2175 { |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2176 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
|
2177 c = CAR; |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2178 } |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2179 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
|
2180 { |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2181 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
|
2182 c = NL; |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2183 } |
5428 | 2184 |
7 | 2185 #ifdef FEAT_MBYTE |
2186 if (has_mbyte) | |
2187 mb_adjust_opend(oap); | |
2188 #endif | |
2189 | |
2190 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2191 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2192 return FAIL; | |
2193 | |
2194 /* | |
2195 * block mode replace | |
2196 */ | |
2197 if (oap->block_mode) | |
2198 { | |
2199 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2200 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
2201 { | |
1982 | 2202 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
7 | 2203 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
2204 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
2205 continue; /* nothing to replace */ | |
2206 | |
2207 /* n == number of extra chars required | |
2208 * If we split a TAB, it may be replaced by several characters. | |
2209 * Thus the number of characters may increase! | |
2210 */ | |
2211 #ifdef FEAT_VIRTUALEDIT | |
2212 /* If the range starts in virtual space, count the initial | |
2213 * coladd offset as part of "startspaces" */ | |
2214 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
2215 { | |
2216 pos_T vpos; | |
2217 | |
1982 | 2218 vpos.lnum = curwin->w_cursor.lnum; |
7 | 2219 getvpos(&vpos, oap->start_vcol); |
2220 bd.startspaces += vpos.coladd; | |
2221 n = bd.startspaces; | |
2222 } | |
2223 else | |
2224 #endif | |
2225 /* allow for pre spaces */ | |
2226 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
2227 | |
2228 /* allow for post spp */ | |
2229 n += (bd.endspaces | |
2230 #ifdef FEAT_VIRTUALEDIT | |
2231 && !bd.is_oneChar | |
2232 #endif | |
2233 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
2234 /* Figure out how many characters to replace. */ | |
2235 numc = oap->end_vcol - oap->start_vcol + 1; | |
2236 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
2237 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
2238 | |
2239 #ifdef FEAT_MBYTE | |
2240 /* A double-wide character can be replaced only up to half the | |
2241 * times. */ | |
2242 if ((*mb_char2cells)(c) > 1) | |
2243 { | |
2244 if ((numc & 1) && !bd.is_short) | |
2245 { | |
2246 ++bd.endspaces; | |
2247 ++n; | |
2248 } | |
2249 numc = numc / 2; | |
2250 } | |
2251 | |
2252 /* Compute bytes needed, move character count to num_chars. */ | |
2253 num_chars = numc; | |
2254 numc *= (*mb_char2len)(c); | |
2255 #endif | |
2256 /* oldlen includes textlen, so don't double count */ | |
2257 n += numc - bd.textlen; | |
2258 | |
2259 oldp = ml_get_curline(); | |
2260 oldlen = STRLEN(oldp); | |
2261 newp = alloc_check((unsigned)oldlen + 1 + n); | |
2262 if (newp == NULL) | |
2263 continue; | |
2264 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
2265 /* copy up to deleted part */ | |
2266 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2267 oldp += bd.textcol + bd.textlen; | |
2268 /* insert pre-spaces */ | |
6929 | 2269 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
7 | 2270 /* 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
|
2271 /* 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
|
2272 * literally. */ |
5428 | 2273 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) |
7 | 2274 { |
5428 | 2275 #ifdef FEAT_MBYTE |
2276 if (has_mbyte) | |
2277 { | |
2278 n = (int)STRLEN(newp); | |
2279 while (--num_chars >= 0) | |
2280 n += (*mb_char2bytes)(c, newp + n); | |
2281 } | |
2282 else | |
2283 #endif | |
6929 | 2284 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
5428 | 2285 if (!bd.is_short) |
2286 { | |
2287 /* insert post-spaces */ | |
6929 | 2288 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
5428 | 2289 /* copy the part after the changed part */ |
2290 STRMOVE(newp + STRLEN(newp), oldp); | |
2291 } | |
7 | 2292 } |
2293 else | |
2294 { | |
5428 | 2295 /* Replacing with \r or \n means splitting the line. */ |
5475 | 2296 after_p = alloc_check( |
2297 (unsigned)(oldlen + 1 + n - STRLEN(newp))); | |
5428 | 2298 if (after_p != NULL) |
2299 STRMOVE(after_p, oldp); | |
7 | 2300 } |
2301 /* replace the line */ | |
2302 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
5428 | 2303 if (after_p != NULL) |
2304 { | |
2305 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
2306 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
2307 oap->end.lnum++; | |
2308 vim_free(after_p); | |
2309 } | |
7 | 2310 } |
2311 } | |
2312 else | |
2313 { | |
2314 /* | |
2315 * MCHAR and MLINE motion replace. | |
2316 */ | |
2317 if (oap->motion_type == MLINE) | |
2318 { | |
2319 oap->start.col = 0; | |
2320 curwin->w_cursor.col = 0; | |
2321 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2322 if (oap->end.col) | |
2323 --oap->end.col; | |
2324 } | |
2325 else if (!oap->inclusive) | |
2326 dec(&(oap->end)); | |
2327 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2328 while (LTOREQ_POS(curwin->w_cursor, oap->end)) |
7 | 2329 { |
2330 n = gchar_cursor(); | |
2331 if (n != NUL) | |
2332 { | |
2333 #ifdef FEAT_MBYTE | |
2334 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
2335 { | |
2336 /* This is slow, but it handles replacing a single-byte | |
2337 * with a multi-byte and the other way around. */ | |
4203 | 2338 if (curwin->w_cursor.lnum == oap->end.lnum) |
2339 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
|
2340 replace_character(c); |
7 | 2341 } |
2342 else | |
2343 #endif | |
2344 { | |
2345 #ifdef FEAT_VIRTUALEDIT | |
2346 if (n == TAB) | |
2347 { | |
2348 int end_vcol = 0; | |
2349 | |
2350 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2351 { | |
2352 /* oap->end has to be recalculated when | |
2353 * the tab breaks */ | |
2354 end_vcol = getviscol2(oap->end.col, | |
2355 oap->end.coladd); | |
2356 } | |
2357 coladvance_force(getviscol()); | |
2358 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2359 getvpos(&oap->end, end_vcol); | |
2360 } | |
2361 #endif | |
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
|
2362 PBYTE(curwin->w_cursor, c); |
7 | 2363 } |
2364 } | |
2365 #ifdef FEAT_VIRTUALEDIT | |
2366 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
2367 { | |
2368 int virtcols = oap->end.coladd; | |
2369 | |
2370 if (curwin->w_cursor.lnum == oap->start.lnum | |
2371 && oap->start.col == oap->end.col && oap->start.coladd) | |
2372 virtcols -= oap->start.coladd; | |
2373 | |
2374 /* oap->end has been trimmed so it's effectively inclusive; | |
2375 * as a result an extra +1 must be counted so we don't | |
2376 * trample the NUL byte. */ | |
2377 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
2378 curwin->w_cursor.col -= (virtcols + 1); | |
2379 for (; virtcols >= 0; virtcols--) | |
2380 { | |
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
|
2381 #ifdef FEAT_MBYTE |
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
|
2382 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
|
2383 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
|
2384 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
|
2385 #endif |
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
|
2386 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
|
2387 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
|
2388 break; |
7 | 2389 } |
2390 } | |
2391 #endif | |
2392 | |
2393 /* Advance to next character, stop at the end of the file. */ | |
2394 if (inc_cursor() == -1) | |
2395 break; | |
2396 } | |
2397 } | |
2398 | |
2399 curwin->w_cursor = oap->start; | |
2400 check_cursor(); | |
2401 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
2402 | |
2403 /* Set "'[" and "']" marks. */ | |
2404 curbuf->b_op_start = oap->start; | |
2405 curbuf->b_op_end = oap->end; | |
2406 | |
2407 return OK; | |
2408 } | |
2409 #endif | |
2410 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2411 static int swapchars(int op_type, pos_T *pos, int length); |
1525 | 2412 |
7 | 2413 /* |
2414 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
2415 */ | |
2416 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2417 op_tilde(oparg_T *oap) |
7 | 2418 { |
2419 pos_T pos; | |
2420 struct block_def bd; | |
1528 | 2421 int did_change = FALSE; |
7 | 2422 |
2423 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2424 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2425 return; | |
2426 | |
2427 pos = oap->start; | |
2428 if (oap->block_mode) /* Visual block mode */ | |
2429 { | |
2430 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
2431 { | |
1766 | 2432 int one_change; |
2433 | |
7 | 2434 block_prep(oap, &bd, pos.lnum, FALSE); |
2435 pos.col = bd.textcol; | |
1766 | 2436 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
2437 did_change |= one_change; | |
1525 | 2438 |
5735 | 2439 #ifdef FEAT_NETBEANS_INTG |
2210 | 2440 if (netbeans_active() && one_change) |
7 | 2441 { |
2442 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2443 | |
33 | 2444 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
2445 (long)bd.textlen); | |
7 | 2446 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
2210 | 2447 &ptr[bd.textcol], bd.textlen); |
7 | 2448 } |
5735 | 2449 #endif |
7 | 2450 } |
2451 if (did_change) | |
2452 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
2453 } | |
2454 else /* not block mode */ | |
2455 { | |
2456 if (oap->motion_type == MLINE) | |
2457 { | |
2458 oap->start.col = 0; | |
2459 pos.col = 0; | |
2460 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2461 if (oap->end.col) | |
2462 --oap->end.col; | |
2463 } | |
2464 else if (!oap->inclusive) | |
2465 dec(&(oap->end)); | |
2466 | |
1528 | 2467 if (pos.lnum == oap->end.lnum) |
2468 did_change = swapchars(oap->op_type, &pos, | |
2469 oap->end.col - pos.col + 1); | |
2470 else | |
2471 for (;;) | |
2472 { | |
2473 did_change |= swapchars(oap->op_type, &pos, | |
2474 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
2475 (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
|
2476 if (LTOREQ_POS(oap->end, pos) || inc(&pos) == -1) |
1528 | 2477 break; |
2478 } | |
7 | 2479 if (did_change) |
2480 { | |
2481 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
2482 0L); | |
2483 #ifdef FEAT_NETBEANS_INTG | |
2210 | 2484 if (netbeans_active() && did_change) |
7 | 2485 { |
2486 char_u *ptr; | |
2487 int count; | |
2488 | |
2489 pos = oap->start; | |
2490 while (pos.lnum < oap->end.lnum) | |
2491 { | |
2492 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
835 | 2493 count = (int)STRLEN(ptr) - pos.col; |
33 | 2494 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2495 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2496 &ptr[pos.col], count); |
7 | 2497 pos.col = 0; |
2498 pos.lnum++; | |
2499 } | |
2500 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2501 count = oap->end.col - pos.col + 1; | |
33 | 2502 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2503 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2504 &ptr[pos.col], count); |
7 | 2505 } |
2506 #endif | |
2507 } | |
2508 } | |
2509 | |
2510 if (!did_change && oap->is_VIsual) | |
2511 /* No change: need to remove the Visual selection */ | |
2512 redraw_curbuf_later(INVERTED); | |
2513 | |
2514 /* | |
2515 * Set '[ and '] marks. | |
2516 */ | |
2517 curbuf->b_op_start = oap->start; | |
2518 curbuf->b_op_end = oap->end; | |
2519 | |
2520 if (oap->line_count > p_report) | |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
2521 smsg((char_u *)NGETTEXT("%ld line changed", "%ld lines changed", |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
2522 oap->line_count), oap->line_count); |
7 | 2523 } |
2524 | |
2525 /* | |
1525 | 2526 * Invoke swapchar() on "length" bytes at position "pos". |
2527 * "pos" is advanced to just after the changed characters. | |
2528 * "length" is rounded up to include the whole last multi-byte character. | |
2529 * Also works correctly when the number of bytes changes. | |
2530 * Returns TRUE if some character was changed. | |
2531 */ | |
2532 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2533 swapchars(int op_type, pos_T *pos, int length) |
1525 | 2534 { |
2535 int todo; | |
2536 int did_change = 0; | |
2537 | |
2538 for (todo = length; todo > 0; --todo) | |
2539 { | |
2540 # ifdef FEAT_MBYTE | |
2541 if (has_mbyte) | |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2542 { |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2543 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2544 |
1525 | 2545 /* we're counting bytes, not characters */ |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2546 if (len > 0) |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2547 todo -= len - 1; |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2548 } |
1525 | 2549 # endif |
2550 did_change |= swapchar(op_type, pos); | |
2551 if (inc(pos) == -1) /* at end of file */ | |
2552 break; | |
2553 } | |
2554 return did_change; | |
2555 } | |
2556 | |
2557 /* | |
7 | 2558 * If op_type == OP_UPPER: make uppercase, |
2559 * if op_type == OP_LOWER: make lowercase, | |
2560 * if op_type == OP_ROT13: do rot13 encoding, | |
2561 * else swap case of character at 'pos' | |
2562 * returns TRUE when something actually changed. | |
2563 */ | |
2564 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2565 swapchar(int op_type, pos_T *pos) |
7 | 2566 { |
2567 int c; | |
2568 int nc; | |
2569 | |
2570 c = gchar_pos(pos); | |
2571 | |
2572 /* Only do rot13 encoding for ASCII characters. */ | |
2573 if (c >= 0x80 && op_type == OP_ROT13) | |
2574 return FALSE; | |
2575 | |
2576 #ifdef FEAT_MBYTE | |
1525 | 2577 if (op_type == OP_UPPER && c == 0xdf |
2578 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
493 | 2579 { |
2580 pos_T sp = curwin->w_cursor; | |
2581 | |
2582 /* Special handling of German sharp s: change to "SS". */ | |
2583 curwin->w_cursor = *pos; | |
2584 del_char(FALSE); | |
2585 ins_char('S'); | |
2586 ins_char('S'); | |
2587 curwin->w_cursor = sp; | |
2588 inc(pos); | |
2589 } | |
2590 | |
7 | 2591 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
2592 return FALSE; | |
2593 #endif | |
2594 nc = c; | |
2595 if (MB_ISLOWER(c)) | |
2596 { | |
2597 if (op_type == OP_ROT13) | |
2598 nc = ROT13(c, 'a'); | |
2599 else if (op_type != OP_LOWER) | |
2600 nc = MB_TOUPPER(c); | |
2601 } | |
2602 else if (MB_ISUPPER(c)) | |
2603 { | |
2604 if (op_type == OP_ROT13) | |
2605 nc = ROT13(c, 'A'); | |
2606 else if (op_type != OP_UPPER) | |
2607 nc = MB_TOLOWER(c); | |
2608 } | |
2609 if (nc != c) | |
2610 { | |
2611 #ifdef FEAT_MBYTE | |
2612 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
2613 { | |
2614 pos_T sp = curwin->w_cursor; | |
2615 | |
2616 curwin->w_cursor = *pos; | |
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2617 /* 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
|
2618 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
7 | 2619 ins_char(nc); |
2620 curwin->w_cursor = sp; | |
2621 } | |
2622 else | |
2623 #endif | |
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
|
2624 PBYTE(*pos, nc); |
7 | 2625 return TRUE; |
2626 } | |
2627 return FALSE; | |
2628 } | |
2629 | |
2630 #if defined(FEAT_VISUALEXTRA) || defined(PROTO) | |
2631 /* | |
2632 * op_insert - Insert and append operators for Visual mode. | |
2633 */ | |
2634 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2635 op_insert(oparg_T *oap, long count1) |
7 | 2636 { |
2637 long ins_len, pre_textlen = 0; | |
2638 char_u *firstline, *ins_text; | |
12329
0b10cff73322
patch 8.0.1044: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12327
diff
changeset
|
2639 colnr_T ind_pre = 0, ind_post; |
7 | 2640 struct block_def bd; |
2641 int i; | |
6579 | 2642 pos_T t1; |
7 | 2643 |
2644 /* edit() changes this - record it for OP_APPEND */ | |
2645 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2646 | |
2647 /* vis block is still marked. Get rid of it now. */ | |
2648 curwin->w_cursor.lnum = oap->start.lnum; | |
2649 update_screen(INVERTED); | |
2650 | |
2651 if (oap->block_mode) | |
2652 { | |
2653 #ifdef FEAT_VIRTUALEDIT | |
2654 /* When 'virtualedit' is used, need to insert the extra spaces before | |
2655 * doing block_prep(). When only "block" is used, virtual edit is | |
2656 * already disabled, but still need it when calling | |
2657 * coladvance_force(). */ | |
2658 if (curwin->w_cursor.coladd > 0) | |
2659 { | |
2660 int old_ve_flags = ve_flags; | |
2661 | |
2662 ve_flags = VE_ALL; | |
2663 if (u_save_cursor() == FAIL) | |
2664 return; | |
2665 coladvance_force(oap->op_type == OP_APPEND | |
2666 ? oap->end_vcol + 1 : getviscol()); | |
2667 if (oap->op_type == OP_APPEND) | |
2668 --curwin->w_cursor.col; | |
2669 ve_flags = old_ve_flags; | |
2670 } | |
2671 #endif | |
2672 /* Get the info about the block before entering the text */ | |
2673 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
|
2674 /* 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
|
2675 ind_pre = (colnr_T)getwhitecols_curline(); |
7 | 2676 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
|
2677 |
7 | 2678 if (oap->op_type == OP_APPEND) |
2679 firstline += bd.textlen; | |
2680 pre_textlen = (long)STRLEN(firstline); | |
2681 } | |
2682 | |
2683 if (oap->op_type == OP_APPEND) | |
2684 { | |
2685 if (oap->block_mode | |
2686 #ifdef FEAT_VIRTUALEDIT | |
2687 && curwin->w_cursor.coladd == 0 | |
2688 #endif | |
2689 ) | |
2690 { | |
2691 /* Move the cursor to the character right of the block. */ | |
2692 curwin->w_set_curswant = TRUE; | |
2693 while (*ml_get_cursor() != NUL | |
2694 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
2695 ++curwin->w_cursor.col; | |
2696 if (bd.is_short && !bd.is_MAX) | |
2697 { | |
2698 /* First line was too short, make it longer and adjust the | |
2699 * values in "bd". */ | |
2700 if (u_save_cursor() == FAIL) | |
2701 return; | |
2702 for (i = 0; i < bd.endspaces; ++i) | |
2703 ins_char(' '); | |
2704 bd.textlen += bd.endspaces; | |
2705 } | |
2706 } | |
2707 else | |
2708 { | |
2709 curwin->w_cursor = oap->end; | |
893 | 2710 check_cursor_col(); |
7 | 2711 |
2712 /* 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
|
2713 if (!LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2714 && oap->start_vcol != oap->end_vcol) |
2715 inc_cursor(); | |
2716 } | |
2717 } | |
2718 | |
6579 | 2719 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
|
2720 (void)edit(NUL, FALSE, (linenr_T)count1); |
7 | 2721 |
6579 | 2722 /* When a tab was inserted, and the characters in front of the tab |
2723 * have been converted to a tab as well, the column of the cursor | |
2724 * might have actually been reduced, so need to adjust here. */ | |
2725 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
|
2726 && LT_POS(curbuf->b_op_start_orig, t1)) |
6579 | 2727 oap->start = curbuf->b_op_start_orig; |
2728 | |
1477 | 2729 /* If user has moved off this line, we don't know what to do, so do |
2730 * nothing. | |
2731 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
2732 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
7 | 2733 return; |
2734 | |
2735 if (oap->block_mode) | |
2736 { | |
2737 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
|
2738 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
|
2739 size_t len; |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2740 int add; |
7 | 2741 |
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2742 /* 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
|
2743 * 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
|
2744 ind_post = (colnr_T)getwhitecols_curline(); |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2745 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
|
2746 { |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2747 bd.textcol += ind_post - ind_pre; |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2748 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
|
2749 did_indent = TRUE; |
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2750 } |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2751 |
5471 | 2752 /* 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
|
2753 * 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
|
2754 * 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
|
2755 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
|
2756 && !bd.is_MAX && !did_indent) |
5471 | 2757 { |
2758 if (oap->op_type == OP_INSERT | |
5730 | 2759 && oap->start.col |
2760 #ifdef FEAT_VIRTUALEDIT | |
2761 + oap->start.coladd | |
2762 #endif | |
2763 != curbuf->b_op_start_orig.col | |
2764 #ifdef FEAT_VIRTUALEDIT | |
2765 + curbuf->b_op_start_orig.coladd | |
2766 #endif | |
2767 ) | |
5471 | 2768 { |
6579 | 2769 int t = getviscol2(curbuf->b_op_start_orig.col, |
2770 curbuf->b_op_start_orig.coladd); | |
5680 | 2771 oap->start.col = curbuf->b_op_start_orig.col; |
6579 | 2772 pre_textlen -= t - oap->start_vcol; |
2773 oap->start_vcol = t; | |
5471 | 2774 } |
2775 else if (oap->op_type == OP_APPEND | |
5730 | 2776 && oap->end.col |
2777 #ifdef FEAT_VIRTUALEDIT | |
2778 + oap->end.coladd | |
2779 #endif | |
2780 >= curbuf->b_op_start_orig.col | |
2781 #ifdef FEAT_VIRTUALEDIT | |
2782 + curbuf->b_op_start_orig.coladd | |
2783 #endif | |
2784 ) | |
5471 | 2785 { |
6579 | 2786 int t = getviscol2(curbuf->b_op_start_orig.col, |
2787 curbuf->b_op_start_orig.coladd); | |
5680 | 2788 oap->start.col = curbuf->b_op_start_orig.col; |
5471 | 2789 /* reset pre_textlen to the value of OP_INSERT */ |
2790 pre_textlen += bd.textlen; | |
6579 | 2791 pre_textlen -= t - oap->start_vcol; |
2792 oap->start_vcol = t; | |
5471 | 2793 oap->op_type = OP_INSERT; |
2794 } | |
2795 } | |
2796 | |
7 | 2797 /* |
2798 * Spaces and tabs in the indent may have changed to other spaces and | |
1392 | 2799 * tabs. Get the starting column again and correct the length. |
7 | 2800 * Don't do this when "$" used, end-of-line will have changed. |
2801 */ | |
2802 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
2803 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
2804 { | |
2805 if (oap->op_type == OP_APPEND) | |
2806 { | |
2807 pre_textlen += bd2.textlen - bd.textlen; | |
2808 if (bd2.endspaces) | |
2809 --bd2.textlen; | |
2810 } | |
2811 bd.textcol = bd2.textcol; | |
2812 bd.textlen = bd2.textlen; | |
2813 } | |
2814 | |
2815 /* | |
2816 * Subsequent calls to ml_get() flush the firstline data - take a | |
2817 * copy of the required string. | |
2818 */ | |
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2819 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
|
2820 len = STRLEN(firstline); |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2821 add = bd.textcol; |
7 | 2822 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
|
2823 add += bd.textlen; |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2824 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
|
2825 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
|
2826 else |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2827 firstline += add; |
3421 | 2828 if (pre_textlen >= 0 |
2829 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
7 | 2830 { |
2831 ins_text = vim_strnsave(firstline, (int)ins_len); | |
2832 if (ins_text != NULL) | |
2833 { | |
2834 /* block handled here */ | |
2835 if (u_save(oap->start.lnum, | |
2836 (linenr_T)(oap->end.lnum + 1)) == OK) | |
2837 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
2838 &bd); | |
2839 | |
2840 curwin->w_cursor.col = oap->start.col; | |
2841 check_cursor(); | |
2842 vim_free(ins_text); | |
2843 } | |
2844 } | |
2845 } | |
2846 } | |
2847 #endif | |
2848 | |
2849 /* | |
2850 * op_change - handle a change operation | |
2851 * | |
2852 * return TRUE if edit() returns because of a CTRL-O command | |
2853 */ | |
2854 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2855 op_change(oparg_T *oap) |
7 | 2856 { |
2857 colnr_T l; | |
2858 int retval; | |
2859 #ifdef FEAT_VISUALEXTRA | |
2860 long offset; | |
2861 linenr_T linenr; | |
1392 | 2862 long ins_len; |
2863 long pre_textlen = 0; | |
2864 long pre_indent = 0; | |
7 | 2865 char_u *firstline; |
2866 char_u *ins_text, *newp, *oldp; | |
2867 struct block_def bd; | |
2868 #endif | |
2869 | |
2870 l = oap->start.col; | |
2871 if (oap->motion_type == MLINE) | |
2872 { | |
2873 l = 0; | |
2874 #ifdef FEAT_SMARTINDENT | |
2875 if (!p_paste && curbuf->b_p_si | |
2876 # ifdef FEAT_CINDENT | |
2877 && !curbuf->b_p_cin | |
2878 # endif | |
2879 ) | |
2880 can_si = TRUE; /* It's like opening a new line, do si */ | |
2881 #endif | |
2882 } | |
2883 | |
2884 /* First delete the text in the region. In an empty buffer only need to | |
2885 * save for undo */ | |
2886 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
2887 { | |
2888 if (u_save_cursor() == FAIL) | |
2889 return FALSE; | |
2890 } | |
2891 else if (op_delete(oap) == FAIL) | |
2892 return FALSE; | |
2893 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2894 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2895 && !virtual_op) |
2896 inc_cursor(); | |
2897 | |
2898 #ifdef FEAT_VISUALEXTRA | |
2899 /* check for still on same line (<CR> in inserted text meaningless) */ | |
2900 /* skip blank lines too */ | |
2901 if (oap->block_mode) | |
2902 { | |
2903 # ifdef FEAT_VIRTUALEDIT | |
2904 /* Add spaces before getting the current line length. */ | |
2905 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
2906 || gchar_cursor() == NUL)) | |
2907 coladvance_force(getviscol()); | |
2908 # endif | |
1392 | 2909 firstline = ml_get(oap->start.lnum); |
2910 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
|
2911 pre_indent = (long)getwhitecols(firstline); |
7 | 2912 bd.textcol = curwin->w_cursor.col; |
2913 } | |
2914 #endif | |
2915 | |
2916 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
2917 if (oap->motion_type == MLINE) | |
2918 fix_indent(); | |
2919 #endif | |
2920 | |
2921 retval = edit(NUL, FALSE, (linenr_T)1); | |
2922 | |
2923 #ifdef FEAT_VISUALEXTRA | |
2924 /* | |
39 | 2925 * In Visual block mode, handle copying the new text to all lines of the |
7 | 2926 * block. |
1477 | 2927 * Don't repeat the insert when Insert mode ended with CTRL-C. |
7 | 2928 */ |
1477 | 2929 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
7 | 2930 { |
1392 | 2931 /* Auto-indenting may have changed the indent. If the cursor was past |
2932 * the indent, exclude that indent change from the inserted text. */ | |
7 | 2933 firstline = ml_get(oap->start.lnum); |
1403 | 2934 if (bd.textcol > (colnr_T)pre_indent) |
7 | 2935 { |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2936 long new_indent = (long)getwhitecols(firstline); |
1392 | 2937 |
2938 pre_textlen += new_indent - pre_indent; | |
2939 bd.textcol += new_indent - pre_indent; | |
2940 } | |
2941 | |
2942 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
2943 if (ins_len > 0) | |
2944 { | |
2945 /* Subsequent calls to ml_get() flush the firstline data - take a | |
2946 * copy of the inserted text. */ | |
7 | 2947 if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL) |
2948 { | |
419 | 2949 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
7 | 2950 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
2951 linenr++) | |
2952 { | |
2953 block_prep(oap, &bd, linenr, TRUE); | |
2954 if (!bd.is_short || virtual_op) | |
2955 { | |
2956 # ifdef FEAT_VIRTUALEDIT | |
2957 pos_T vpos; | |
2958 | |
2959 /* If the block starts in virtual space, count the | |
2960 * initial coladd offset as part of "startspaces" */ | |
2961 if (bd.is_short) | |
2962 { | |
1982 | 2963 vpos.lnum = linenr; |
7 | 2964 (void)getvpos(&vpos, oap->start_vcol); |
2965 } | |
2966 else | |
2967 vpos.coladd = 0; | |
2968 # endif | |
2969 oldp = ml_get(linenr); | |
2970 newp = alloc_check((unsigned)(STRLEN(oldp) | |
2971 # ifdef FEAT_VIRTUALEDIT | |
2972 + vpos.coladd | |
2973 # endif | |
2974 + ins_len + 1)); | |
2975 if (newp == NULL) | |
2976 continue; | |
2977 /* copy up to block start */ | |
2978 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2979 offset = bd.textcol; | |
2980 # ifdef FEAT_VIRTUALEDIT | |
6929 | 2981 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
7 | 2982 offset += vpos.coladd; |
2983 # endif | |
2984 mch_memmove(newp + offset, ins_text, (size_t)ins_len); | |
2985 offset += ins_len; | |
2986 oldp += bd.textcol; | |
1622 | 2987 STRMOVE(newp + offset, oldp); |
7 | 2988 ml_replace(linenr, newp, FALSE); |
2989 } | |
2990 } | |
2991 check_cursor(); | |
2992 | |
2993 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
2994 } | |
2995 vim_free(ins_text); | |
2996 } | |
2997 } | |
2998 #endif | |
2999 | |
3000 return retval; | |
3001 } | |
3002 | |
3003 /* | |
3004 * set all the yank registers to empty (called from main()) | |
3005 */ | |
3006 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3007 init_yank(void) |
7 | 3008 { |
3009 int i; | |
3010 | |
3011 for (i = 0; i < NUM_REGISTERS; ++i) | |
3012 y_regs[i].y_array = NULL; | |
3013 } | |
3014 | |
356 | 3015 #if defined(EXITFREE) || defined(PROTO) |
3016 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3017 clear_registers(void) |
356 | 3018 { |
3019 int i; | |
3020 | |
3021 for (i = 0; i < NUM_REGISTERS; ++i) | |
3022 { | |
3023 y_current = &y_regs[i]; | |
3024 if (y_current->y_array != NULL) | |
3025 free_yank_all(); | |
3026 } | |
3027 } | |
3028 #endif | |
3029 | |
7 | 3030 /* |
3031 * Free "n" lines from the current yank register. | |
3032 * Called for normal freeing and in case of error. | |
3033 */ | |
3034 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3035 free_yank(long n) |
7 | 3036 { |
3037 if (y_current->y_array != NULL) | |
3038 { | |
3039 long i; | |
3040 | |
3041 for (i = n; --i >= 0; ) | |
3042 { | |
3043 #ifdef AMIGA /* only for very slow machines */ | |
3044 if ((i & 1023) == 1023) /* this may take a while */ | |
3045 { | |
3046 /* | |
3047 * This message should never cause a hit-return message. | |
3048 * Overwrite this message with any next message. | |
3049 */ | |
3050 ++no_wait_return; | |
3051 smsg((char_u *)_("freeing %ld lines"), i + 1); | |
3052 --no_wait_return; | |
3053 msg_didout = FALSE; | |
3054 msg_col = 0; | |
3055 } | |
3056 #endif | |
3057 vim_free(y_current->y_array[i]); | |
3058 } | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
3059 VIM_CLEAR(y_current->y_array); |
7 | 3060 #ifdef AMIGA |
3061 if (n >= 1000) | |
3062 MSG(""); | |
3063 #endif | |
3064 } | |
3065 } | |
3066 | |
3067 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3068 free_yank_all(void) |
7 | 3069 { |
3070 free_yank(y_current->y_size); | |
3071 } | |
3072 | |
3073 /* | |
3074 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
3075 * If we are to append (uppercase register), we first yank into a new yank | |
3076 * register and then concatenate the old and the new one (so we keep the old | |
3077 * one in case of out-of-memory). | |
3078 * | |
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
3079 * Return FAIL for failure, OK otherwise. |
7 | 3080 */ |
3081 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3082 op_yank(oparg_T *oap, int deleting, int mess) |
7 | 3083 { |
3084 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
|
3085 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
|
3086 yankreg_T newreg; /* new yank register when appending */ |
7 | 3087 char_u **new_ptr; |
3088 linenr_T lnum; /* current line number */ | |
3089 long j; | |
3090 int yanktype = oap->motion_type; | |
3091 long yanklines = oap->line_count; | |
3092 linenr_T yankendlnum = oap->end.lnum; | |
3093 char_u *p; | |
3094 char_u *pnew; | |
3095 struct block_def bd; | |
2658 | 3096 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
2654 | 3097 int did_star = FALSE; |
2658 | 3098 #endif |
7 | 3099 |
3100 /* check for read-only register */ | |
3101 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
3102 { | |
3103 beep_flush(); | |
3104 return FAIL; | |
3105 } | |
3106 if (oap->regname == '_') /* black hole: nothing to do */ | |
3107 return OK; | |
3108 | |
3109 #ifdef FEAT_CLIPBOARD | |
3110 if (!clip_star.available && oap->regname == '*') | |
3111 oap->regname = 0; | |
3112 else if (!clip_plus.available && oap->regname == '+') | |
3113 oap->regname = 0; | |
3114 #endif | |
3115 | |
3116 if (!deleting) /* op_delete() already set y_current */ | |
3117 get_yank_register(oap->regname, TRUE); | |
3118 | |
3119 curr = y_current; | |
3120 /* append to existing contents */ | |
3121 if (y_append && y_current->y_array != NULL) | |
3122 y_current = &newreg; | |
3123 else | |
3124 free_yank_all(); /* free previously yanked lines */ | |
3125 | |
593 | 3126 /* |
3127 * If the cursor was in column 1 before and after the movement, and the | |
3128 * operator is not inclusive, the yank is always linewise. | |
3129 */ | |
7 | 3130 if ( oap->motion_type == MCHAR |
3131 && oap->start.col == 0 | |
3132 && !oap->inclusive | |
3133 && (!oap->is_VIsual || *p_sel == 'o') | |
50 | 3134 && !oap->block_mode |
7 | 3135 && oap->end.col == 0 |
3136 && yanklines > 1) | |
3137 { | |
3138 yanktype = MLINE; | |
3139 --yankendlnum; | |
3140 --yanklines; | |
3141 } | |
3142 | |
3143 y_current->y_size = yanklines; | |
3144 y_current->y_type = yanktype; /* set the yank register type */ | |
3145 y_current->y_width = 0; | |
3146 y_current->y_array = (char_u **)lalloc_clear((long_u)(sizeof(char_u *) * | |
3147 yanklines), TRUE); | |
3148 if (y_current->y_array == NULL) | |
3149 { | |
3150 y_current = curr; | |
3151 return FAIL; | |
3152 } | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3153 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3154 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
|
3155 #endif |
7 | 3156 |
3157 y_idx = 0; | |
3158 lnum = oap->start.lnum; | |
3159 | |
3160 if (oap->block_mode) | |
3161 { | |
3162 /* Visual block mode */ | |
3163 y_current->y_type = MBLOCK; /* set the yank register type */ | |
3164 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
3165 | |
3166 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
3167 y_current->y_width--; | |
3168 } | |
3169 | |
3170 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
3171 { | |
3172 switch (y_current->y_type) | |
3173 { | |
3174 case MBLOCK: | |
3175 block_prep(oap, &bd, lnum, FALSE); | |
3176 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3177 goto fail; | |
3178 break; | |
3179 | |
3180 case MLINE: | |
3181 if ((y_current->y_array[y_idx] = | |
3182 vim_strsave(ml_get(lnum))) == NULL) | |
3183 goto fail; | |
3184 break; | |
3185 | |
3186 case MCHAR: | |
3187 { | |
3188 colnr_T startcol = 0, endcol = MAXCOL; | |
3189 #ifdef FEAT_VIRTUALEDIT | |
3190 int is_oneChar = FALSE; | |
3191 colnr_T cs, ce; | |
3192 #endif | |
3193 p = ml_get(lnum); | |
3194 bd.startspaces = 0; | |
3195 bd.endspaces = 0; | |
3196 | |
3197 if (lnum == oap->start.lnum) | |
3198 { | |
3199 startcol = oap->start.col; | |
3200 #ifdef FEAT_VIRTUALEDIT | |
3201 if (virtual_op) | |
3202 { | |
3203 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
3204 if (ce != cs && oap->start.coladd > 0) | |
3205 { | |
3206 /* Part of a tab selected -- but don't | |
3207 * double-count it. */ | |
3208 bd.startspaces = (ce - cs + 1) | |
3209 - oap->start.coladd; | |
3210 startcol++; | |
3211 } | |
3212 } | |
3213 #endif | |
3214 } | |
3215 | |
3216 if (lnum == oap->end.lnum) | |
3217 { | |
3218 endcol = oap->end.col; | |
3219 #ifdef FEAT_VIRTUALEDIT | |
3220 if (virtual_op) | |
3221 { | |
3222 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
3223 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
3224 # ifdef FEAT_MBYTE | |
3225 /* Don't add space for double-wide | |
3226 * char; endcol will be on last byte | |
3227 * of multi-byte char. */ | |
3228 && (*mb_head_off)(p, p + endcol) == 0 | |
3229 # endif | |
3230 )) | |
3231 { | |
3232 if (oap->start.lnum == oap->end.lnum | |
3233 && oap->start.col == oap->end.col) | |
3234 { | |
3235 /* Special case: inside a single char */ | |
3236 is_oneChar = TRUE; | |
3237 bd.startspaces = oap->end.coladd | |
3238 - oap->start.coladd + oap->inclusive; | |
3239 endcol = startcol; | |
3240 } | |
3241 else | |
3242 { | |
3243 bd.endspaces = oap->end.coladd | |
3244 + oap->inclusive; | |
3245 endcol -= oap->inclusive; | |
3246 } | |
3247 } | |
3248 } | |
3249 #endif | |
3250 } | |
3510 | 3251 if (endcol == MAXCOL) |
3252 endcol = (colnr_T)STRLEN(p); | |
7 | 3253 if (startcol > endcol |
3254 #ifdef FEAT_VIRTUALEDIT | |
3255 || is_oneChar | |
3256 #endif | |
3257 ) | |
3258 bd.textlen = 0; | |
3259 else | |
3260 { | |
3261 bd.textlen = endcol - startcol + oap->inclusive; | |
3262 } | |
3263 bd.textstart = p + startcol; | |
3264 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3265 goto fail; | |
3266 break; | |
3267 } | |
3268 /* NOTREACHED */ | |
3269 } | |
3270 } | |
3271 | |
3272 if (curr != y_current) /* append the new block to the old block */ | |
3273 { | |
3274 new_ptr = (char_u **)lalloc((long_u)(sizeof(char_u *) * | |
3275 (curr->y_size + y_current->y_size)), TRUE); | |
3276 if (new_ptr == NULL) | |
3277 goto fail; | |
3278 for (j = 0; j < curr->y_size; ++j) | |
3279 new_ptr[j] = curr->y_array[j]; | |
3280 vim_free(curr->y_array); | |
3281 curr->y_array = new_ptr; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3282 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3283 curr->y_time_set = vim_time(); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3284 #endif |
7 | 3285 |
3286 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
3287 curr->y_type = MLINE; | |
3288 | |
164 | 3289 /* Concatenate the last line of the old block with the first line of |
3290 * the new block, unless being Vi compatible. */ | |
3291 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
7 | 3292 { |
3293 pnew = lalloc((long_u)(STRLEN(curr->y_array[curr->y_size - 1]) | |
3294 + STRLEN(y_current->y_array[0]) + 1), TRUE); | |
3295 if (pnew == NULL) | |
3296 { | |
3297 y_idx = y_current->y_size - 1; | |
3298 goto fail; | |
3299 } | |
3300 STRCPY(pnew, curr->y_array[--j]); | |
3301 STRCAT(pnew, y_current->y_array[0]); | |
3302 vim_free(curr->y_array[j]); | |
3303 vim_free(y_current->y_array[0]); | |
3304 curr->y_array[j++] = pnew; | |
3305 y_idx = 1; | |
3306 } | |
3307 else | |
3308 y_idx = 0; | |
3309 while (y_idx < y_current->y_size) | |
3310 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
3311 curr->y_size = j; | |
3312 vim_free(y_current->y_array); | |
3313 y_current = curr; | |
3314 } | |
5981 | 3315 if (curwin->w_p_rnu) |
3316 redraw_later(SOME_VALID); /* cursor moved to start */ | |
7 | 3317 if (mess) /* Display message about yank? */ |
3318 { | |
3319 if (yanktype == MCHAR | |
3320 && !oap->block_mode | |
3321 && yanklines == 1) | |
3322 yanklines = 0; | |
3323 /* Some versions of Vi use ">=" here, some don't... */ | |
3324 if (yanklines > p_report) | |
3325 { | |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3326 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
|
3327 |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3328 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
|
3329 *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
|
3330 else |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3331 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
|
3332 _(" 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
|
3333 |
7 | 3334 /* redisplay now, so message is not deleted */ |
3335 update_topline_redraw(); | |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3336 if (oap->block_mode) |
205 | 3337 { |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3338 smsg((char_u *)NGETTEXT("block of %ld line yanked%s", |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3339 "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
|
3340 yanklines, namebuf); |
205 | 3341 } |
7 | 3342 else |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3343 { |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3344 smsg((char_u *)NGETTEXT("%ld line yanked%s", |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3345 "%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
|
3346 yanklines, namebuf); |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3347 } |
7 | 3348 } |
3349 } | |
3350 | |
3351 /* | |
3352 * Set "'[" and "']" marks. | |
3353 */ | |
3354 curbuf->b_op_start = oap->start; | |
3355 curbuf->b_op_end = oap->end; | |
5735 | 3356 if (yanktype == MLINE && !oap->block_mode) |
36 | 3357 { |
3358 curbuf->b_op_start.col = 0; | |
3359 curbuf->b_op_end.col = MAXCOL; | |
3360 } | |
7 | 3361 |
3362 #ifdef FEAT_CLIPBOARD | |
3363 /* | |
3364 * If we were yanking to the '*' register, send result to clipboard. | |
3365 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
3366 * to the '*' register. | |
3367 */ | |
3368 if (clip_star.available | |
3369 && (curr == &(y_regs[STAR_REGISTER]) | |
2654 | 3370 || (!deleting && oap->regname == 0 |
6116 | 3371 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
7 | 3372 { |
3373 if (curr != &(y_regs[STAR_REGISTER])) | |
3374 /* Copy the text from register 0 to the clipboard register. */ | |
3375 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3376 | |
3377 clip_own_selection(&clip_star); | |
3378 clip_gen_set_selection(&clip_star); | |
2658 | 3379 # ifdef FEAT_X11 |
2654 | 3380 did_star = TRUE; |
2658 | 3381 # endif |
7 | 3382 } |
3383 | |
3384 # ifdef FEAT_X11 | |
3385 /* | |
3386 * If we were yanking to the '+' register, send result to selection. | |
3387 * Also copy to the '*' register, in case auto-select is off. | |
3388 */ | |
2654 | 3389 if (clip_plus.available |
3390 && (curr == &(y_regs[PLUS_REGISTER]) | |
3391 || (!deleting && oap->regname == 0 | |
6116 | 3392 && ((clip_unnamed | clip_unnamed_saved) & |
3393 CLIP_UNNAMED_PLUS)))) | |
7 | 3394 { |
2654 | 3395 if (curr != &(y_regs[PLUS_REGISTER])) |
3396 /* Copy the text from register 0 to the clipboard register. */ | |
3397 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
3398 | |
7 | 3399 clip_own_selection(&clip_plus); |
3400 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
|
3401 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
|
3402 && !did_star && curr == &(y_regs[PLUS_REGISTER])) |
7 | 3403 { |
3404 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3405 clip_own_selection(&clip_star); | |
3406 clip_gen_set_selection(&clip_star); | |
3407 } | |
3408 } | |
3409 # endif | |
3410 #endif | |
3411 | |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
3412 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3413 if (!deleting && has_textyankpost()) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3414 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
|
3415 #endif |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3416 |
7 | 3417 return OK; |
3418 | |
3419 fail: /* free the allocated lines */ | |
3420 free_yank(y_idx + 1); | |
3421 y_current = curr; | |
3422 return FAIL; | |
3423 } | |
3424 | |
3425 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3426 yank_copy_line(struct block_def *bd, long y_idx) |
7 | 3427 { |
3428 char_u *pnew; | |
3429 | |
3430 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
3431 == NULL) | |
3432 return FAIL; | |
3433 y_current->y_array[y_idx] = pnew; | |
6929 | 3434 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
7 | 3435 pnew += bd->startspaces; |
3436 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
3437 pnew += bd->textlen; | |
6929 | 3438 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
7 | 3439 pnew += bd->endspaces; |
3440 *pnew = NUL; | |
3441 return OK; | |
3442 } | |
3443 | |
3444 #ifdef FEAT_CLIPBOARD | |
3445 /* | |
3446 * Make a copy of the y_current register to register "reg". | |
3447 */ | |
3448 static void | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3449 copy_yank_reg(yankreg_T *reg) |
7 | 3450 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3451 yankreg_T *curr = y_current; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3452 long j; |
7 | 3453 |
3454 y_current = reg; | |
3455 free_yank_all(); | |
3456 *y_current = *curr; | |
3457 y_current->y_array = (char_u **)lalloc_clear( | |
3458 (long_u)(sizeof(char_u *) * y_current->y_size), TRUE); | |
3459 if (y_current->y_array == NULL) | |
3460 y_current->y_size = 0; | |
3461 else | |
3462 for (j = 0; j < y_current->y_size; ++j) | |
3463 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
3464 { | |
3465 free_yank(j); | |
3466 y_current->y_size = 0; | |
3467 break; | |
3468 } | |
3469 y_current = curr; | |
3470 } | |
3471 #endif | |
3472 | |
3473 /* | |
140 | 3474 * Put contents of register "regname" into the text. |
3475 * Caller must check "regname" to be valid! | |
3476 * "flags": PUT_FIXINDENT make indent look nice | |
3477 * PUT_CURSEND leave cursor after end of new text | |
3478 * PUT_LINE force linewise put (":put") | |
7 | 3479 */ |
3480 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3481 do_put( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3482 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3483 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
|
3484 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3485 int flags) |
7 | 3486 { |
3487 char_u *ptr; | |
3488 char_u *newp, *oldp; | |
3489 int yanklen; | |
3490 int totlen = 0; /* init for gcc */ | |
3491 linenr_T lnum; | |
3492 colnr_T col; | |
3493 long i; /* index in y_array[] */ | |
3494 int y_type; | |
3495 long y_size; | |
3496 int oldlen; | |
3497 long y_width = 0; | |
3498 colnr_T vcol; | |
3499 int delcount; | |
3500 int incr = 0; | |
3501 long j; | |
3502 struct block_def bd; | |
3503 char_u **y_array = NULL; | |
3504 long nr_lines = 0; | |
3505 pos_T new_cursor; | |
3506 int indent; | |
3507 int orig_indent = 0; /* init for gcc */ | |
3508 int indent_diff = 0; /* init for gcc */ | |
3509 int first_indent = TRUE; | |
3510 int lendiff = 0; | |
3511 pos_T old_pos; | |
3512 char_u *insert_string = NULL; | |
3513 int allocated = FALSE; | |
3514 long cnt; | |
3515 | |
3516 #ifdef FEAT_CLIPBOARD | |
3517 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
3518 adjust_clip_reg(®name); | |
3519 (void)may_get_selection(regname); | |
3520 #endif | |
3521 | |
3522 if (flags & PUT_FIXINDENT) | |
3523 orig_indent = get_indent(); | |
3524 | |
3525 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3526 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3527 | |
3528 /* | |
3529 * Using inserted text works differently, because the register includes | |
3530 * special characters (newlines, etc.). | |
3531 */ | |
3532 if (regname == '.') | |
3533 { | |
10494
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3534 if (VIsual_active) |
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3535 stuffcharReadbuff(VIsual_mode); |
7 | 3536 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : |
3537 (count == -1 ? 'O' : 'i')), count, FALSE); | |
3538 /* Putting the text is done later, so can't really move the cursor to | |
3539 * the next character. Use "l" to simulate it. */ | |
3540 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
3541 stuffcharReadbuff('l'); | |
3542 return; | |
3543 } | |
3544 | |
3545 /* | |
3546 * For special registers '%' (file name), '#' (alternate file name) and | |
3547 * ':' (last command line), etc. we have to create a fake yank register. | |
3548 */ | |
3549 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
3550 { | |
3551 if (insert_string == NULL) | |
3552 return; | |
3553 } | |
3554 | |
14202
51693b1a640e
patch 8.1.0118: duplicate error message for put command
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
3555 /* 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
|
3556 * 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
|
3557 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
|
3558 goto end; |
4005 | 3559 |
7 | 3560 if (insert_string != NULL) |
3561 { | |
3562 y_type = MCHAR; | |
3563 #ifdef FEAT_EVAL | |
3564 if (regname == '=') | |
3565 { | |
3566 /* For the = register we need to split the string at NL | |
3093 | 3567 * characters. |
3568 * Loop twice: count the number of lines and save them. */ | |
7 | 3569 for (;;) |
3570 { | |
3571 y_size = 0; | |
3572 ptr = insert_string; | |
3573 while (ptr != NULL) | |
3574 { | |
3575 if (y_array != NULL) | |
3576 y_array[y_size] = ptr; | |
3577 ++y_size; | |
3578 ptr = vim_strchr(ptr, '\n'); | |
3579 if (ptr != NULL) | |
3580 { | |
3581 if (y_array != NULL) | |
3582 *ptr = NUL; | |
3583 ++ptr; | |
3093 | 3584 /* A trailing '\n' makes the register linewise. */ |
7 | 3585 if (*ptr == NUL) |
3586 { | |
3587 y_type = MLINE; | |
3588 break; | |
3589 } | |
3590 } | |
3591 } | |
3592 if (y_array != NULL) | |
3593 break; | |
3594 y_array = (char_u **)alloc((unsigned) | |
3595 (y_size * sizeof(char_u *))); | |
3596 if (y_array == NULL) | |
3597 goto end; | |
3598 } | |
3599 } | |
3600 else | |
3601 #endif | |
3602 { | |
3603 y_size = 1; /* use fake one-line yank register */ | |
3604 y_array = &insert_string; | |
3605 } | |
3606 } | |
3607 else | |
3608 { | |
3609 get_yank_register(regname, FALSE); | |
3610 | |
3611 y_type = y_current->y_type; | |
3612 y_width = y_current->y_width; | |
3613 y_size = y_current->y_size; | |
3614 y_array = y_current->y_array; | |
3615 } | |
3616 | |
3617 if (y_type == MLINE) | |
3618 { | |
3619 if (flags & PUT_LINE_SPLIT) | |
3620 { | |
6845 | 3621 char_u *p; |
3622 | |
7 | 3623 /* "p" or "P" in Visual mode: split the lines to put the text in |
3624 * between. */ | |
3625 if (u_save_cursor() == FAIL) | |
3626 goto end; | |
6845 | 3627 p = ml_get_cursor(); |
3628 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
|
3629 MB_PTR_ADV(p); |
6845 | 3630 ptr = vim_strsave(p); |
7 | 3631 if (ptr == NULL) |
3632 goto end; | |
3633 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
3634 vim_free(ptr); | |
3635 | |
6845 | 3636 oldp = ml_get_curline(); |
3637 p = oldp + curwin->w_cursor.col; | |
3638 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
|
3639 MB_PTR_ADV(p); |
6845 | 3640 ptr = vim_strnsave(oldp, p - oldp); |
7 | 3641 if (ptr == NULL) |
3642 goto end; | |
3643 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
3644 ++nr_lines; | |
3645 dir = FORWARD; | |
3646 } | |
3647 if (flags & PUT_LINE_FORWARD) | |
3648 { | |
3649 /* Must be "p" for a Visual block, put lines below the block. */ | |
692 | 3650 curwin->w_cursor = curbuf->b_visual.vi_end; |
7 | 3651 dir = FORWARD; |
3652 } | |
3653 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3654 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3655 } | |
3656 | |
3657 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
3658 y_type = MLINE; | |
3659 | |
3660 if (y_size == 0 || y_array == NULL) | |
3661 { | |
3662 EMSG2(_("E353: Nothing in register %s"), | |
3663 regname == 0 ? (char_u *)"\"" : transchar(regname)); | |
3664 goto end; | |
3665 } | |
3666 | |
3667 if (y_type == MBLOCK) | |
3668 { | |
3669 lnum = curwin->w_cursor.lnum + y_size + 1; | |
3670 if (lnum > curbuf->b_ml.ml_line_count) | |
3671 lnum = curbuf->b_ml.ml_line_count + 1; | |
3672 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
3673 goto end; | |
3674 } | |
5735 | 3675 else if (y_type == MLINE) |
7 | 3676 { |
3677 lnum = curwin->w_cursor.lnum; | |
3678 #ifdef FEAT_FOLDING | |
3679 /* Correct line number for closed fold. Don't move the cursor yet, | |
3680 * u_save() uses it. */ | |
3681 if (dir == BACKWARD) | |
3682 (void)hasFolding(lnum, &lnum, NULL); | |
3683 else | |
3684 (void)hasFolding(lnum, NULL, &lnum); | |
3685 #endif | |
3686 if (dir == FORWARD) | |
3687 ++lnum; | |
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3688 /* 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
|
3689 * 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
|
3690 if ((BUFEMPTY() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
7 | 3691 goto end; |
3692 #ifdef FEAT_FOLDING | |
3693 if (dir == FORWARD) | |
3694 curwin->w_cursor.lnum = lnum - 1; | |
3695 else | |
3696 curwin->w_cursor.lnum = lnum; | |
3697 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
3698 #endif | |
3699 } | |
3700 else if (u_save_cursor() == FAIL) | |
3701 goto end; | |
3702 | |
3703 yanklen = (int)STRLEN(y_array[0]); | |
3704 | |
3705 #ifdef FEAT_VIRTUALEDIT | |
3706 if (ve_flags == VE_ALL && y_type == MCHAR) | |
3707 { | |
3708 if (gchar_cursor() == TAB) | |
3709 { | |
3710 /* Don't need to insert spaces when "p" on the last position of a | |
3711 * 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
|
3712 #ifdef FEAT_VARTABS |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3713 int viscol = getviscol(); |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3714 if (dir == FORWARD |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3715 ? 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
|
3716 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
|
3717 : 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
|
3718 coladvance_force(viscol); |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3719 #else |
7 | 3720 if (dir == FORWARD |
3721 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
3722 : curwin->w_cursor.coladd > 0) | |
3723 coladvance_force(getviscol()); | |
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3724 #endif |
7 | 3725 else |
3726 curwin->w_cursor.coladd = 0; | |
3727 } | |
3728 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
3729 coladvance_force(getviscol() + (dir == FORWARD)); | |
3730 } | |
3731 #endif | |
3732 | |
3733 lnum = curwin->w_cursor.lnum; | |
3734 col = curwin->w_cursor.col; | |
3735 | |
3736 /* | |
3737 * Block mode | |
3738 */ | |
3739 if (y_type == MBLOCK) | |
3740 { | |
10664
94db9c08e206
patch 8.0.0222: blockwise put on multi-byte character misplaced
Christian Brabandt <cb@256bit.org>
parents:
10494
diff
changeset
|
3741 int c = gchar_cursor(); |
7 | 3742 colnr_T endcol2 = 0; |
3743 | |
3744 if (dir == FORWARD && c != NUL) | |
3745 { | |
3746 #ifdef FEAT_VIRTUALEDIT | |
3747 if (ve_flags == VE_ALL) | |
3748 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3749 else | |
3750 #endif | |
3751 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
3752 | |
3753 #ifdef FEAT_MBYTE | |
3754 if (has_mbyte) | |
3755 /* move to start of next multi-byte character */ | |
474 | 3756 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
7 | 3757 else |
3758 #endif | |
3759 #ifdef FEAT_VIRTUALEDIT | |
3760 if (c != TAB || ve_flags != VE_ALL) | |
3761 #endif | |
3762 ++curwin->w_cursor.col; | |
3763 ++col; | |
3764 } | |
3765 else | |
3766 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3767 | |
3768 #ifdef FEAT_VIRTUALEDIT | |
3769 col += curwin->w_cursor.coladd; | |
1304 | 3770 if (ve_flags == VE_ALL |
3771 && (curwin->w_cursor.coladd > 0 | |
3772 || endcol2 == curwin->w_cursor.col)) | |
7 | 3773 { |
3774 if (dir == FORWARD && c == NUL) | |
3775 ++col; | |
3776 if (dir != FORWARD && c != NUL) | |
3777 ++curwin->w_cursor.col; | |
3778 if (c == TAB) | |
3779 { | |
3780 if (dir == BACKWARD && curwin->w_cursor.col) | |
3781 curwin->w_cursor.col--; | |
3782 if (dir == FORWARD && col - 1 == endcol2) | |
3783 curwin->w_cursor.col++; | |
3784 } | |
3785 } | |
3786 curwin->w_cursor.coladd = 0; | |
3787 #endif | |
699 | 3788 bd.textcol = 0; |
7 | 3789 for (i = 0; i < y_size; ++i) |
3790 { | |
3791 int spaces; | |
3792 char shortline; | |
3793 | |
3794 bd.startspaces = 0; | |
3795 bd.endspaces = 0; | |
3796 vcol = 0; | |
3797 delcount = 0; | |
3798 | |
3799 /* add a new line */ | |
3800 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
3801 { | |
3802 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
3803 (colnr_T)1, FALSE) == FAIL) | |
3804 break; | |
3805 ++nr_lines; | |
3806 } | |
3807 /* get the old line and advance to the position to insert at */ | |
3808 oldp = ml_get_curline(); | |
3809 oldlen = (int)STRLEN(oldp); | |
3810 for (ptr = oldp; vcol < col && *ptr; ) | |
3811 { | |
3812 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 3813 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
7 | 3814 vcol += incr; |
3815 } | |
3816 bd.textcol = (colnr_T)(ptr - oldp); | |
3817 | |
3818 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
3819 | |
3820 if (vcol < col) /* line too short, padd with spaces */ | |
3821 bd.startspaces = col - vcol; | |
3822 else if (vcol > col) | |
3823 { | |
3824 bd.endspaces = vcol - col; | |
3825 bd.startspaces = incr - bd.endspaces; | |
3826 --bd.textcol; | |
3827 delcount = 1; | |
3828 #ifdef FEAT_MBYTE | |
3829 if (has_mbyte) | |
3830 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
3831 #endif | |
3832 if (oldp[bd.textcol] != TAB) | |
3833 { | |
3834 /* Only a Tab can be split into spaces. Other | |
3835 * characters will have to be moved to after the | |
3836 * block, causing misalignment. */ | |
3837 delcount = 0; | |
3838 bd.endspaces = 0; | |
3839 } | |
3840 } | |
3841 | |
3842 yanklen = (int)STRLEN(y_array[i]); | |
3843 | |
3844 /* calculate number of spaces required to fill right side of block*/ | |
3845 spaces = y_width + 1; | |
3846 for (j = 0; j < yanklen; j++) | |
5995 | 3847 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
7 | 3848 if (spaces < 0) |
3849 spaces = 0; | |
3850 | |
3851 /* insert the new text */ | |
3852 totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces; | |
3853 newp = alloc_check((unsigned)totlen + oldlen + 1); | |
3854 if (newp == NULL) | |
3855 break; | |
3856 /* copy part up to cursor to new line */ | |
3857 ptr = newp; | |
3858 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
3859 ptr += bd.textcol; | |
3860 /* may insert some spaces before the new text */ | |
6929 | 3861 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
7 | 3862 ptr += bd.startspaces; |
3863 /* insert the new text */ | |
3864 for (j = 0; j < count; ++j) | |
3865 { | |
3866 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
3867 ptr += yanklen; | |
3868 | |
3869 /* insert block's trailing spaces only if there's text behind */ | |
3870 if ((j < count - 1 || !shortline) && spaces) | |
3871 { | |
6929 | 3872 vim_memset(ptr, ' ', (size_t)spaces); |
7 | 3873 ptr += spaces; |
3874 } | |
3875 } | |
3876 /* may insert some spaces after the new text */ | |
6929 | 3877 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
7 | 3878 ptr += bd.endspaces; |
3879 /* move the text after the cursor to the end of the line. */ | |
3880 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
3881 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
3882 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
3883 | |
3884 ++curwin->w_cursor.lnum; | |
3885 if (i == 0) | |
3886 curwin->w_cursor.col += bd.startspaces; | |
3887 } | |
3888 | |
3889 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
3890 | |
3891 /* Set '[ mark. */ | |
3892 curbuf->b_op_start = curwin->w_cursor; | |
3893 curbuf->b_op_start.lnum = lnum; | |
3894 | |
3895 /* adjust '] mark */ | |
3896 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
3897 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
237 | 3898 # ifdef FEAT_VIRTUALEDIT |
7 | 3899 curbuf->b_op_end.coladd = 0; |
237 | 3900 # endif |
7 | 3901 if (flags & PUT_CURSEND) |
3902 { | |
916 | 3903 colnr_T len; |
3904 | |
7 | 3905 curwin->w_cursor = curbuf->b_op_end; |
3906 curwin->w_cursor.col++; | |
916 | 3907 |
3908 /* in Insert mode we might be after the NUL, correct for that */ | |
3909 len = (colnr_T)STRLEN(ml_get_curline()); | |
3910 if (curwin->w_cursor.col > len) | |
3911 curwin->w_cursor.col = len; | |
7 | 3912 } |
3913 else | |
3914 curwin->w_cursor.lnum = lnum; | |
3915 } | |
3916 else | |
3917 { | |
3918 /* | |
3919 * Character or Line mode | |
3920 */ | |
3921 if (y_type == MCHAR) | |
3922 { | |
3923 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
3924 * char */ | |
3925 if (dir == FORWARD && gchar_cursor() != NUL) | |
3926 { | |
3927 #ifdef FEAT_MBYTE | |
3928 if (has_mbyte) | |
3929 { | |
474 | 3930 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
7 | 3931 |
3932 /* put it on the next of the multi-byte character. */ | |
3933 col += bytelen; | |
3934 if (yanklen) | |
3935 { | |
3936 curwin->w_cursor.col += bytelen; | |
3937 curbuf->b_op_end.col += bytelen; | |
3938 } | |
3939 } | |
3940 else | |
3941 #endif | |
3942 { | |
3943 ++col; | |
3944 if (yanklen) | |
3945 { | |
3946 ++curwin->w_cursor.col; | |
3947 ++curbuf->b_op_end.col; | |
3948 } | |
3949 } | |
3950 } | |
3951 curbuf->b_op_start = curwin->w_cursor; | |
3952 } | |
3953 /* | |
3954 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
3955 */ | |
3956 else if (dir == BACKWARD) | |
3957 --lnum; | |
699 | 3958 new_cursor = curwin->w_cursor; |
7 | 3959 |
3960 /* | |
3961 * simple case: insert into current line | |
3962 */ | |
3963 if (y_type == MCHAR && y_size == 1) | |
3964 { | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3965 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
|
3966 |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3967 if (VIsual_active) |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3968 { |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3969 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
|
3970 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
|
3971 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
|
3972 } |
10670
bce3eccea39a
patch 8.0.0225: put in Visual block mode terminates early
Christian Brabandt <cb@256bit.org>
parents:
10664
diff
changeset
|
3973 |
5365 | 3974 do { |
3975 totlen = count * yanklen; | |
3976 if (totlen > 0) | |
7 | 3977 { |
5365 | 3978 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
|
3979 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
|
3980 { |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3981 lnum++; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3982 continue; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3983 } |
5365 | 3984 newp = alloc_check((unsigned)(STRLEN(oldp) + totlen + 1)); |
3985 if (newp == NULL) | |
3986 goto end; /* alloc() gave an error message */ | |
3987 mch_memmove(newp, oldp, (size_t)col); | |
3988 ptr = newp + col; | |
3989 for (i = 0; i < count; ++i) | |
3990 { | |
3991 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
3992 ptr += yanklen; | |
3993 } | |
3994 STRMOVE(ptr, oldp + col); | |
3995 ml_replace(lnum, newp, FALSE); | |
3996 /* Place cursor on last putted char. */ | |
3997 if (lnum == curwin->w_cursor.lnum) | |
5496 | 3998 { |
3999 /* make sure curwin->w_virtcol is updated */ | |
4000 changed_cline_bef_curs(); | |
5365 | 4001 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
5496 | 4002 } |
7 | 4003 } |
5365 | 4004 if (VIsual_active) |
4005 lnum++; | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
4006 } while (VIsual_active && lnum <= end_lnum); |
5365 | 4007 |
6379 | 4008 if (VIsual_active) /* reset lnum to the last visual line */ |
4009 lnum--; | |
4010 | |
7 | 4011 curbuf->b_op_end = curwin->w_cursor; |
4012 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
4013 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
4014 ++curwin->w_cursor.col; | |
4015 changed_bytes(lnum, col); | |
4016 } | |
4017 else | |
4018 { | |
4019 /* | |
4020 * Insert at least one line. When y_type is MCHAR, break the first | |
4021 * line in two. | |
4022 */ | |
4023 for (cnt = 1; cnt <= count; ++cnt) | |
4024 { | |
4025 i = 0; | |
4026 if (y_type == MCHAR) | |
4027 { | |
4028 /* | |
4029 * Split the current line in two at the insert position. | |
4030 * First insert y_array[size - 1] in front of second line. | |
4031 * Then append y_array[0] to first line. | |
4032 */ | |
4033 lnum = new_cursor.lnum; | |
4034 ptr = ml_get(lnum) + col; | |
4035 totlen = (int)STRLEN(y_array[y_size - 1]); | |
4036 newp = alloc_check((unsigned)(STRLEN(ptr) + totlen + 1)); | |
4037 if (newp == NULL) | |
4038 goto error; | |
4039 STRCPY(newp, y_array[y_size - 1]); | |
4040 STRCAT(newp, ptr); | |
4041 /* insert second line */ | |
4042 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
4043 vim_free(newp); | |
4044 | |
4045 oldp = ml_get(lnum); | |
4046 newp = alloc_check((unsigned)(col + yanklen + 1)); | |
4047 if (newp == NULL) | |
4048 goto error; | |
4049 /* copy first part of line */ | |
4050 mch_memmove(newp, oldp, (size_t)col); | |
4051 /* append to first line */ | |
4052 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
4053 ml_replace(lnum, newp, FALSE); | |
4054 | |
4055 curwin->w_cursor.lnum = lnum; | |
4056 i = 1; | |
4057 } | |
4058 | |
4059 for (; i < y_size; ++i) | |
4060 { | |
4061 if ((y_type != MCHAR || i < y_size - 1) | |
4062 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
4063 == FAIL) | |
4064 goto error; | |
4065 lnum++; | |
4066 ++nr_lines; | |
4067 if (flags & PUT_FIXINDENT) | |
4068 { | |
4069 old_pos = curwin->w_cursor; | |
4070 curwin->w_cursor.lnum = lnum; | |
4071 ptr = ml_get(lnum); | |
4072 if (cnt == count && i == y_size - 1) | |
4073 lendiff = (int)STRLEN(ptr); | |
4074 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
4075 if (*ptr == '#' && preprocs_left()) | |
4076 indent = 0; /* Leave # lines at start */ | |
4077 else | |
4078 #endif | |
4079 if (*ptr == NUL) | |
4080 indent = 0; /* Ignore empty lines */ | |
4081 else if (first_indent) | |
4082 { | |
4083 indent_diff = orig_indent - get_indent(); | |
4084 indent = orig_indent; | |
4085 first_indent = FALSE; | |
4086 } | |
4087 else if ((indent = get_indent() + indent_diff) < 0) | |
4088 indent = 0; | |
4089 (void)set_indent(indent, 0); | |
4090 curwin->w_cursor = old_pos; | |
4091 /* remember how many chars were removed */ | |
4092 if (cnt == count && i == y_size - 1) | |
4093 lendiff -= (int)STRLEN(ml_get(lnum)); | |
4094 } | |
4095 } | |
4096 } | |
4097 | |
4098 error: | |
4099 /* Adjust marks. */ | |
4100 if (y_type == MLINE) | |
4101 { | |
4102 curbuf->b_op_start.col = 0; | |
4103 if (dir == FORWARD) | |
4104 curbuf->b_op_start.lnum++; | |
4105 } | |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
4106 /* 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
|
4107 * 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
|
4108 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
|
4109 < 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
|
4110 #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
|
4111 || 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
|
4112 #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
|
4113 ) |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
4114 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
7 | 4115 (linenr_T)MAXLNUM, nr_lines, 0L); |
4116 | |
4117 /* note changed text for displaying and folding */ | |
4118 if (y_type == MCHAR) | |
4119 changed_lines(curwin->w_cursor.lnum, col, | |
4120 curwin->w_cursor.lnum + 1, nr_lines); | |
4121 else | |
4122 changed_lines(curbuf->b_op_start.lnum, 0, | |
4123 curbuf->b_op_start.lnum, nr_lines); | |
4124 | |
4125 /* put '] mark at last inserted character */ | |
4126 curbuf->b_op_end.lnum = lnum; | |
4127 /* correct length for change in indent */ | |
4128 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
4129 if (col > 1) | |
4130 curbuf->b_op_end.col = col - 1; | |
4131 else | |
4132 curbuf->b_op_end.col = 0; | |
4133 | |
168 | 4134 if (flags & PUT_CURSLINE) |
4135 { | |
237 | 4136 /* ":put": put cursor on last inserted line */ |
168 | 4137 curwin->w_cursor.lnum = lnum; |
4138 beginline(BL_WHITE | BL_FIX); | |
4139 } | |
4140 else if (flags & PUT_CURSEND) | |
7 | 4141 { |
4142 /* put cursor after inserted text */ | |
4143 if (y_type == MLINE) | |
4144 { | |
4145 if (lnum >= curbuf->b_ml.ml_line_count) | |
4146 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
4147 else | |
4148 curwin->w_cursor.lnum = lnum + 1; | |
4149 curwin->w_cursor.col = 0; | |
4150 } | |
4151 else | |
4152 { | |
4153 curwin->w_cursor.lnum = lnum; | |
4154 curwin->w_cursor.col = col; | |
4155 } | |
4156 } | |
4157 else if (y_type == MLINE) | |
4158 { | |
168 | 4159 /* put cursor on first non-blank in first inserted line */ |
7 | 4160 curwin->w_cursor.col = 0; |
4161 if (dir == FORWARD) | |
4162 ++curwin->w_cursor.lnum; | |
4163 beginline(BL_WHITE | BL_FIX); | |
4164 } | |
4165 else /* put cursor on first inserted character */ | |
4166 curwin->w_cursor = new_cursor; | |
4167 } | |
4168 } | |
4169 | |
4170 msgmore(nr_lines); | |
4171 curwin->w_set_curswant = TRUE; | |
4172 | |
4173 end: | |
4174 if (allocated) | |
4175 vim_free(insert_string); | |
840 | 4176 if (regname == '=') |
4177 vim_free(y_array); | |
4178 | |
5380 | 4179 VIsual_active = FALSE; |
4180 | |
140 | 4181 /* If the cursor is past the end of the line put it at the end. */ |
844 | 4182 adjust_cursor_eol(); |
4183 } | |
4184 | |
4185 /* | |
4186 * When the cursor is on the NUL past the end of the line and it should not be | |
4187 * there move it left. | |
4188 */ | |
4189 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4190 adjust_cursor_eol(void) |
844 | 4191 { |
4192 if (curwin->w_cursor.col > 0 | |
4193 && gchar_cursor() == NUL | |
773 | 4194 #ifdef FEAT_VIRTUALEDIT |
4195 && (ve_flags & VE_ONEMORE) == 0 | |
4196 #endif | |
7 | 4197 && !(restart_edit || (State & INSERT))) |
4198 { | |
557 | 4199 /* Put the cursor on the last character in the line. */ |
555 | 4200 dec_cursor(); |
844 | 4201 |
7 | 4202 #ifdef FEAT_VIRTUALEDIT |
4203 if (ve_flags == VE_ALL) | |
557 | 4204 { |
4205 colnr_T scol, ecol; | |
4206 | |
4207 /* Coladd is set to the width of the last character. */ | |
4208 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
4209 curwin->w_cursor.coladd = ecol - scol + 1; | |
4210 } | |
7 | 4211 #endif |
4212 } | |
4213 } | |
4214 | |
4215 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
4216 /* | |
4217 * Return TRUE if lines starting with '#' should be left aligned. | |
4218 */ | |
4219 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4220 preprocs_left(void) |
7 | 4221 { |
4222 return | |
4223 # ifdef FEAT_SMARTINDENT | |
4224 # ifdef FEAT_CINDENT | |
4225 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
4226 # else | |
4227 curbuf->b_p_si | |
4228 # endif | |
4229 # endif | |
4230 # ifdef FEAT_CINDENT | |
5438 | 4231 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
4232 && curbuf->b_ind_hash_comment == 0) | |
7 | 4233 # endif |
4234 ; | |
4235 } | |
4236 #endif | |
4237 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4238 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4239 * 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
|
4240 */ |
7 | 4241 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4242 get_register_name(int num) |
7 | 4243 { |
4244 if (num == -1) | |
4245 return '"'; | |
4246 else if (num < 10) | |
4247 return num + '0'; | |
4248 else if (num == DELETION_REGISTER) | |
4249 return '-'; | |
4250 #ifdef FEAT_CLIPBOARD | |
4251 else if (num == STAR_REGISTER) | |
4252 return '*'; | |
4253 else if (num == PLUS_REGISTER) | |
4254 return '+'; | |
4255 #endif | |
4256 else | |
4257 { | |
4258 #ifdef EBCDIC | |
4259 int i; | |
4260 | |
4261 /* EBCDIC is really braindead ... */ | |
4262 i = 'a' + (num - 10); | |
4263 if (i > 'i') | |
4264 i += 7; | |
4265 if (i > 'r') | |
4266 i += 8; | |
4267 return i; | |
4268 #else | |
4269 return num + 'a' - 10; | |
4270 #endif | |
4271 } | |
4272 } | |
4273 | |
4274 /* | |
4275 * ":dis" and ":registers": Display the contents of the yank registers. | |
4276 */ | |
4277 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4278 ex_display(exarg_T *eap) |
7 | 4279 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4280 int i, n; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4281 long j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4282 char_u *p; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4283 yankreg_T *yb; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4284 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4285 int attr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4286 char_u *arg = eap->arg; |
22 | 4287 #ifdef FEAT_MBYTE |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4288 int clen; |
22 | 4289 #else |
4290 # define clen 1 | |
4291 #endif | |
7 | 4292 |
4293 if (arg != NULL && *arg == NUL) | |
4294 arg = NULL; | |
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
4295 attr = HL_ATTR(HLF_8); |
7 | 4296 |
4297 /* Highlight title */ | |
4298 MSG_PUTS_TITLE(_("\n--- Registers ---")); | |
4299 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) | |
4300 { | |
4301 name = get_register_name(i); | |
2644 | 4302 if (arg != NULL && vim_strchr(arg, name) == NULL |
4303 #ifdef ONE_CLIPBOARD | |
4304 /* Star register and plus register contain the same thing. */ | |
4305 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
4306 #endif | |
4307 ) | |
7 | 4308 continue; /* did not ask for this register */ |
4309 | |
4310 #ifdef FEAT_CLIPBOARD | |
4311 /* Adjust register name for "unnamed" in 'clipboard'. | |
4312 * When it's a clipboard register, fill it with the current contents | |
4313 * of the clipboard. */ | |
4314 adjust_clip_reg(&name); | |
4315 (void)may_get_selection(name); | |
4316 #endif | |
4317 | |
4318 if (i == -1) | |
4319 { | |
4320 if (y_previous != NULL) | |
4321 yb = y_previous; | |
4322 else | |
4323 yb = &(y_regs[0]); | |
4324 } | |
4325 else | |
4326 yb = &(y_regs[i]); | |
2000 | 4327 |
4328 #ifdef FEAT_EVAL | |
4329 if (name == MB_TOLOWER(redir_reg) | |
4330 || (redir_reg == '"' && yb == y_previous)) | |
4331 continue; /* do not list register being written to, the | |
4332 * pointer can be freed */ | |
4333 #endif | |
4334 | |
7 | 4335 if (yb->y_array != NULL) |
4336 { | |
4337 msg_putchar('\n'); | |
4338 msg_putchar('"'); | |
4339 msg_putchar(name); | |
4340 MSG_PUTS(" "); | |
4341 | |
4342 n = (int)Columns - 6; | |
4343 for (j = 0; j < yb->y_size && n > 1; ++j) | |
4344 { | |
4345 if (j) | |
4346 { | |
4347 MSG_PUTS_ATTR("^J", attr); | |
4348 n -= 2; | |
4349 } | |
4350 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
4351 { | |
4352 #ifdef FEAT_MBYTE | |
474 | 4353 clen = (*mb_ptr2len)(p); |
22 | 4354 #endif |
4355 msg_outtrans_len(p, clen); | |
4356 #ifdef FEAT_MBYTE | |
4357 p += clen - 1; | |
7 | 4358 #endif |
4359 } | |
4360 } | |
4361 if (n > 1 && yb->y_type == MLINE) | |
4362 MSG_PUTS_ATTR("^J", attr); | |
4363 out_flush(); /* show one line at a time */ | |
4364 } | |
4365 ui_breakcheck(); | |
4366 } | |
4367 | |
4368 /* | |
4369 * display last inserted text | |
4370 */ | |
4371 if ((p = get_last_insert()) != NULL | |
4372 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
4373 { | |
4374 MSG_PUTS("\n\". "); | |
4375 dis_msg(p, TRUE); | |
4376 } | |
4377 | |
4378 /* | |
4379 * display last command line | |
4380 */ | |
4381 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
4382 && !got_int) | |
4383 { | |
4384 MSG_PUTS("\n\": "); | |
4385 dis_msg(last_cmdline, FALSE); | |
4386 } | |
4387 | |
4388 /* | |
4389 * display current file name | |
4390 */ | |
4391 if (curbuf->b_fname != NULL | |
4392 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4393 { | |
4394 MSG_PUTS("\n\"% "); | |
4395 dis_msg(curbuf->b_fname, FALSE); | |
4396 } | |
4397 | |
4398 /* | |
4399 * display alternate file name | |
4400 */ | |
4401 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4402 { | |
4403 char_u *fname; | |
4404 linenr_T dummy; | |
4405 | |
4406 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
4407 { | |
4408 MSG_PUTS("\n\"# "); | |
4409 dis_msg(fname, FALSE); | |
4410 } | |
4411 } | |
4412 | |
4413 /* | |
4414 * display last search pattern | |
4415 */ | |
4416 if (last_search_pat() != NULL | |
4417 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
4418 { | |
4419 MSG_PUTS("\n\"/ "); | |
4420 dis_msg(last_search_pat(), FALSE); | |
4421 } | |
4422 | |
4423 #ifdef FEAT_EVAL | |
4424 /* | |
4425 * display last used expression | |
4426 */ | |
4427 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
4428 && !got_int) | |
4429 { | |
4430 MSG_PUTS("\n\"= "); | |
4431 dis_msg(expr_line, FALSE); | |
4432 } | |
4433 #endif | |
4434 } | |
4435 | |
4436 /* | |
4437 * display a string for do_dis() | |
4438 * truncate at end of screen line | |
4439 */ | |
4440 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4441 dis_msg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4442 char_u *p, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4443 int skip_esc) /* if TRUE, ignore trailing ESC */ |
7 | 4444 { |
4445 int n; | |
4446 #ifdef FEAT_MBYTE | |
4447 int l; | |
4448 #endif | |
4449 | |
4450 n = (int)Columns - 6; | |
4451 while (*p != NUL | |
4452 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
4453 && (n -= ptr2cells(p)) >= 0) | |
4454 { | |
4455 #ifdef FEAT_MBYTE | |
474 | 4456 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
7 | 4457 { |
4458 msg_outtrans_len(p, l); | |
4459 p += l; | |
4460 } | |
4461 else | |
4462 #endif | |
4463 msg_outtrans_len(p++, 1); | |
4464 } | |
4465 ui_breakcheck(); | |
4466 } | |
4467 | |
3562 | 4468 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4469 /* | |
4470 * If "process" is TRUE and the line begins with a comment leader (possibly | |
4471 * after some white space), return a pointer to the text after it. Put a boolean | |
4472 * value indicating whether the line ends with an unclosed comment in | |
4473 * "is_comment". | |
4474 * line - line to be processed, | |
4475 * process - if FALSE, will only check whether the line ends with an unclosed | |
3584 | 4476 * comment, |
3562 | 4477 * include_space - whether to also skip space following the comment leader, |
4478 * is_comment - will indicate whether the current line ends with an unclosed | |
3584 | 4479 * comment. |
3562 | 4480 */ |
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4481 char_u * |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4482 skip_comment( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4483 char_u *line, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4484 int process, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4485 int include_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4486 int *is_comment) |
3562 | 4487 { |
4488 char_u *comment_flags = NULL; | |
4489 int lead_len; | |
4490 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
4491 | |
4492 *is_comment = FALSE; | |
4493 if (leader_offset != -1) | |
4494 { | |
4495 /* Let's check whether the line ends with an unclosed comment. | |
4496 * If the last comment leader has COM_END in flags, there's no comment. | |
4497 */ | |
4498 while (*comment_flags) | |
4499 { | |
4500 if (*comment_flags == COM_END | |
4501 || *comment_flags == ':') | |
4502 break; | |
4503 ++comment_flags; | |
4504 } | |
4505 if (*comment_flags != COM_END) | |
4506 *is_comment = TRUE; | |
4507 } | |
4508 | |
4509 if (process == FALSE) | |
4510 return line; | |
4511 | |
4512 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
4513 | |
4514 if (lead_len == 0) | |
4515 return line; | |
4516 | |
4517 /* Find: | |
4518 * - COM_END, | |
4519 * - colon, | |
4520 * whichever comes first. | |
4521 */ | |
4522 while (*comment_flags) | |
4523 { | |
3580 | 4524 if (*comment_flags == COM_END |
3562 | 4525 || *comment_flags == ':') |
4526 { | |
4527 break; | |
4528 } | |
4529 ++comment_flags; | |
4530 } | |
4531 | |
4532 /* If we found a colon, it means that we are not processing a line | |
3580 | 4533 * starting with a closing part of a three-part comment. That's good, |
4534 * because we don't want to remove those as this would be annoying. | |
3562 | 4535 */ |
4536 if (*comment_flags == ':' || *comment_flags == NUL) | |
4537 line += lead_len; | |
4538 | |
4539 return line; | |
4540 } | |
4541 #endif | |
4542 | |
7 | 4543 /* |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4544 * 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
|
4545 * When "save_undo" is TRUE save lines for undo first. |
5848 | 4546 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
4547 * leaders should not be removed. | |
4548 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
4549 * to set those marks. | |
7 | 4550 * |
1217 | 4551 * return FAIL for failure, OK otherwise |
7 | 4552 */ |
4553 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4554 do_join( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4555 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4556 int insert_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4557 int save_undo, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4558 int use_formatoptions UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4559 int setmark) |
7 | 4560 { |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4561 char_u *curr = NULL; |
2597 | 4562 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
|
4563 char_u *cend; |
7 | 4564 char_u *newp; |
2597 | 4565 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
|
4566 int endcurr1 = NUL; |
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4567 int endcurr2 = NUL; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4568 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
|
4569 int sumsize = 0; /* size of the long new line */ |
7 | 4570 linenr_T t; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4571 colnr_T col = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4572 int ret = OK; |
3562 | 4573 #if defined(FEAT_COMMENTS) || defined(PROTO) |
3574 | 4574 int *comments = NULL; |
3562 | 4575 int remove_comments = (use_formatoptions == TRUE) |
4576 && has_format_option(FO_REMOVE_COMS); | |
4577 int prev_was_comment; | |
4578 #endif | |
4579 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4580 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4581 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
|
4582 (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
|
4583 return FAIL; |
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 /* 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
|
4586 * 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
|
4587 * 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
|
4588 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
|
4589 if (spaces == NULL) |
7 | 4590 return FAIL; |
3562 | 4591 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4592 if (remove_comments) | |
4593 { | |
4594 comments = (int *)lalloc_clear((long_u)count * sizeof(int), TRUE); | |
4595 if (comments == NULL) | |
4596 { | |
4597 vim_free(spaces); | |
4598 return FAIL; | |
4599 } | |
4600 } | |
4601 #endif | |
7 | 4602 |
4603 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4604 * Don't move anything, just compute the final line length |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4605 * and setup the array of space strings lengths |
7 | 4606 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4607 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
|
4608 { |
2597 | 4609 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
5848 | 4610 if (t == 0 && setmark) |
5664 | 4611 { |
4612 /* Set the '[ mark. */ | |
4613 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
4614 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
4615 } | |
3562 | 4616 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4617 if (remove_comments) | |
4618 { | |
4619 /* We don't want to remove the comment leader if the | |
4620 * previous line is not a comment. */ | |
4621 if (t > 0 && prev_was_comment) | |
4622 { | |
4623 | |
4624 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
4625 &prev_was_comment); | |
3576 | 4626 comments[t] = (int)(new_curr - curr); |
3562 | 4627 curr = new_curr; |
4628 } | |
4629 else | |
4630 curr = skip_comment(curr, FALSE, insert_space, | |
4631 &prev_was_comment); | |
4632 } | |
4633 #endif | |
4634 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4635 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
|
4636 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4637 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4638 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
|
4639 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4640 && (!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
|
4641 || (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
|
4642 && (!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
|
4643 || 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
|
4644 #endif |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4645 ) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4646 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4647 /* 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
|
4648 if (endcurr1 == ' ') |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4649 endcurr1 = endcurr2; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4650 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4651 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4652 /* 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
|
4653 if ( p_js |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4654 && (endcurr1 == '.' |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4655 || (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
|
4656 && (endcurr1 == '?' || endcurr1 == '!')))) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4657 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4658 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4659 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4660 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4661 sumsize += currsize + spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4662 endcurr1 = endcurr2 = NUL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4663 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
|
4664 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4665 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4666 if (has_mbyte) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4667 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4668 cend = curr + currsize; |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4669 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
|
4670 endcurr1 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4671 if (cend > curr) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4672 { |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4673 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
|
4674 endcurr2 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4675 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4676 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4677 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4678 #endif |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4679 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4680 endcurr1 = *(curr + currsize - 1); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4681 if (currsize > 1) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4682 endcurr2 = *(curr + currsize - 2); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4683 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4684 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4685 line_breakcheck(); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4686 if (got_int) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4687 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4688 ret = FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4689 goto theend; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4690 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4691 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4692 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4693 /* 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
|
4694 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
|
4695 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4696 /* 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
|
4697 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
|
4698 cend = newp + sumsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4699 *cend = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4700 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4701 /* |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4702 * Move affected lines to the new long one. |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4703 * |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4704 * 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
|
4705 * 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
|
4706 * 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
|
4707 */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4708 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
|
4709 { |
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4710 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
|
4711 |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4712 cend -= currsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4713 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
|
4714 if (spaces[t] > 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4715 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4716 cend -= spaces[t]; |
6929 | 4717 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
|
4718 } |
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4719 |
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4720 // 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
|
4721 // 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
|
4722 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
|
4723 |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4724 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
|
4725 (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
|
4726 if (t == 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4727 break; |
2597 | 4728 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1)); |
3562 | 4729 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4730 if (remove_comments) | |
4731 curr += comments[t - 1]; | |
4732 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4733 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
|
4734 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4735 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4736 } |
7 | 4737 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
4738 | |
5848 | 4739 if (setmark) |
4740 { | |
4741 /* Set the '] mark. */ | |
4742 curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; | |
4743 curwin->w_buffer->b_op_end.col = (colnr_T)STRLEN(newp); | |
4744 } | |
5664 | 4745 |
7 | 4746 /* Only report the change in the first line here, del_lines() will report |
4747 * the deleted line. */ | |
4748 changed_lines(curwin->w_cursor.lnum, currsize, | |
4749 curwin->w_cursor.lnum + 1, 0L); | |
4750 | |
4751 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4752 * Delete following lines. To do this we move the cursor there |
7 | 4753 * briefly, and then move it back. After del_lines() the cursor may |
4754 * have moved up (last line deleted), so the current lnum is kept in t. | |
4755 */ | |
4756 t = curwin->w_cursor.lnum; | |
4757 ++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
|
4758 del_lines(count - 1, FALSE); |
7 | 4759 curwin->w_cursor.lnum = t; |
4760 | |
4761 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4762 * Set the cursor column: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4763 * 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
|
4764 * vim: use the column of the last join |
7 | 4765 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4766 curwin->w_cursor.col = |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4767 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
7 | 4768 check_cursor_col(); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4769 |
7 | 4770 #ifdef FEAT_VIRTUALEDIT |
4771 curwin->w_cursor.coladd = 0; | |
4772 #endif | |
4773 curwin->w_set_curswant = TRUE; | |
4774 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4775 theend: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4776 vim_free(spaces); |
3562 | 4777 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4778 if (remove_comments) | |
4779 vim_free(comments); | |
4780 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4781 return ret; |
7 | 4782 } |
4783 | |
4784 #ifdef FEAT_COMMENTS | |
4785 /* | |
4786 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
4787 * the first line. White-space is ignored. Note that the whole of | |
4788 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
4789 */ | |
4790 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4791 same_leader( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4792 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4793 int leader1_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4794 char_u *leader1_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4795 int leader2_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4796 char_u *leader2_flags) |
7 | 4797 { |
4798 int idx1 = 0, idx2 = 0; | |
4799 char_u *p; | |
4800 char_u *line1; | |
4801 char_u *line2; | |
4802 | |
4803 if (leader1_len == 0) | |
4804 return (leader2_len == 0); | |
4805 | |
4806 /* | |
4807 * If first leader has 'f' flag, the lines can be joined only if the | |
4808 * second line does not have a leader. | |
4809 * If first leader has 'e' flag, the lines can never be joined. | |
4810 * If fist leader has 's' flag, the lines can only be joined if there is | |
4811 * some text after it and the second line has the 'm' flag. | |
4812 */ | |
4813 if (leader1_flags != NULL) | |
4814 { | |
4815 for (p = leader1_flags; *p && *p != ':'; ++p) | |
4816 { | |
4817 if (*p == COM_FIRST) | |
4818 return (leader2_len == 0); | |
4819 if (*p == COM_END) | |
4820 return FALSE; | |
4821 if (*p == COM_START) | |
4822 { | |
4823 if (*(ml_get(lnum) + leader1_len) == NUL) | |
4824 return FALSE; | |
4825 if (leader2_flags == NULL || leader2_len == 0) | |
4826 return FALSE; | |
4827 for (p = leader2_flags; *p && *p != ':'; ++p) | |
4828 if (*p == COM_MIDDLE) | |
4829 return TRUE; | |
4830 return FALSE; | |
4831 } | |
4832 } | |
4833 } | |
4834 | |
4835 /* | |
4836 * Get current line and next line, compare the leaders. | |
4837 * The first line has to be saved, only one line can be locked at a time. | |
4838 */ | |
4839 line1 = vim_strsave(ml_get(lnum)); | |
4840 if (line1 != NULL) | |
4841 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4842 for (idx1 = 0; VIM_ISWHITE(line1[idx1]); ++idx1) |
7 | 4843 ; |
4844 line2 = ml_get(lnum + 1); | |
4845 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
4846 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4847 if (!VIM_ISWHITE(line2[idx2])) |
7 | 4848 { |
4849 if (line1[idx1++] != line2[idx2]) | |
4850 break; | |
4851 } | |
4852 else | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4853 while (VIM_ISWHITE(line1[idx1])) |
7 | 4854 ++idx1; |
4855 } | |
4856 vim_free(line1); | |
4857 } | |
4858 return (idx2 == leader2_len && idx1 == leader1_len); | |
4859 } | |
4860 #endif | |
4861 | |
4862 /* | |
3252 | 4863 * Implementation of the format operator 'gq'. |
7 | 4864 */ |
4865 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4866 op_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4867 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4868 int keep_cursor) /* keep cursor on same text char */ |
7 | 4869 { |
4870 long old_line_count = curbuf->b_ml.ml_line_count; | |
4871 | |
4872 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
4873 * can put it back there. */ | |
4874 curwin->w_cursor = oap->cursor_start; | |
4875 | |
4876 if (u_save((linenr_T)(oap->start.lnum - 1), | |
4877 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
4878 return; | |
4879 curwin->w_cursor = oap->start; | |
4880 | |
4881 if (oap->is_VIsual) | |
4882 /* When there is no change: need to remove the Visual selection */ | |
4883 redraw_curbuf_later(INVERTED); | |
4884 | |
4885 /* Set '[ mark at the start of the formatted area */ | |
4886 curbuf->b_op_start = oap->start; | |
4887 | |
4888 /* For "gw" remember the cursor position and put it back below (adjusted | |
4889 * for joined and split lines). */ | |
4890 if (keep_cursor) | |
4891 saved_cursor = oap->cursor_start; | |
4892 | |
1563 | 4893 format_lines(oap->line_count, keep_cursor); |
7 | 4894 |
4895 /* | |
4896 * Leave the cursor at the first non-blank of the last formatted line. | |
4897 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
4898 * line, so "." will do the next lines. | |
4899 */ | |
4900 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
4901 ++curwin->w_cursor.lnum; | |
4902 beginline(BL_WHITE | BL_FIX); | |
4903 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
4904 msgmore(old_line_count); | |
4905 | |
4906 /* put '] mark on the end of the formatted area */ | |
4907 curbuf->b_op_end = curwin->w_cursor; | |
4908 | |
4909 if (keep_cursor) | |
4910 { | |
4911 curwin->w_cursor = saved_cursor; | |
4912 saved_cursor.lnum = 0; | |
4913 } | |
4914 | |
4915 if (oap->is_VIsual) | |
4916 { | |
4917 win_T *wp; | |
4918 | |
4919 FOR_ALL_WINDOWS(wp) | |
4920 { | |
4921 if (wp->w_old_cursor_lnum != 0) | |
4922 { | |
4923 /* When lines have been inserted or deleted, adjust the end of | |
4924 * the Visual area to be redrawn. */ | |
4925 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
4926 wp->w_old_cursor_lnum += old_line_count; | |
4927 else | |
4928 wp->w_old_visual_lnum += old_line_count; | |
4929 } | |
4930 } | |
4931 } | |
4932 } | |
4933 | |
667 | 4934 #if defined(FEAT_EVAL) || defined(PROTO) |
4935 /* | |
4936 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
4937 */ | |
4938 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4939 op_formatexpr(oparg_T *oap) |
667 | 4940 { |
4941 if (oap->is_VIsual) | |
4942 /* When there is no change: need to remove the Visual selection */ | |
4943 redraw_curbuf_later(INVERTED); | |
4944 | |
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4945 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
|
4946 /* 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
|
4947 * internal formatting. */ |
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4948 op_format(oap, FALSE); |
667 | 4949 } |
4950 | |
4951 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4952 fex_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4953 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4954 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4955 int c) /* character to be inserted */ |
667 | 4956 { |
681 | 4957 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
4958 OPT_LOCAL); | |
667 | 4959 int r; |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4960 char_u *fex; |
667 | 4961 |
4962 /* | |
4963 * Set v:lnum to the first line number and v:count to the number of lines. | |
844 | 4964 * Set v:char to the character to be inserted (can be NUL). |
667 | 4965 */ |
4966 set_vim_var_nr(VV_LNUM, lnum); | |
4967 set_vim_var_nr(VV_COUNT, count); | |
1969 | 4968 set_vim_var_char(c); |
844 | 4969 |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4970 /* 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
|
4971 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
|
4972 if (fex == NULL) |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4973 return 0; |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4974 |
667 | 4975 /* |
4976 * Evaluate the function. | |
4977 */ | |
4978 if (use_sandbox) | |
4979 ++sandbox; | |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4980 r = (int)eval_to_number(fex); |
667 | 4981 if (use_sandbox) |
4982 --sandbox; | |
844 | 4983 |
4984 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
|
4985 vim_free(fex); |
844 | 4986 |
667 | 4987 return r; |
4988 } | |
4989 #endif | |
4990 | |
7 | 4991 /* |
4992 * Format "line_count" lines, starting at the cursor position. | |
4993 * When "line_count" is negative, format until the end of the paragraph. | |
4994 * Lines after the cursor line are saved for undo, caller must have saved the | |
4995 * first line. | |
4996 */ | |
4997 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4998 format_lines( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4999 linenr_T line_count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5000 int avoid_fex) /* don't use 'formatexpr' */ |
7 | 5001 { |
5002 int max_len; | |
5003 int is_not_par; /* current line not part of parag. */ | |
5004 int next_is_not_par; /* next line not part of paragraph */ | |
5005 int is_end_par; /* at end of paragraph */ | |
5006 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
5007 int next_is_start_par = FALSE; | |
5008 #ifdef FEAT_COMMENTS | |
5009 int leader_len = 0; /* leader len of current line */ | |
5010 int next_leader_len; /* leader len of next line */ | |
5011 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
5012 char_u *next_leader_flags; /* flags for leader of next line */ | |
5013 int do_comments; /* format comments */ | |
3584 | 5014 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
7 | 5015 #endif |
5016 int advance = TRUE; | |
3584 | 5017 int second_indent = -1; /* indent for second line (comment |
5018 * aware) */ | |
7 | 5019 int do_second_indent; |
5020 int do_number_indent; | |
5021 int do_trail_white; | |
5022 int first_par_line = TRUE; | |
5023 int smd_save; | |
5024 long count; | |
5025 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
5026 int force_format = FALSE; | |
5027 int old_State = State; | |
5028 | |
5029 /* length of a line to force formatting: 3 * 'tw' */ | |
5030 max_len = comp_textwidth(TRUE) * 3; | |
5031 | |
5032 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
5033 #ifdef FEAT_COMMENTS | |
5034 do_comments = has_format_option(FO_Q_COMS); | |
5035 #endif | |
5036 do_second_indent = has_format_option(FO_Q_SECOND); | |
5037 do_number_indent = has_format_option(FO_Q_NUMBER); | |
5038 do_trail_white = has_format_option(FO_WHITE_PAR); | |
5039 | |
5040 /* | |
5041 * Get info about the previous and current line. | |
5042 */ | |
5043 if (curwin->w_cursor.lnum > 1) | |
5044 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
5045 #ifdef FEAT_COMMENTS | |
5046 , &leader_len, &leader_flags, do_comments | |
5047 #endif | |
5048 ); | |
5049 else | |
5050 is_not_par = TRUE; | |
5051 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
5052 #ifdef FEAT_COMMENTS | |
5053 , &next_leader_len, &next_leader_flags, do_comments | |
5054 #endif | |
5055 ); | |
5056 is_end_par = (is_not_par || next_is_not_par); | |
5057 if (!is_end_par && do_trail_white) | |
5058 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
5059 | |
5060 curwin->w_cursor.lnum--; | |
5061 for (count = line_count; count != 0 && !got_int; --count) | |
5062 { | |
5063 /* | |
5064 * Advance to next paragraph. | |
5065 */ | |
5066 if (advance) | |
5067 { | |
5068 curwin->w_cursor.lnum++; | |
5069 prev_is_end_par = is_end_par; | |
5070 is_not_par = next_is_not_par; | |
5071 #ifdef FEAT_COMMENTS | |
5072 leader_len = next_leader_len; | |
5073 leader_flags = next_leader_flags; | |
5074 #endif | |
5075 } | |
5076 | |
5077 /* | |
5078 * The last line to be formatted. | |
5079 */ | |
5080 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
5081 { | |
5082 next_is_not_par = TRUE; | |
5083 #ifdef FEAT_COMMENTS | |
5084 next_leader_len = 0; | |
5085 next_leader_flags = NULL; | |
5086 #endif | |
5087 } | |
5088 else | |
5089 { | |
5090 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
5091 #ifdef FEAT_COMMENTS | |
5092 , &next_leader_len, &next_leader_flags, do_comments | |
5093 #endif | |
5094 ); | |
5095 if (do_number_indent) | |
5096 next_is_start_par = | |
5097 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
5098 } | |
5099 advance = TRUE; | |
5100 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
5101 if (!is_end_par && do_trail_white) | |
5102 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
5103 | |
5104 /* | |
5105 * Skip lines that are not in a paragraph. | |
5106 */ | |
5107 if (is_not_par) | |
5108 { | |
5109 if (line_count < 0) | |
5110 break; | |
5111 } | |
5112 else | |
5113 { | |
5114 /* | |
5115 * For the first line of a paragraph, check indent of second line. | |
5116 * Don't do this for comments and empty lines. | |
5117 */ | |
5118 if (first_par_line | |
5119 && (do_second_indent || do_number_indent) | |
5120 && prev_is_end_par | |
3584 | 5121 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
5122 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
5123 if (do_second_indent && !LINEEMPTY(curwin->w_cursor.lnum + 1)) |
3584 | 5124 { |
5125 #ifdef FEAT_COMMENTS | |
5126 if (leader_len == 0 && next_leader_len == 0) | |
5127 { | |
5128 /* no comment found */ | |
5129 #endif | |
5130 second_indent = | |
5131 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
7 | 5132 #ifdef FEAT_COMMENTS |
3584 | 5133 } |
5134 else | |
5135 { | |
5136 second_indent = next_leader_len; | |
5137 do_comments_list = 1; | |
5138 } | |
5139 #endif | |
5140 } | |
7 | 5141 else if (do_number_indent) |
3584 | 5142 { |
5143 #ifdef FEAT_COMMENTS | |
5144 if (leader_len == 0 && next_leader_len == 0) | |
5145 { | |
5146 /* no comment found */ | |
5147 #endif | |
5148 second_indent = | |
5149 get_number_indent(curwin->w_cursor.lnum); | |
5150 #ifdef FEAT_COMMENTS | |
5151 } | |
5152 else | |
5153 { | |
5154 /* get_number_indent() is now "comment aware"... */ | |
5155 second_indent = | |
5156 get_number_indent(curwin->w_cursor.lnum); | |
5157 do_comments_list = 1; | |
5158 } | |
5159 #endif | |
5160 } | |
7 | 5161 } |
5162 | |
5163 /* | |
5164 * When the comment leader changes, it's the end of the paragraph. | |
5165 */ | |
5166 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
5167 #ifdef FEAT_COMMENTS | |
5168 || !same_leader(curwin->w_cursor.lnum, | |
5169 leader_len, leader_flags, | |
5170 next_leader_len, next_leader_flags) | |
5171 #endif | |
5172 ) | |
5173 is_end_par = TRUE; | |
5174 | |
5175 /* | |
5176 * If we have got to the end of a paragraph, or the line is | |
5177 * getting long, format it. | |
5178 */ | |
5179 if (is_end_par || force_format) | |
5180 { | |
5181 if (need_set_indent) | |
5182 /* replace indent in first line with minimal number of | |
5183 * tabs and spaces, according to current options */ | |
5184 (void)set_indent(get_indent(), SIN_CHANGED); | |
5185 | |
5186 /* put cursor on last non-space */ | |
5187 State = NORMAL; /* don't go past end-of-line */ | |
5188 coladvance((colnr_T)MAXCOL); | |
5189 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
5190 dec_cursor(); | |
5191 | |
5192 /* do the formatting, without 'showmode' */ | |
5193 State = INSERT; /* for open_line() */ | |
5194 smd_save = p_smd; | |
5195 p_smd = FALSE; | |
5196 insertchar(NUL, INSCHAR_FORMAT | |
5197 #ifdef FEAT_COMMENTS | |
5198 + (do_comments ? INSCHAR_DO_COM : 0) | |
3584 | 5199 + (do_comments && do_comments_list |
5200 ? INSCHAR_COM_LIST : 0) | |
7 | 5201 #endif |
1563 | 5202 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
7 | 5203 State = old_State; |
5204 p_smd = smd_save; | |
5205 second_indent = -1; | |
5206 /* at end of par.: need to set indent of next par. */ | |
5207 need_set_indent = is_end_par; | |
5208 if (is_end_par) | |
5209 { | |
5210 /* When called with a negative line count, break at the | |
5211 * end of the paragraph. */ | |
5212 if (line_count < 0) | |
5213 break; | |
5214 first_par_line = TRUE; | |
5215 } | |
5216 force_format = FALSE; | |
5217 } | |
5218 | |
5219 /* | |
5220 * When still in same paragraph, join the lines together. But | |
5403 | 5221 * first delete the leader from the second line. |
7 | 5222 */ |
5223 if (!is_end_par) | |
5224 { | |
5225 advance = FALSE; | |
5226 curwin->w_cursor.lnum++; | |
5227 curwin->w_cursor.col = 0; | |
5228 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
|
5229 break; |
7 | 5230 #ifdef FEAT_COMMENTS |
5231 if (next_leader_len > 0) | |
5403 | 5232 { |
5233 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
7 | 5234 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
|
5235 (long)-next_leader_len, 0); |
5403 | 5236 } else |
5237 #endif | |
5238 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
5239 { | |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
5240 int indent = getwhitecols_curline(); |
5403 | 5241 |
5242 if (indent > 0) | |
5243 { | |
5244 (void)del_bytes(indent, FALSE, FALSE); | |
5245 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
|
5246 (colnr_T)0, 0L, (long)-indent, 0); |
5415 | 5247 } |
5403 | 5248 } |
7 | 5249 curwin->w_cursor.lnum--; |
5848 | 5250 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
7 | 5251 { |
5252 beep_flush(); | |
5253 break; | |
5254 } | |
5255 first_par_line = FALSE; | |
5256 /* If the line is getting long, format it next time */ | |
5257 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
5258 force_format = TRUE; | |
5259 else | |
5260 force_format = FALSE; | |
5261 } | |
5262 } | |
5263 line_breakcheck(); | |
5264 } | |
5265 } | |
5266 | |
5267 /* | |
5268 * Return TRUE if line "lnum" ends in a white character. | |
5269 */ | |
5270 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5271 ends_in_white(linenr_T lnum) |
7 | 5272 { |
5273 char_u *s = ml_get(lnum); | |
5274 size_t l; | |
5275 | |
5276 if (*s == NUL) | |
5277 return FALSE; | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5278 /* Don't use STRLEN() inside VIM_ISWHITE(), SAS/C complains: "macro |
7 | 5279 * invocation may call function multiple times". */ |
5280 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
|
5281 return VIM_ISWHITE(s[l]); |
7 | 5282 } |
5283 | |
5284 /* | |
5285 * Blank lines, and lines containing only the comment leader, are left | |
5286 * untouched by the formatting. The function returns TRUE in this | |
5287 * case. It also returns TRUE when a line starts with the end of a comment | |
5288 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
5289 * previous line. A new paragraph starts after a blank line, or when the | |
5290 * comment leader changes -- webb. | |
5291 */ | |
5292 #ifdef FEAT_COMMENTS | |
5293 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5294 fmt_check_par( |
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 *leader_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5297 char_u **leader_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5298 int do_comments) |
7 | 5299 { |
5300 char_u *flags = NULL; /* init for GCC */ | |
5301 char_u *ptr; | |
5302 | |
5303 ptr = ml_get(lnum); | |
5304 if (do_comments) | |
3562 | 5305 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
7 | 5306 else |
5307 *leader_len = 0; | |
5308 | |
5309 if (*leader_len > 0) | |
5310 { | |
5311 /* | |
5312 * Search for 'e' flag in comment leader flags. | |
5313 */ | |
5314 flags = *leader_flags; | |
5315 while (*flags && *flags != ':' && *flags != COM_END) | |
5316 ++flags; | |
5317 } | |
5318 | |
5319 return (*skipwhite(ptr + *leader_len) == NUL | |
5320 || (*leader_len > 0 && *flags == COM_END) | |
5321 || startPS(lnum, NUL, FALSE)); | |
5322 } | |
5323 #else | |
5324 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5325 fmt_check_par(linenr_T lnum) |
7 | 5326 { |
5327 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
5328 } | |
5329 #endif | |
5330 | |
5331 /* | |
5332 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
5333 * previous line is in the same paragraph. Used for auto-formatting. | |
5334 */ | |
5335 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5336 paragraph_start(linenr_T lnum) |
7 | 5337 { |
5338 char_u *p; | |
5339 #ifdef FEAT_COMMENTS | |
5340 int leader_len = 0; /* leader len of current line */ | |
5341 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
5342 int next_leader_len; /* leader len of next line */ | |
5343 char_u *next_leader_flags; /* flags for leader of next line */ | |
5344 int do_comments; /* format comments */ | |
5345 #endif | |
5346 | |
5347 if (lnum <= 1) | |
5348 return TRUE; /* start of the file */ | |
5349 | |
5350 p = ml_get(lnum - 1); | |
5351 if (*p == NUL) | |
5352 return TRUE; /* after empty line */ | |
5353 | |
5354 #ifdef FEAT_COMMENTS | |
5355 do_comments = has_format_option(FO_Q_COMS); | |
5356 #endif | |
5357 if (fmt_check_par(lnum - 1 | |
5358 #ifdef FEAT_COMMENTS | |
5359 , &leader_len, &leader_flags, do_comments | |
5360 #endif | |
5361 )) | |
5362 return TRUE; /* after non-paragraph line */ | |
5363 | |
5364 if (fmt_check_par(lnum | |
5365 #ifdef FEAT_COMMENTS | |
5366 , &next_leader_len, &next_leader_flags, do_comments | |
5367 #endif | |
5368 )) | |
5369 return TRUE; /* "lnum" is not a paragraph line */ | |
5370 | |
5371 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
5372 return TRUE; /* missing trailing space in previous line. */ | |
5373 | |
5374 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
5375 return TRUE; /* numbered item starts in "lnum". */ | |
5376 | |
5377 #ifdef FEAT_COMMENTS | |
5378 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
5379 next_leader_len, next_leader_flags)) | |
5380 return TRUE; /* change of comment leader. */ | |
5381 #endif | |
5382 | |
5383 return FALSE; | |
5384 } | |
5385 | |
5386 /* | |
5387 * prepare a few things for block mode yank/delete/tilde | |
5388 * | |
5389 * for delete: | |
5390 * - textlen includes the first/last char to be (partly) deleted | |
5391 * - start/endspaces is the number of columns that are taken by the | |
5392 * first/last deleted char minus the number of columns that have to be | |
1839 | 5393 * deleted. |
5394 * for yank and tilde: | |
7 | 5395 * - textlen includes the first/last char to be wholly yanked |
5396 * - start/endspaces is the number of columns of the first/last yanked char | |
5397 * that are to be yanked. | |
5398 */ | |
5399 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5400 block_prep( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5401 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5402 struct block_def *bdp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5403 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5404 int is_del) |
7 | 5405 { |
5406 int incr = 0; | |
5407 char_u *pend; | |
5408 char_u *pstart; | |
5409 char_u *line; | |
5410 char_u *prev_pstart; | |
5411 char_u *prev_pend; | |
5412 | |
5413 bdp->startspaces = 0; | |
5414 bdp->endspaces = 0; | |
5415 bdp->textlen = 0; | |
5416 bdp->start_vcol = 0; | |
5417 bdp->end_vcol = 0; | |
5418 #ifdef FEAT_VISUALEXTRA | |
5419 bdp->is_short = FALSE; | |
5420 bdp->is_oneChar = FALSE; | |
5421 bdp->pre_whitesp = 0; | |
5422 bdp->pre_whitesp_c = 0; | |
5423 bdp->end_char_vcols = 0; | |
5424 #endif | |
5425 bdp->start_char_vcols = 0; | |
5426 | |
5427 line = ml_get(lnum); | |
5428 pstart = line; | |
5429 prev_pstart = line; | |
5430 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
5431 { | |
5432 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 5433 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
7 | 5434 bdp->start_vcol += incr; |
5435 #ifdef FEAT_VISUALEXTRA | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5436 if (VIM_ISWHITE(*pstart)) |
7 | 5437 { |
5438 bdp->pre_whitesp += incr; | |
5439 bdp->pre_whitesp_c++; | |
5440 } | |
5441 else | |
5442 { | |
5443 bdp->pre_whitesp = 0; | |
5444 bdp->pre_whitesp_c = 0; | |
5445 } | |
5446 #endif | |
5447 prev_pstart = pstart; | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
5448 MB_PTR_ADV(pstart); |
7 | 5449 } |
5450 bdp->start_char_vcols = incr; | |
5451 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
5452 { | |
5453 bdp->end_vcol = bdp->start_vcol; | |
5454 #ifdef FEAT_VISUALEXTRA | |
5455 bdp->is_short = TRUE; | |
5456 #endif | |
5457 if (!is_del || oap->op_type == OP_APPEND) | |
5458 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
5459 } | |
5460 else | |
5461 { | |
5462 /* notice: this converts partly selected Multibyte characters to | |
5463 * spaces, too. */ | |
5464 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
5465 if (is_del && bdp->startspaces) | |
5466 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
5467 pend = pstart; | |
5468 bdp->end_vcol = bdp->start_vcol; | |
5469 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
5470 { | |
5471 #ifdef FEAT_VISUALEXTRA | |
5472 bdp->is_oneChar = TRUE; | |
5473 #endif | |
5474 if (oap->op_type == OP_INSERT) | |
5475 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5476 else if (oap->op_type == OP_APPEND) | |
5477 { | |
5478 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
5479 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5480 } | |
5481 else | |
5482 { | |
5483 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
5484 if (is_del && oap->op_type != OP_LSHIFT) | |
5485 { | |
5486 /* just putting the sum of those two into | |
5487 * bdp->startspaces doesn't work for Visual replace, | |
5488 * so we have to split the tab in two */ | |
5489 bdp->startspaces = bdp->start_char_vcols | |
5490 - (bdp->start_vcol - oap->start_vcol); | |
5491 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5492 } | |
5493 } | |
5494 } | |
5495 else | |
5496 { | |
5497 prev_pend = pend; | |
5498 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
5499 { | |
5500 /* Count a tab for what it's worth (if list mode not on) */ | |
5501 prev_pend = pend; | |
6535 | 5502 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
7 | 5503 bdp->end_vcol += incr; |
5504 } | |
5505 if (bdp->end_vcol <= oap->end_vcol | |
5506 && (!is_del | |
5507 || oap->op_type == OP_APPEND | |
5508 || oap->op_type == OP_REPLACE)) /* line too short */ | |
5509 { | |
5510 #ifdef FEAT_VISUALEXTRA | |
5511 bdp->is_short = TRUE; | |
5512 #endif | |
5513 /* Alternative: include spaces to fill up the block. | |
5514 * Disadvantage: can lead to trailing spaces when the line is | |
5515 * short where the text is put */ | |
5516 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
5517 if (oap->op_type == OP_APPEND || virtual_op) | |
5518 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
593 | 5519 + oap->inclusive; |
7 | 5520 else |
5521 bdp->endspaces = 0; /* replace doesn't add characters */ | |
5522 } | |
5523 else if (bdp->end_vcol > oap->end_vcol) | |
5524 { | |
5525 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5526 if (!is_del && bdp->endspaces) | |
5527 { | |
5528 bdp->endspaces = incr - bdp->endspaces; | |
5529 if (pend != pstart) | |
5530 pend = prev_pend; | |
5531 } | |
5532 } | |
5533 } | |
5534 #ifdef FEAT_VISUALEXTRA | |
5535 bdp->end_char_vcols = incr; | |
5536 #endif | |
5537 if (is_del && bdp->startspaces) | |
5538 pstart = prev_pstart; | |
5539 bdp->textlen = (int)(pend - pstart); | |
5540 } | |
5541 bdp->textcol = (colnr_T) (pstart - line); | |
5542 bdp->textstart = pstart; | |
5543 } | |
5544 | |
5545 /* | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5546 * Handle the add/subtract operator. |
7 | 5547 */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5548 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5549 op_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5550 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5551 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
|
5552 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
|
5553 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5554 pos_T pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5555 struct block_def bd; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5556 int change_cnt = 0; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5557 linenr_T amount = Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5558 |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5559 // do_addsub() might trigger re-evaluation of 'foldexpr' halfway, when the |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5560 // buffer is not completly updated yet. Postpone updating folds until before |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5561 // 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
|
5562 #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
|
5563 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
|
5564 #endif |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5565 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5566 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5567 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5568 pos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5569 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
|
5570 { |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5571 #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
|
5572 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
|
5573 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5574 return; |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5575 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5576 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
|
5577 #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
|
5578 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
|
5579 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5580 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5581 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
|
5582 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5583 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5584 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5585 int one_change; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5586 int length; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5587 pos_T startpos; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5588 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5589 if (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
|
5590 (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
|
5591 { |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5592 #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
|
5593 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
|
5594 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5595 return; |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5596 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5597 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5598 pos = oap->start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5599 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
|
5600 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5601 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
|
5602 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5603 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
|
5604 pos.col = bd.textcol; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5605 length = bd.textlen; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5606 } |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5607 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
|
5608 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5609 curwin->w_cursor.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5610 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5611 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
|
5612 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5613 else /* oap->motion_type == MCHAR */ |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5614 { |
12996
973a0037f4c3
patch 8.0.1374: CTRL-A does not work with an empty line
Christian Brabandt <cb@256bit.org>
parents:
12642
diff
changeset
|
5615 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
|
5616 dec(&(oap->end)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5617 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
|
5618 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5619 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
|
5620 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5621 pos.col += oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5622 length -= oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5623 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5624 if (pos.lnum == oap->end.lnum) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5625 { |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5626 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
|
5627 if (oap->end.col >= length) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5628 oap->end.col = length - 1; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5629 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
|
5630 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5631 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5632 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
|
5633 if (one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5634 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5635 /* 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
|
5636 if (change_cnt == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5637 startpos = curbuf->b_op_start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5638 ++change_cnt; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5639 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5640 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5641 #ifdef FEAT_NETBEANS_INTG |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5642 if (netbeans_active() && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5643 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5644 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
|
5645 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5646 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
|
5647 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
|
5648 &ptr[pos.col], length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5649 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5650 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5651 if (g_cmd && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5652 amount += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5653 } |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5654 |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5655 #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
|
5656 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
|
5657 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5658 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5659 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
|
5660 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5661 if (!change_cnt && oap->is_VIsual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5662 /* 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
|
5663 redraw_curbuf_later(INVERTED); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5664 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5665 /* 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
|
5666 * position from do_addsub(). */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5667 if (change_cnt > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5668 curbuf->b_op_start = startpos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5669 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5670 if (change_cnt > p_report) |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
5671 smsg((char_u *)NGETTEXT("%ld line changed", "%ld lines changed", |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
5672 change_cnt), change_cnt); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5673 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5674 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5675 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5676 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5677 * 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
|
5678 * 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
|
5679 * |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5680 * 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
|
5681 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5682 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5683 do_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5684 int op_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5685 pos_T *pos, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5686 int length, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5687 linenr_T Prenum1) |
7 | 5688 { |
5689 int col; | |
5690 char_u *buf1; | |
5691 char_u buf2[NUMBUFLEN]; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5692 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
7 | 5693 static int hexupper = FALSE; /* 0xABC */ |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5694 uvarnumber_T n; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5695 uvarnumber_T oldn; |
7 | 5696 char_u *ptr; |
5697 int c; | |
5698 int todel; | |
5699 int dohex; | |
5700 int dooct; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5701 int dobin; |
7 | 5702 int doalp; |
5703 int firstdigit; | |
5704 int subtract; | |
6868 | 5705 int negative = FALSE; |
6891 | 5706 int was_positive = TRUE; |
6868 | 5707 int visual = VIsual_active; |
6921 | 5708 int did_change = FALSE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5709 pos_T save_cursor = curwin->w_cursor; |
6927 | 5710 int maxlen = 0; |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5711 pos_T startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5712 pos_T endpos; |
7 | 5713 |
5714 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
5715 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
|
5716 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
7 | 5717 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
5718 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5719 curwin->w_cursor = *pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5720 ptr = ml_get(pos->lnum); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5721 col = pos->col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5722 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5723 if (*ptr == NUL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5724 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5725 |
7 | 5726 /* |
5727 * First check if we are on a hexadecimal number, after the "0x". | |
5728 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5729 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5730 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5731 if (dobin) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5732 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
|
5733 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5734 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5735 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5736 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5737 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
|
5738 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5739 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5740 |
6868 | 5741 if (dohex) |
5742 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
|
5743 { |
6868 | 5744 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5745 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5746 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5747 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
|
5748 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5749 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5750 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5751 if ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5752 && dohex |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5753 && ! ((col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5754 && (ptr[col] == 'X' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5755 || ptr[col] == 'x') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5756 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5757 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5758 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5759 !(*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
|
5760 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5761 && vim_isxdigit(ptr[col + 1])))) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5762 { |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5763 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5764 /* 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
|
5765 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5766 col = pos->col; |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5767 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5768 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
|
5769 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5770 col--; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5771 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5772 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5773 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
|
5774 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5775 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5776 } |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5777 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5778 if (( dohex |
6868 | 5779 && col > 0 |
5780 && (ptr[col] == 'X' | |
5781 || ptr[col] == 'x') | |
5782 && ptr[col - 1] == '0' | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5783 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5784 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5785 !(*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
|
5786 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5787 && vim_isxdigit(ptr[col + 1])) || |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5788 ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5789 && col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5790 && (ptr[col] == 'B' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5791 || ptr[col] == 'b') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5792 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5793 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5794 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5795 !(*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
|
5796 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5797 && vim_isbdigit(ptr[col + 1]))) |
6868 | 5798 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5799 /* Found hexadecimal or binary number, move to its start. */ |
7 | 5800 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5801 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5802 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5803 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
|
5804 #endif |
6868 | 5805 } |
5806 else | |
7 | 5807 { |
6868 | 5808 /* |
5809 * Search forward and then backward to find the start of number. | |
5810 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5811 col = pos->col; |
6868 | 5812 |
5813 while (ptr[col] != NUL | |
5814 && !vim_isdigit(ptr[col]) | |
5815 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5816 col += MB_PTR2LEN(ptr + col); |
6868 | 5817 |
5818 while (col > 0 | |
5819 && vim_isdigit(ptr[col - 1]) | |
5820 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5821 { |
6868 | 5822 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5823 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5824 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5825 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
|
5826 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5827 } |
6868 | 5828 } |
5829 } | |
5830 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5831 if (visual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5832 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5833 while (ptr[col] != NUL && length > 0 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5834 && !vim_isdigit(ptr[col]) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5835 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5836 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5837 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
|
5838 |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5839 col += mb_len; |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5840 length -= mb_len; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5841 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5842 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5843 if (length == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5844 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5845 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5846 if (col > pos->col && ptr[col - 1] == '-' |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5847 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5848 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5849 !(*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
|
5850 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5851 ) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5852 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5853 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5854 was_positive = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5855 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5856 } |
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 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5859 * 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
|
5860 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5861 firstdigit = ptr[col]; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5862 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
|
5863 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5864 beep_flush(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5865 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5866 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5867 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5868 if (doalp && ASCII_ISALPHA(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5869 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5870 /* decrement or increment alphabetic character */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5871 if (op_type == OP_NR_SUB) |
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 if (CharOrd(firstdigit) < Prenum1) |
6927 | 5874 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5875 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5876 firstdigit = 'A'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5877 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5878 firstdigit = 'a'; |
6927 | 5879 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5880 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5881 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5882 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5883 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5884 firstdigit -= Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5885 #endif |
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 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5888 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5889 if (26 - CharOrd(firstdigit) - 1 < Prenum1) |
6927 | 5890 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5891 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5892 firstdigit = 'Z'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5893 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5894 firstdigit = 'z'; |
6927 | 5895 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5896 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5897 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5898 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5899 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5900 firstdigit += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5901 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5902 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5903 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5904 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5905 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5906 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5907 (void)del_char(FALSE); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5908 ins_char(firstdigit); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5909 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5910 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5911 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5912 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5913 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5914 if (col > 0 && ptr[col - 1] == '-' |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5915 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5916 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5917 !(*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
|
5918 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5919 && !visual) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5920 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5921 /* negative number */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5922 --col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5923 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5924 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5925 /* get the number value (unsigned) */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5926 if (visual && VIsual_mode != 'V') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5927 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
|
5928 ? (int)STRLEN(ptr) - col |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5929 : length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5930 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5931 vim_str2nr(ptr + col, &pre, &length, |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5932 0 + (dobin ? STR2NR_BIN : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5933 + (dooct ? STR2NR_OCT : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5934 + (dohex ? STR2NR_HEX : 0), |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5935 NULL, &n, maxlen); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5936 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5937 /* 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
|
5938 if (pre && negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5939 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5940 ++col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5941 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5942 negative = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5943 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5944 /* add or subtract */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5945 subtract = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5946 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5947 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5948 if (negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5949 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5950 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5951 oldn = n; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5952 if (subtract) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5953 n -= (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5954 else |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5955 n += (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5956 /* handle wraparound for decimal numbers */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5957 if (!pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5958 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5959 if (subtract) |
6927 | 5960 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5961 if (n > oldn) |
6868 | 5962 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5963 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
|
5964 negative ^= TRUE; |
6868 | 5965 } |
7 | 5966 } |
5967 else | |
6868 | 5968 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5969 /* add */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5970 if (n < oldn) |
6868 | 5971 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5972 n = (n ^ (uvarnumber_T)-1); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5973 negative ^= TRUE; |
6868 | 5974 } |
6927 | 5975 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5976 if (n == 0) |
6868 | 5977 negative = FALSE; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5978 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5979 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5980 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
|
5981 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5982 /* need to remove the '-' */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5983 col--; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5984 length++; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5985 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5986 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5987 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5988 * Delete the old number. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5989 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5990 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5991 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5992 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5993 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5994 todel = length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5995 c = gchar_cursor(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5996 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5997 * 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
|
5998 * 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
|
5999 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6000 if (c == '-') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6001 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6002 while (todel-- > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6003 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6004 if (c < 0x100 && isalpha(c)) |
6868 | 6005 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6006 if (isupper(c)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6007 hexupper = TRUE; |
6868 | 6008 else |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6009 hexupper = FALSE; |
6891 | 6010 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6011 /* 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
|
6012 (void)del_char(FALSE); |
6868 | 6013 c = gchar_cursor(); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6014 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6015 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6016 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6017 * Prepare the leading characters in buf1[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6018 * 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
|
6019 * Allocate a bit too much. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6020 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6021 buf1 = alloc((unsigned)length + NUMBUFLEN); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6022 if (buf1 == NULL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6023 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6024 ptr = buf1; |
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
6025 if (negative && (!visual || was_positive)) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6026 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6027 *ptr++ = '-'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6028 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6029 if (pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6030 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6031 *ptr++ = '0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6032 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6033 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6034 if (pre == 'b' || pre == 'B' || |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6035 pre == 'x' || pre == 'X') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6036 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6037 *ptr++ = pre; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6038 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6039 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6040 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6041 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6042 * Put the number characters in buf2[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6043 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6044 if (pre == 'b' || pre == 'B') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6045 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6046 int i; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6047 int bit = 0; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6048 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
|
6049 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6050 /* leading zeros */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6051 for (bit = bits; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6052 if ((n >> (bit - 1)) & 0x1) break; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6053 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6054 for (i = 0; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6055 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
|
6056 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6057 buf2[i] = '\0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6058 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6059 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
|
6060 vim_snprintf((char *)buf2, NUMBUFLEN, "%llu", |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6061 (long long unsigned)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6062 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
|
6063 vim_snprintf((char *)buf2, NUMBUFLEN, "%llo", |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6064 (long long unsigned)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6065 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
|
6066 vim_snprintf((char *)buf2, NUMBUFLEN, "%llX", |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6067 (long long unsigned)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6068 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
|
6069 vim_snprintf((char *)buf2, NUMBUFLEN, "%llx", |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
6070 (long long unsigned)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6071 length -= (int)STRLEN(buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6072 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6073 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6074 * 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
|
6075 * 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
|
6076 * Don't do this when |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6077 * 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
|
6078 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6079 if (firstdigit == '0' && !(dooct && pre == 0)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6080 while (length-- > 0) |
6868 | 6081 *ptr++ = '0'; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6082 *ptr = NUL; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6083 STRCAT(buf1, buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6084 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
|
6085 vim_free(buf1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6086 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6087 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
|
6088 --curwin->w_cursor.col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6089 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6090 |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6091 if (did_change) |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6092 { |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6093 /* set the '[ and '] marks */ |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6094 curbuf->b_op_start = startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6095 curbuf->b_op_end = endpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6096 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
|
6097 --curbuf->b_op_end.col; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6098 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6099 |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6100 theend: |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6101 if (visual) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6102 curwin->w_cursor = save_cursor; |
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
6103 else if (did_change) |
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
6104 curwin->w_set_curswant = TRUE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6105 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6106 return did_change; |
7 | 6107 } |
6108 | |
6109 #ifdef FEAT_VIMINFO | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6110 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6111 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
|
6112 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6113 #define REG_PREVIOUS 1 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6114 #define REG_EXEC 2 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6115 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6116 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6117 * 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
|
6118 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6119 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
6120 prepare_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6121 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6122 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
|
6123 * (int)sizeof(yankreg_T)); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6124 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6125 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6126 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
6127 finish_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6128 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6129 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6130 int j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6131 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6132 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6133 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6134 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
|
6135 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
|
6136 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6137 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
|
6138 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
|
6139 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
|
6140 } |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
6141 VIM_CLEAR(y_read_regs); |
9272
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 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6144 |
7 | 6145 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6146 read_viminfo_register(vir_T *virp, int force) |
7 | 6147 { |
6148 int eof; | |
6149 int do_it = TRUE; | |
6150 int size; | |
6151 int limit; | |
6152 int i; | |
6153 int set_prev = FALSE; | |
6154 char_u *str; | |
6155 char_u **array = NULL; | |
6508 | 6156 int new_type = MCHAR; /* init to shut up compiler */ |
6157 colnr_T new_width = 0; /* init to shut up compiler */ | |
7 | 6158 |
6159 /* We only get here (hopefully) if line[0] == '"' */ | |
6160 str = virp->vir_line + 1; | |
1893 | 6161 |
6162 /* If the line starts with "" this is the y_previous register. */ | |
7 | 6163 if (*str == '"') |
6164 { | |
6165 set_prev = TRUE; | |
6166 str++; | |
6167 } | |
1893 | 6168 |
7 | 6169 if (!ASCII_ISALNUM(*str) && *str != '-') |
6170 { | |
6171 if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line)) | |
6172 return TRUE; /* too many errors, pretend end-of-file */ | |
6173 do_it = FALSE; | |
6174 } | |
6175 get_yank_register(*str++, FALSE); | |
6176 if (!force && y_current->y_array != NULL) | |
6177 do_it = FALSE; | |
1893 | 6178 |
6179 if (*str == '@') | |
6180 { | |
6181 /* "x@: register x used for @@ */ | |
6182 if (force || execreg_lastc == NUL) | |
6183 execreg_lastc = str[-1]; | |
6184 } | |
6185 | |
7 | 6186 size = 0; |
6187 limit = 100; /* Optimized for registers containing <= 100 lines */ | |
6188 if (do_it) | |
6189 { | |
6462 | 6190 /* |
6191 * Build the new register in array[]. | |
6192 * y_array is kept as-is until done. | |
6193 * The "do_it" flag is reset when something is wrong, in which case | |
6194 * array[] needs to be freed. | |
6195 */ | |
7 | 6196 if (set_prev) |
6197 y_previous = y_current; | |
6462 | 6198 array = (char_u **)alloc((unsigned)(limit * sizeof(char_u *))); |
1893 | 6199 str = skipwhite(skiptowhite(str)); |
7 | 6200 if (STRNCMP(str, "CHAR", 4) == 0) |
6462 | 6201 new_type = MCHAR; |
7 | 6202 else if (STRNCMP(str, "BLOCK", 5) == 0) |
6462 | 6203 new_type = MBLOCK; |
7 | 6204 else |
6462 | 6205 new_type = MLINE; |
7 | 6206 /* get the block width; if it's missing we get a zero, which is OK */ |
6207 str = skipwhite(skiptowhite(str)); | |
6462 | 6208 new_width = getdigits(&str); |
7 | 6209 } |
6210 | |
6211 while (!(eof = viminfo_readline(virp)) | |
6212 && (virp->vir_line[0] == TAB || virp->vir_line[0] == '<')) | |
6213 { | |
6214 if (do_it) | |
6215 { | |
6462 | 6216 if (size == limit) |
7 | 6217 { |
6462 | 6218 char_u **new_array = (char_u **) |
7 | 6219 alloc((unsigned)(limit * 2 * sizeof(char_u *))); |
6462 | 6220 |
6221 if (new_array == NULL) | |
6222 { | |
6223 do_it = FALSE; | |
6224 break; | |
6225 } | |
7 | 6226 for (i = 0; i < limit; i++) |
6462 | 6227 new_array[i] = array[i]; |
7 | 6228 vim_free(array); |
6462 | 6229 array = new_array; |
7 | 6230 limit *= 2; |
6231 } | |
6232 str = viminfo_readstring(virp, 1, TRUE); | |
6233 if (str != NULL) | |
6234 array[size++] = str; | |
6235 else | |
6462 | 6236 /* error, don't store the result */ |
7 | 6237 do_it = FALSE; |
6238 } | |
6239 } | |
6508 | 6240 |
7 | 6241 if (do_it) |
6242 { | |
6462 | 6243 /* free y_array[] */ |
6244 for (i = 0; i < y_current->y_size; i++) | |
6245 vim_free(y_current->y_array[i]); | |
6246 vim_free(y_current->y_array); | |
6247 | |
6248 y_current->y_type = new_type; | |
6249 y_current->y_width = new_width; | |
6250 y_current->y_size = size; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6251 y_current->y_time_set = 0; |
7 | 6252 if (size == 0) |
6253 { | |
6254 y_current->y_array = NULL; | |
6255 } | |
6462 | 6256 else |
7 | 6257 { |
6462 | 6258 /* Move the lines from array[] to y_array[]. */ |
7 | 6259 y_current->y_array = |
6260 (char_u **)alloc((unsigned)(size * sizeof(char_u *))); | |
6261 for (i = 0; i < size; i++) | |
6462 | 6262 { |
6263 if (y_current->y_array == NULL) | |
6264 vim_free(array[i]); | |
6265 else | |
6266 y_current->y_array[i] = array[i]; | |
6267 } | |
7 | 6268 } |
6462 | 6269 } |
6270 else | |
6271 { | |
6272 /* Free array[] if it was filled. */ | |
6273 for (i = 0; i < size; i++) | |
6274 vim_free(array[i]); | |
6275 } | |
6276 vim_free(array); | |
6277 | |
7 | 6278 return eof; |
6279 } | |
6280 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6281 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6282 * 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
|
6283 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6284 void |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6285 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
|
6286 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6287 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
|
6288 int flags; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6289 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6290 int type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6291 int linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6292 int width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6293 time_t timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6294 yankreg_T *y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6295 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6296 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6297 /* Check the format: |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6298 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6299 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6300 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6301 if (values->ga_len < 6 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6302 || vp[0].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6303 || vp[1].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6304 || vp[2].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6305 || vp[3].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6306 || vp[4].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6307 || vp[5].bv_type != BVAL_NR) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6308 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6309 flags = vp[0].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6310 name = vp[1].bv_nr; |
9307
eb52a2670c96
commit https://github.com/vim/vim/commit/67e3720a9ddd8a9d2e8344358c28fa1f4196db0d
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
6311 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
|
6312 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6313 type = vp[2].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6314 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
|
6315 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6316 linecount = vp[3].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6317 if (values->ga_len < 6 + linecount) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6318 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6319 width = vp[4].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6320 if (width < 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6321 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6322 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6323 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6324 /* 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
|
6325 * 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
|
6326 y_ptr = &y_read_regs[name]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6327 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6328 y_ptr = &y_regs[name]; |
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 /* 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
|
6331 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
|
6332 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
|
6333 && (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
|
6334 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6335 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6336 if (y_ptr->y_array != NULL) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6337 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
|
6338 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
|
6339 vim_free(y_ptr->y_array); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6340 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6341 if (y_read_regs == NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6342 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6343 if (flags & REG_PREVIOUS) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6344 y_previous = y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6345 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
|
6346 execreg_lastc = get_register_name(name); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6347 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6348 y_ptr->y_type = type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6349 y_ptr->y_width = width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6350 y_ptr->y_size = linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6351 y_ptr->y_time_set = timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6352 if (linecount == 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6353 y_ptr->y_array = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6354 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6355 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6356 y_ptr->y_array = |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6357 (char_u **)alloc((unsigned)(linecount * sizeof(char_u *))); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6358 for (i = 0; i < linecount; i++) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6359 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6360 if (vp[i + 6].bv_allocated) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6361 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6362 y_ptr->y_array[i] = vp[i + 6].bv_string; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6363 vp[i + 6].bv_string = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6364 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6365 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6366 y_ptr->y_array[i] = vim_strsave(vp[i + 6].bv_string); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6367 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6368 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6369 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6370 |
7 | 6371 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6372 write_viminfo_registers(FILE *fp) |
7 | 6373 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6374 int i, j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6375 char_u *type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6376 char_u c; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6377 int num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6378 int max_num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6379 int max_kbyte; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6380 long len; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6381 yankreg_T *y_ptr; |
7 | 6382 |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
6383 fputs(_("\n# Registers:\n"), fp); |
7 | 6384 |
6385 /* Get '<' value, use old '"' value if '<' is not found. */ | |
6386 max_num_lines = get_viminfo_parameter('<'); | |
6387 if (max_num_lines < 0) | |
6388 max_num_lines = get_viminfo_parameter('"'); | |
6389 if (max_num_lines == 0) | |
6390 return; | |
6391 max_kbyte = get_viminfo_parameter('s'); | |
6392 if (max_kbyte == 0) | |
6393 return; | |
1893 | 6394 |
7 | 6395 for (i = 0; i < NUM_REGISTERS; i++) |
6396 { | |
6397 #ifdef FEAT_CLIPBOARD | |
6398 /* Skip '*'/'+' register, we don't want them back next time */ | |
6399 if (i == STAR_REGISTER || i == PLUS_REGISTER) | |
6400 continue; | |
6401 #endif | |
6402 #ifdef FEAT_DND | |
6403 /* Neither do we want the '~' register */ | |
6404 if (i == TILDE_REGISTER) | |
6405 continue; | |
6406 #endif | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6407 /* 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
|
6408 * viminfo if it's newer. */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6409 if (y_read_regs != NULL |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6410 && 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
|
6411 && (y_regs[i].y_array == NULL || |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6412 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
|
6413 y_ptr = &y_read_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6414 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
|
6415 continue; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6416 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6417 y_ptr = &y_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6418 |
55 | 6419 /* Skip empty registers. */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6420 num_lines = y_ptr->y_size; |
55 | 6421 if (num_lines == 0 |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6422 || (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
|
6423 && *y_ptr->y_array[0] == NUL)) |
55 | 6424 continue; |
6425 | |
7 | 6426 if (max_kbyte > 0) |
6427 { | |
6428 /* Skip register if there is more text than the maximum size. */ | |
6429 len = 0; | |
6430 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
|
6431 len += (long)STRLEN(y_ptr->y_array[j]) + 1L; |
7 | 6432 if (len > (long)max_kbyte * 1024L) |
6433 continue; | |
6434 } | |
6435 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6436 switch (y_ptr->y_type) |
7 | 6437 { |
6438 case MLINE: | |
6439 type = (char_u *)"LINE"; | |
6440 break; | |
6441 case MCHAR: | |
6442 type = (char_u *)"CHAR"; | |
6443 break; | |
6444 case MBLOCK: | |
6445 type = (char_u *)"BLOCK"; | |
6446 break; | |
6447 default: | |
6448 sprintf((char *)IObuff, _("E574: Unknown register type %d"), | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6449 y_ptr->y_type); |
7 | 6450 emsg(IObuff); |
6451 type = (char_u *)"LINE"; | |
6452 break; | |
6453 } | |
6454 if (y_previous == &y_regs[i]) | |
6455 fprintf(fp, "\""); | |
6456 c = get_register_name(i); | |
1893 | 6457 fprintf(fp, "\"%c", c); |
6458 if (c == execreg_lastc) | |
6459 fprintf(fp, "@"); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6460 fprintf(fp, "\t%s\t%d\n", type, (int)y_ptr->y_width); |
7 | 6461 |
6462 /* If max_num_lines < 0, then we save ALL the lines in the register */ | |
6463 if (max_num_lines > 0 && num_lines > max_num_lines) | |
6464 num_lines = max_num_lines; | |
6465 for (j = 0; j < num_lines; j++) | |
6466 { | |
6467 putc('\t', fp); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6468 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
|
6469 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6470 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6471 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6472 int flags = 0; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6473 int remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6474 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6475 /* 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
|
6476 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6477 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6478 * 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
|
6479 * REG_EXEC - used for @@ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6480 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6481 if (y_previous == &y_regs[i]) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6482 flags |= REG_PREVIOUS; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6483 if (c == execreg_lastc) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6484 flags |= REG_EXEC; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6485 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
|
6486 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
|
6487 (long)y_ptr->y_time_set); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6488 /* 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
|
6489 remaining = LSIZE - 71; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6490 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
|
6491 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6492 putc(',', fp); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6493 --remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6494 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
|
6495 remaining); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6496 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6497 putc('\n', fp); |
7 | 6498 } |
6499 } | |
6500 } | |
6501 #endif /* FEAT_VIMINFO */ | |
6502 | |
6503 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
6504 /* | |
6505 * SELECTION / PRIMARY ('*') | |
6506 * | |
6507 * Text selection stuff that uses the GUI selection register '*'. When using a | |
6508 * GUI this may be text from another window, otherwise it is the last text we | |
6509 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
6510 * button performs the paste, otherwise you will need to do <"*p>. " | |
6511 * If not under X, it is synonymous with the clipboard register '+'. | |
6512 * | |
6513 * X CLIPBOARD ('+') | |
6514 * | |
6515 * Text selection stuff that uses the GUI clipboard register '+'. | |
6516 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
6517 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
6518 * otherwise you will need to do <"+p>. " | |
6519 * If not under X, it is synonymous with the selection register '*'. | |
6520 */ | |
6521 | |
6522 /* | |
6523 * 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
|
6524 * so that the text is still available after Vim has exited. X selections |
7 | 6525 * only exist while the owning application exists, so we write to the |
6526 * permanent (while X runs) store CUT_BUFFER0. | |
6527 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
6528 * 'permanent' of the two), otherwise the PRIMARY one. | |
6529 * For now, use a hard-coded sanity limit of 1Mb of data. | |
6530 */ | |
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
6531 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
7 | 6532 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6533 x11_export_final_selection(void) |
7 | 6534 { |
6535 Display *dpy; | |
6536 char_u *str = NULL; | |
6537 long_u len = 0; | |
6538 int motion_type = -1; | |
6539 | |
6540 # ifdef FEAT_GUI | |
6541 if (gui.in_use) | |
6542 dpy = X_DISPLAY; | |
6543 else | |
6544 # endif | |
6545 # ifdef FEAT_XCLIPBOARD | |
6546 dpy = xterm_dpy; | |
6547 # else | |
6548 return; | |
6549 # endif | |
6550 | |
6551 /* Get selection to export */ | |
6552 if (clip_plus.owned) | |
6553 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
6554 else if (clip_star.owned) | |
6555 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
6556 | |
6557 /* Check it's OK */ | |
6558 if (dpy != NULL && str != NULL && motion_type >= 0 | |
6559 && len < 1024*1024 && len > 0) | |
6560 { | |
1924 | 6561 #ifdef FEAT_MBYTE |
4201 | 6562 int ok = TRUE; |
6563 | |
1924 | 6564 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
6565 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
6566 * encoding conversion usually doesn't work, so keep the text as-is. | |
6567 */ | |
6568 if (has_mbyte) | |
6569 { | |
6570 vimconv_T vc; | |
6571 | |
6572 vc.vc_type = CONV_NONE; | |
6573 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
6574 { | |
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6575 int intlen = len; |
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6576 char_u *conv_str; |
2007 | 6577 |
4201 | 6578 vc.vc_fail = TRUE; |
2007 | 6579 conv_str = string_convert(&vc, str, &intlen); |
6580 len = intlen; | |
1924 | 6581 if (conv_str != NULL) |
6582 { | |
6583 vim_free(str); | |
6584 str = conv_str; | |
6585 } | |
4201 | 6586 else |
6587 { | |
6588 ok = FALSE; | |
6589 } | |
1924 | 6590 convert_setup(&vc, NULL, NULL); |
6591 } | |
4201 | 6592 else |
6593 { | |
6594 ok = FALSE; | |
6595 } | |
1924 | 6596 } |
4201 | 6597 |
6598 /* Do not store the string if conversion failed. Better to use any | |
6599 * other selection than garbled text. */ | |
6600 if (ok) | |
6601 #endif | |
6602 { | |
6603 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
6604 XFlush(dpy); | |
6605 } | |
7 | 6606 } |
6607 | |
6608 vim_free(str); | |
6609 } | |
6610 #endif | |
6611 | |
6612 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6613 clip_free_selection(VimClipboard *cbd) |
7 | 6614 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6615 yankreg_T *y_ptr = y_current; |
7 | 6616 |
6617 if (cbd == &clip_plus) | |
6618 y_current = &y_regs[PLUS_REGISTER]; | |
6619 else | |
6620 y_current = &y_regs[STAR_REGISTER]; | |
6621 free_yank_all(); | |
6622 y_current->y_size = 0; | |
6623 y_current = y_ptr; | |
6624 } | |
6625 | |
6626 /* | |
6627 * Get the selected text and put it in the gui selection register '*' or '+'. | |
6628 */ | |
6629 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6630 clip_get_selection(VimClipboard *cbd) |
7 | 6631 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6632 yankreg_T *old_y_previous, *old_y_current; |
7 | 6633 pos_T old_cursor; |
6634 pos_T old_visual; | |
6635 int old_visual_mode; | |
6636 colnr_T old_curswant; | |
6637 int old_set_curswant; | |
6638 pos_T old_op_start, old_op_end; | |
6639 oparg_T oa; | |
6640 cmdarg_T ca; | |
6641 | |
6642 if (cbd->owned) | |
6643 { | |
6644 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
6645 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
6646 return; | |
6647 | |
6648 /* Get the text between clip_star.start & clip_star.end */ | |
6649 old_y_previous = y_previous; | |
6650 old_y_current = y_current; | |
6651 old_cursor = curwin->w_cursor; | |
6652 old_curswant = curwin->w_curswant; | |
6653 old_set_curswant = curwin->w_set_curswant; | |
6654 old_op_start = curbuf->b_op_start; | |
6655 old_op_end = curbuf->b_op_end; | |
6656 old_visual = VIsual; | |
6657 old_visual_mode = VIsual_mode; | |
6658 clear_oparg(&oa); | |
6659 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
6660 oa.op_type = OP_YANK; | |
6661 vim_memset(&ca, 0, sizeof(ca)); | |
6662 ca.oap = &oa; | |
6663 ca.cmdchar = 'y'; | |
6664 ca.count1 = 1; | |
6665 ca.retval = CA_NO_ADJ_OP_END; | |
6666 do_pending_operator(&ca, 0, TRUE); | |
6667 y_previous = old_y_previous; | |
6668 y_current = old_y_current; | |
6669 curwin->w_cursor = old_cursor; | |
688 | 6670 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
7 | 6671 curwin->w_curswant = old_curswant; |
6672 curwin->w_set_curswant = old_set_curswant; | |
6673 curbuf->b_op_start = old_op_start; | |
6674 curbuf->b_op_end = old_op_end; | |
6675 VIsual = old_visual; | |
6676 VIsual_mode = old_visual_mode; | |
6677 } | |
11273
96d83cd2904a
patch 8.0.0522: Win32: when 'clipboard' is "unnamed" yyp does not work
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
6678 else if (!is_clipboard_needs_update()) |
7 | 6679 { |
6680 clip_free_selection(cbd); | |
6681 | |
6682 /* Try to get selected text from another window */ | |
6683 clip_gen_request_selection(cbd); | |
6684 } | |
6685 } | |
6686 | |
2896 | 6687 /* |
6688 * Convert from the GUI selection string into the '*'/'+' register. | |
6689 */ | |
7 | 6690 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6691 clip_yank_selection( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6692 int type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6693 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6694 long len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6695 VimClipboard *cbd) |
7 | 6696 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6697 yankreg_T *y_ptr; |
7 | 6698 |
6699 if (cbd == &clip_plus) | |
6700 y_ptr = &y_regs[PLUS_REGISTER]; | |
6701 else | |
6702 y_ptr = &y_regs[STAR_REGISTER]; | |
6703 | |
6704 clip_free_selection(cbd); | |
6705 | |
5798 | 6706 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
7 | 6707 } |
6708 | |
6709 /* | |
6710 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
6711 * with length *len. | |
6712 * Returns the motion type, or -1 for failure. | |
6713 */ | |
6714 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6715 clip_convert_selection(char_u **str, long_u *len, VimClipboard *cbd) |
7 | 6716 { |
6717 char_u *p; | |
6718 int lnum; | |
6719 int i, j; | |
6720 int_u eolsize; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6721 yankreg_T *y_ptr; |
7 | 6722 |
6723 if (cbd == &clip_plus) | |
6724 y_ptr = &y_regs[PLUS_REGISTER]; | |
6725 else | |
6726 y_ptr = &y_regs[STAR_REGISTER]; | |
6727 | |
6728 #ifdef USE_CRNL | |
6729 eolsize = 2; | |
6730 #else | |
6731 eolsize = 1; | |
6732 #endif | |
6733 | |
6734 *str = NULL; | |
6735 *len = 0; | |
6736 if (y_ptr->y_array == NULL) | |
6737 return -1; | |
6738 | |
6739 for (i = 0; i < y_ptr->y_size; i++) | |
6740 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
6741 | |
6742 /* | |
6743 * Don't want newline character at end of last line if we're in MCHAR mode. | |
6744 */ | |
6745 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
6746 *len -= eolsize; | |
6747 | |
6748 p = *str = lalloc(*len + 1, TRUE); /* add one to avoid zero */ | |
6749 if (p == NULL) | |
6750 return -1; | |
6751 lnum = 0; | |
6752 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
6753 { | |
6754 if (y_ptr->y_array[lnum][j] == '\n') | |
6755 p[i] = NUL; | |
6756 else if (y_ptr->y_array[lnum][j] == NUL) | |
6757 { | |
6758 #ifdef USE_CRNL | |
6759 p[i++] = '\r'; | |
6760 #endif | |
6761 #ifdef USE_CR | |
6762 p[i] = '\r'; | |
6763 #else | |
6764 p[i] = '\n'; | |
6765 #endif | |
6766 lnum++; | |
6767 j = -1; | |
6768 } | |
6769 else | |
6770 p[i] = y_ptr->y_array[lnum][j]; | |
6771 } | |
6772 return y_ptr->y_type; | |
6773 } | |
6774 | |
6775 | |
6776 /* | |
6777 * If we have written to a clipboard register, send the text to the clipboard. | |
6778 */ | |
6779 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6780 may_set_selection(void) |
7 | 6781 { |
6782 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
6783 { | |
6784 clip_own_selection(&clip_star); | |
6785 clip_gen_set_selection(&clip_star); | |
6786 } | |
6787 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
6788 { | |
6789 clip_own_selection(&clip_plus); | |
6790 clip_gen_set_selection(&clip_plus); | |
6791 } | |
6792 } | |
6793 | |
6794 #endif /* FEAT_CLIPBOARD || PROTO */ | |
6795 | |
6796 | |
6797 #if defined(FEAT_DND) || defined(PROTO) | |
6798 /* | |
6799 * Replace the contents of the '~' register with str. | |
6800 */ | |
6801 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6802 dnd_yank_drag_data(char_u *str, long len) |
7 | 6803 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6804 yankreg_T *curr; |
7 | 6805 |
6806 curr = y_current; | |
6807 y_current = &y_regs[TILDE_REGISTER]; | |
6808 free_yank_all(); | |
5798 | 6809 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
7 | 6810 y_current = curr; |
6811 } | |
6812 #endif | |
6813 | |
6814 | |
6815 #if defined(FEAT_EVAL) || defined(PROTO) | |
6816 /* | |
6817 * Return the type of a register. | |
6818 * Used for getregtype() | |
6819 * Returns MAUTO for error. | |
6820 */ | |
6821 char_u | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6822 get_reg_type(int regname, long *reglen) |
7 | 6823 { |
6824 switch (regname) | |
6825 { | |
6826 case '%': /* file name */ | |
6827 case '#': /* alternate file name */ | |
6828 case '=': /* expression */ | |
6829 case ':': /* last command line */ | |
6830 case '/': /* last search-pattern */ | |
6831 case '.': /* last inserted text */ | |
6832 #ifdef FEAT_SEARCHPATH | |
6833 case Ctrl_F: /* Filename under cursor */ | |
6834 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
6835 #endif | |
6836 case Ctrl_W: /* word under cursor */ | |
6837 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
6838 case '_': /* black hole: always empty */ | |
6839 return MCHAR; | |
6840 } | |
6841 | |
6842 #ifdef FEAT_CLIPBOARD | |
6843 regname = may_get_selection(regname); | |
6844 #endif | |
6845 | |
5596 | 6846 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
|
6847 return MAUTO; |
5596 | 6848 |
7 | 6849 get_yank_register(regname, FALSE); |
6850 | |
6851 if (y_current->y_array != NULL) | |
6852 { | |
6853 if (reglen != NULL && y_current->y_type == MBLOCK) | |
6854 *reglen = y_current->y_width; | |
6855 return y_current->y_type; | |
6856 } | |
6857 return MAUTO; | |
6858 } | |
6859 | |
5796 | 6860 /* |
6861 * When "flags" has GREG_LIST return a list with text "s". | |
6862 * Otherwise just return "s". | |
6863 */ | |
6864 static char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6865 getreg_wrap_one_line(char_u *s, int flags) |
5796 | 6866 { |
6867 if (flags & GREG_LIST) | |
6868 { | |
6869 list_T *list = list_alloc(); | |
6870 | |
6871 if (list != NULL) | |
6872 { | |
6873 if (list_append_string(list, NULL, -1) == FAIL) | |
6874 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6875 list_free(list); |
5796 | 6876 return NULL; |
6877 } | |
6878 list->lv_first->li_tv.vval.v_string = s; | |
6879 } | |
6880 return (char_u *)list; | |
6881 } | |
6882 return s; | |
6883 } | |
6884 | |
7 | 6885 /* |
6886 * Return the contents of a register as a single allocated string. | |
6887 * Used for "@r" in expressions and for getreg(). | |
6888 * Returns NULL for error. | |
5796 | 6889 * Flags: |
6890 * GREG_NO_EXPR Do not allow expression register | |
6891 * GREG_EXPR_SRC For the expression register: return expression itself, | |
6892 * not the result of its evaluation. | |
6893 * GREG_LIST Return a list of lines in place of a single string. | |
7 | 6894 */ |
6895 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6896 get_reg_contents(int regname, int flags) |
7 | 6897 { |
6898 long i; | |
6899 char_u *retval; | |
6900 int allocated; | |
6901 long len; | |
6902 | |
6903 /* Don't allow using an expression register inside an expression */ | |
6904 if (regname == '=') | |
6905 { | |
5796 | 6906 if (flags & GREG_NO_EXPR) |
6907 return NULL; | |
6908 if (flags & GREG_EXPR_SRC) | |
6909 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
6910 return getreg_wrap_one_line(get_expr_line(), flags); | |
7 | 6911 } |
6912 | |
6913 if (regname == '@') /* "@@" is used for unnamed register */ | |
6914 regname = '"'; | |
6915 | |
6916 /* check for valid regname */ | |
6917 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
6918 return NULL; | |
6919 | |
6920 #ifdef FEAT_CLIPBOARD | |
6921 regname = may_get_selection(regname); | |
6922 #endif | |
6923 | |
6924 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
6925 { | |
6926 if (retval == NULL) | |
6927 return NULL; | |
5796 | 6928 if (allocated) |
6929 return getreg_wrap_one_line(retval, flags); | |
6930 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
7 | 6931 } |
6932 | |
6933 get_yank_register(regname, FALSE); | |
6934 if (y_current->y_array == NULL) | |
6935 return NULL; | |
6936 | |
5796 | 6937 if (flags & GREG_LIST) |
6938 { | |
6939 list_T *list = list_alloc(); | |
6940 int error = FALSE; | |
6941 | |
6942 if (list == NULL) | |
6943 return NULL; | |
6944 for (i = 0; i < y_current->y_size; ++i) | |
6945 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
6946 error = TRUE; | |
6947 if (error) | |
6948 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6949 list_free(list); |
5796 | 6950 return NULL; |
6951 } | |
6952 return (char_u *)list; | |
6953 } | |
6954 | |
7 | 6955 /* |
6956 * Compute length of resulting string. | |
6957 */ | |
6958 len = 0; | |
6959 for (i = 0; i < y_current->y_size; ++i) | |
6960 { | |
6961 len += (long)STRLEN(y_current->y_array[i]); | |
6962 /* | |
6963 * Insert a newline between lines and after last line if | |
6964 * y_type is MLINE. | |
6965 */ | |
6966 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6967 ++len; | |
6968 } | |
6969 | |
6970 retval = lalloc(len + 1, TRUE); | |
6971 | |
6972 /* | |
6973 * Copy the lines of the yank register into the string. | |
6974 */ | |
6975 if (retval != NULL) | |
6976 { | |
6977 len = 0; | |
6978 for (i = 0; i < y_current->y_size; ++i) | |
6979 { | |
6980 STRCPY(retval + len, y_current->y_array[i]); | |
6981 len += (long)STRLEN(retval + len); | |
6982 | |
6983 /* | |
6984 * Insert a NL between lines and after the last line if y_type is | |
6985 * MLINE. | |
6986 */ | |
6987 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6988 retval[len++] = '\n'; | |
6989 } | |
6990 retval[len] = NUL; | |
6991 } | |
6992 | |
6993 return retval; | |
6994 } | |
6995 | |
5798 | 6996 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6997 init_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6998 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6999 yankreg_T **old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7000 yankreg_T **old_y_current, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7001 int must_append, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7002 int *yank_type UNUSED) |
5798 | 7003 { |
7004 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
7005 { | |
7006 emsg_invreg(name); | |
7007 return FAIL; | |
7008 } | |
7009 | |
7010 /* Don't want to change the current (unnamed) register */ | |
7011 *old_y_previous = y_previous; | |
7012 *old_y_current = y_current; | |
7013 | |
7014 get_yank_register(name, TRUE); | |
7015 if (!y_append && !must_append) | |
7016 free_yank_all(); | |
7017 return OK; | |
7018 } | |
7019 | |
7020 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7021 finish_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7022 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7023 yankreg_T *old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7024 yankreg_T *old_y_current) |
5798 | 7025 { |
7026 # ifdef FEAT_CLIPBOARD | |
7027 /* Send text of clipboard register to the clipboard. */ | |
7028 may_set_selection(); | |
7029 # endif | |
7030 | |
7031 /* ':let @" = "val"' should change the meaning of the "" register */ | |
7032 if (name != '"') | |
7033 y_previous = old_y_previous; | |
7034 y_current = old_y_current; | |
7035 } | |
7036 | |
7 | 7037 /* |
7038 * Store string "str" in register "name". | |
7039 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
7040 * If "must_append" is TRUE, always append to the register. Otherwise append | |
7041 * if "name" is an uppercase letter. | |
7042 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
7043 * Careful: 'str' is modified, you may have to use a copy! | |
7044 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
7045 */ | |
7046 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7047 write_reg_contents( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7048 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7049 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7050 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7051 int must_append) |
7 | 7052 { |
7053 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
7054 } | |
7055 | |
7056 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7057 write_reg_contents_lst( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7058 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7059 char_u **strings, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7060 int maxlen UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7061 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7062 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7063 long block_len) |
5798 | 7064 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7065 yankreg_T *old_y_previous, *old_y_current; |
5798 | 7066 |
7067 if (name == '/' | |
7068 #ifdef FEAT_EVAL | |
7069 || name == '=' | |
7070 #endif | |
7071 ) | |
7072 { | |
7073 char_u *s; | |
7074 | |
7075 if (strings[0] == NULL) | |
7076 s = (char_u *)""; | |
7077 else if (strings[1] != NULL) | |
7078 { | |
7079 EMSG(_("E883: search pattern and expression register may not " | |
7080 "contain two or more lines")); | |
7081 return; | |
7082 } | |
7083 else | |
7084 s = strings[0]; | |
7085 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
7086 return; | |
7087 } | |
7088 | |
7089 if (name == '_') /* black hole: nothing to do */ | |
7090 return; | |
7091 | |
7092 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
7093 &yank_type) == FAIL) | |
7094 return; | |
7095 | |
7096 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
7097 | |
7098 finish_write_reg(name, old_y_previous, old_y_current); | |
7099 } | |
7100 | |
7101 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7102 write_reg_contents_ex( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7103 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7104 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7105 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7106 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7107 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7108 long block_len) |
7 | 7109 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7110 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
|
7111 long len; |
7 | 7112 |
336 | 7113 if (maxlen >= 0) |
7114 len = maxlen; | |
7115 else | |
7116 len = (long)STRLEN(str); | |
7117 | |
7 | 7118 /* Special case: '/' search pattern */ |
7119 if (name == '/') | |
7120 { | |
7121 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
7122 return; | |
7123 } | |
7124 | |
6557 | 7125 if (name == '#') |
7126 { | |
7127 buf_T *buf; | |
7128 | |
7129 if (VIM_ISDIGIT(*str)) | |
7130 { | |
7131 int num = atoi((char *)str); | |
7132 | |
7133 buf = buflist_findnr(num); | |
7134 if (buf == NULL) | |
7135 EMSGN(_(e_nobufnr), (long)num); | |
7136 } | |
7137 else | |
7138 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
7139 TRUE, FALSE, FALSE)); | |
7140 if (buf == NULL) | |
7141 return; | |
7142 curwin->w_alt_fnum = buf->b_fnum; | |
7143 return; | |
7144 } | |
7145 | |
336 | 7146 #ifdef FEAT_EVAL |
7147 if (name == '=') | |
7148 { | |
7149 char_u *p, *s; | |
7150 | |
7151 p = vim_strnsave(str, (int)len); | |
7152 if (p == NULL) | |
7153 return; | |
7154 if (must_append) | |
7155 { | |
7156 s = concat_str(get_expr_line_src(), p); | |
7157 vim_free(p); | |
7158 p = s; | |
7159 } | |
7160 set_expr_line(p); | |
7161 return; | |
7162 } | |
7163 #endif | |
7164 | |
7 | 7165 if (name == '_') /* black hole: nothing to do */ |
7166 return; | |
7167 | |
5798 | 7168 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
7169 &yank_type) == FAIL) | |
7170 return; | |
7171 | |
7172 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
7173 | |
7174 finish_write_reg(name, old_y_previous, old_y_current); | |
7 | 7175 } |
7176 #endif /* FEAT_EVAL */ | |
7177 | |
7178 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
7179 /* | |
7180 * Put a string into a register. When the register is not empty, the string | |
7181 * is appended. | |
7182 */ | |
7183 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7184 str_to_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7185 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
|
7186 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
|
7187 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
|
7188 long len, /* length of string */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7189 long blocklen, /* width of Visual block */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7190 int str_list) /* TRUE if str is char_u ** */ |
7 | 7191 { |
2896 | 7192 int type; /* MCHAR, MLINE or MBLOCK */ |
7 | 7193 int lnum; |
7194 long start; | |
7195 long i; | |
7196 int extra; | |
7197 int newlines; /* number of lines added */ | |
7198 int extraline = 0; /* extra line at the end */ | |
7199 int append = FALSE; /* append to last line in register */ | |
7200 char_u *s; | |
5798 | 7201 char_u **ss; |
7 | 7202 char_u **pp; |
7203 long maxlen; | |
7204 | |
2000 | 7205 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
7 | 7206 y_ptr->y_size = 0; |
7207 | |
2896 | 7208 if (yank_type == MAUTO) |
5798 | 7209 type = ((str_list || (len > 0 && (str[len - 1] == NL |
7210 || str[len - 1] == CAR))) | |
2896 | 7211 ? MLINE : MCHAR); |
7212 else | |
7213 type = yank_type; | |
7214 | |
7 | 7215 /* |
7216 * Count the number of lines within the string | |
7217 */ | |
7218 newlines = 0; | |
5798 | 7219 if (str_list) |
7220 { | |
7221 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
7 | 7222 ++newlines; |
5798 | 7223 } |
7224 else | |
7225 { | |
7226 for (i = 0; i < len; i++) | |
7227 if (str[i] == '\n') | |
7228 ++newlines; | |
7229 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
7230 { | |
7231 extraline = 1; | |
7232 ++newlines; /* count extra newline at the end */ | |
7233 } | |
7234 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
7235 { | |
7236 append = TRUE; | |
7237 --newlines; /* uncount newline when appending first line */ | |
7238 } | |
7 | 7239 } |
7240 | |
6807 | 7241 /* Without any lines make the register empty. */ |
7242 if (y_ptr->y_size + newlines == 0) | |
7243 { | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
7244 VIM_CLEAR(y_ptr->y_array); |
6807 | 7245 return; |
7246 } | |
7247 | |
7 | 7248 /* |
7249 * Allocate an array to hold the pointers to the new register lines. | |
7250 * If the register was not empty, move the existing lines to the new array. | |
7251 */ | |
7252 pp = (char_u **)lalloc_clear((y_ptr->y_size + newlines) | |
7253 * sizeof(char_u *), TRUE); | |
7254 if (pp == NULL) /* out of memory */ | |
7255 return; | |
7256 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
7257 pp[lnum] = y_ptr->y_array[lnum]; | |
7258 vim_free(y_ptr->y_array); | |
7259 y_ptr->y_array = pp; | |
7260 maxlen = 0; | |
7261 | |
7262 /* | |
7263 * Find the end of each line and save it into the array. | |
7264 */ | |
5798 | 7265 if (str_list) |
7266 { | |
7267 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
7 | 7268 { |
5856 | 7269 i = (long)STRLEN(*ss); |
5798 | 7270 pp[lnum] = vim_strnsave(*ss, i); |
7271 if (i > maxlen) | |
7272 maxlen = i; | |
7 | 7273 } |
5798 | 7274 } |
7275 else | |
7276 { | |
7277 for (start = 0; start < len + extraline; start += i + 1) | |
7 | 7278 { |
5798 | 7279 for (i = start; i < len; ++i) /* find the end of the line */ |
7280 if (str[i] == '\n') | |
7281 break; | |
7282 i -= start; /* i is now length of line */ | |
7283 if (i > maxlen) | |
7284 maxlen = i; | |
7285 if (append) | |
7286 { | |
7287 --lnum; | |
7288 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
7289 } | |
7290 else | |
7291 extra = 0; | |
7292 s = alloc((unsigned)(i + extra + 1)); | |
7293 if (s == NULL) | |
7294 break; | |
7295 if (extra) | |
7296 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
7297 if (append) | |
7298 vim_free(y_ptr->y_array[lnum]); | |
7299 if (i) | |
7300 mch_memmove(s + extra, str + start, (size_t)i); | |
7301 extra += i; | |
7302 s[extra] = NUL; | |
7303 y_ptr->y_array[lnum++] = s; | |
7304 while (--extra >= 0) | |
7305 { | |
7306 if (*s == NUL) | |
7307 *s = '\n'; /* replace NUL with newline */ | |
7308 ++s; | |
7309 } | |
7310 append = FALSE; /* only first line is appended */ | |
7 | 7311 } |
7312 } | |
7313 y_ptr->y_type = type; | |
7314 y_ptr->y_size = lnum; | |
7315 if (type == MBLOCK) | |
7316 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
7317 else | |
7318 y_ptr->y_width = 0; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7319 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7320 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
|
7321 #endif |
7 | 7322 } |
7323 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
7324 | |
7325 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7326 clear_oparg(oparg_T *oap) |
7 | 7327 { |
7328 vim_memset(oap, 0, sizeof(oparg_T)); | |
7329 } | |
7330 | |
7331 /* | |
161 | 7332 * Count the number of bytes, characters and "words" in a line. |
7 | 7333 * |
7334 * "Words" are counted by looking for boundaries between non-space and | |
7335 * space characters. (it seems to produce results that match 'wc'.) | |
7336 * | |
161 | 7337 * Return value is byte count; word count for the line is added to "*wc". |
7338 * Char count is added to "*cc". | |
7 | 7339 * |
7340 * The function will only examine the first "limit" characters in the | |
7341 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
7342 * case, eol_size will be added to the character count to account for | |
7343 * the size of the EOL character. | |
7344 */ | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7345 static varnumber_T |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7346 line_count_info( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7347 char_u *line, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7348 varnumber_T *wc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7349 varnumber_T *cc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7350 varnumber_T limit, |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7351 int eol_size) |
7 | 7352 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7353 varnumber_T i; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7354 varnumber_T words = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7355 varnumber_T chars = 0; |
7 | 7356 int is_word = 0; |
7357 | |
3626 | 7358 for (i = 0; i < limit && line[i] != NUL; ) |
7 | 7359 { |
7360 if (is_word) | |
7361 { | |
7362 if (vim_isspace(line[i])) | |
7363 { | |
7364 words++; | |
7365 is_word = 0; | |
7366 } | |
7367 } | |
7368 else if (!vim_isspace(line[i])) | |
7369 is_word = 1; | |
161 | 7370 ++chars; |
7371 #ifdef FEAT_MBYTE | |
474 | 7372 i += (*mb_ptr2len)(line + i); |
161 | 7373 #else |
7374 ++i; | |
7375 #endif | |
7 | 7376 } |
7377 | |
7378 if (is_word) | |
7379 words++; | |
7380 *wc += words; | |
7381 | |
7382 /* Add eol_size if the end of line was reached before hitting limit. */ | |
2996 | 7383 if (i < limit && line[i] == NUL) |
161 | 7384 { |
7 | 7385 i += eol_size; |
161 | 7386 chars += eol_size; |
7387 } | |
7388 *cc += chars; | |
7 | 7389 return i; |
7390 } | |
7391 | |
7392 /* | |
7393 * Give some info about the position of the cursor (for "g CTRL-G"). | |
7394 * In Visual mode, give some info about the selected region. (In this case, | |
7395 * 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
|
7396 * When "dict" is not NULL store the info there instead of showing it. |
7 | 7397 */ |
7398 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7399 cursor_pos_info(dict_T *dict) |
7 | 7400 { |
7401 char_u *p; | |
274 | 7402 char_u buf1[50]; |
7403 char_u buf2[40]; | |
7 | 7404 linenr_T lnum; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7405 varnumber_T byte_count = 0; |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7406 #ifdef FEAT_MBYTE |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7407 varnumber_T bom_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7408 #endif |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7409 varnumber_T byte_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7410 varnumber_T char_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7411 varnumber_T char_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7412 varnumber_T word_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7413 varnumber_T word_count_cursor = 0; |
7 | 7414 int eol_size; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7415 varnumber_T last_check = 100000L; |
7 | 7416 long line_count_selected = 0; |
7417 pos_T min_pos, max_pos; | |
7418 oparg_T oparg; | |
7419 struct block_def bd; | |
7420 | |
7421 /* | |
7422 * Compute the length of the file in characters. | |
7423 */ | |
7424 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
7425 { | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7426 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7427 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7428 MSG(_(no_lines_msg)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7429 return; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7430 } |
7 | 7431 } |
7432 else | |
7433 { | |
7434 if (get_fileformat(curbuf) == EOL_DOS) | |
7435 eol_size = 2; | |
7436 else | |
7437 eol_size = 1; | |
7438 | |
7439 if (VIsual_active) | |
7440 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
7441 if (LT_POS(VIsual, curwin->w_cursor)) |
7 | 7442 { |
7443 min_pos = VIsual; | |
7444 max_pos = curwin->w_cursor; | |
7445 } | |
7446 else | |
7447 { | |
7448 min_pos = curwin->w_cursor; | |
7449 max_pos = VIsual; | |
7450 } | |
7451 if (*p_sel == 'e' && max_pos.col > 0) | |
7452 --max_pos.col; | |
7453 | |
7454 if (VIsual_mode == Ctrl_V) | |
7455 { | |
1866 | 7456 #ifdef FEAT_LINEBREAK |
7457 char_u * saved_sbr = p_sbr; | |
7458 | |
7459 /* Make 'sbr' empty for a moment to get the correct size. */ | |
7460 p_sbr = empty_option; | |
7461 #endif | |
7 | 7462 oparg.is_VIsual = 1; |
7463 oparg.block_mode = TRUE; | |
7464 oparg.op_type = OP_NOP; | |
7465 getvcols(curwin, &min_pos, &max_pos, | |
688 | 7466 &oparg.start_vcol, &oparg.end_vcol); |
1866 | 7467 #ifdef FEAT_LINEBREAK |
7468 p_sbr = saved_sbr; | |
7469 #endif | |
688 | 7470 if (curwin->w_curswant == MAXCOL) |
7471 oparg.end_vcol = MAXCOL; | |
7 | 7472 /* Swap the start, end vcol if needed */ |
7473 if (oparg.end_vcol < oparg.start_vcol) | |
7474 { | |
7475 oparg.end_vcol += oparg.start_vcol; | |
7476 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
7477 oparg.end_vcol -= oparg.start_vcol; | |
7478 } | |
7479 } | |
7480 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
7481 } | |
7482 | |
7483 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
7484 { | |
7485 /* Check for a CTRL-C every 100000 characters. */ | |
161 | 7486 if (byte_count > last_check) |
7 | 7487 { |
7488 ui_breakcheck(); | |
7489 if (got_int) | |
7490 return; | |
161 | 7491 last_check = byte_count + 100000L; |
7 | 7492 } |
7493 | |
7494 /* Do extra processing for VIsual mode. */ | |
7495 if (VIsual_active | |
7496 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
7497 { | |
45 | 7498 char_u *s = NULL; |
7499 long len = 0L; | |
7500 | |
7 | 7501 switch (VIsual_mode) |
7502 { | |
7503 case Ctrl_V: | |
5735 | 7504 #ifdef FEAT_VIRTUALEDIT |
7 | 7505 virtual_op = virtual_active(); |
5735 | 7506 #endif |
7 | 7507 block_prep(&oparg, &bd, lnum, 0); |
5735 | 7508 #ifdef FEAT_VIRTUALEDIT |
7 | 7509 virtual_op = MAYBE; |
5735 | 7510 #endif |
45 | 7511 s = bd.textstart; |
7512 len = (long)bd.textlen; | |
7 | 7513 break; |
7514 case 'V': | |
45 | 7515 s = ml_get(lnum); |
7516 len = MAXCOL; | |
7 | 7517 break; |
7518 case 'v': | |
7519 { | |
7520 colnr_T start_col = (lnum == min_pos.lnum) | |
7521 ? min_pos.col : 0; | |
7522 colnr_T end_col = (lnum == max_pos.lnum) | |
7523 ? max_pos.col - start_col + 1 : MAXCOL; | |
7524 | |
45 | 7525 s = ml_get(lnum) + start_col; |
7526 len = end_col; | |
7 | 7527 } |
7528 break; | |
7529 } | |
45 | 7530 if (s != NULL) |
7531 { | |
161 | 7532 byte_count_cursor += line_count_info(s, &word_count_cursor, |
7533 &char_count_cursor, len, eol_size); | |
45 | 7534 if (lnum == curbuf->b_ml.ml_line_count |
7535 && !curbuf->b_p_eol | |
6933 | 7536 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
50 | 7537 && (long)STRLEN(s) < len) |
161 | 7538 byte_count_cursor -= eol_size; |
45 | 7539 } |
7 | 7540 } |
7541 else | |
7542 { | |
7543 /* In non-visual mode, check for the line the cursor is on */ | |
7544 if (lnum == curwin->w_cursor.lnum) | |
7545 { | |
7546 word_count_cursor += word_count; | |
161 | 7547 char_count_cursor += char_count; |
7548 byte_count_cursor = byte_count + | |
7549 line_count_info(ml_get(lnum), | |
7550 &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
|
7551 (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
|
7552 eol_size); |
7 | 7553 } |
7554 } | |
7555 /* Add to the running totals */ | |
161 | 7556 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
|
7557 &char_count, (varnumber_T)MAXCOL, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7558 eol_size); |
7 | 7559 } |
7560 | |
7561 /* Correction for when last line doesn't have an EOL. */ | |
6933 | 7562 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
161 | 7563 byte_count -= eol_size; |
7 | 7564 |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7565 if (dict == NULL) |
7 | 7566 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7567 if (VIsual_active) |
7 | 7568 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7569 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
|
7570 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7571 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
|
7572 &max_pos.col); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7573 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
|
7574 (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
|
7575 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7576 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7577 buf1[0] = NUL; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7578 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7579 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
|
7580 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7581 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7582 _("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
|
7583 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7584 (long)curbuf->b_ml.ml_line_count, |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7585 (long long)word_count_cursor, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7586 (long long)word_count, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7587 (long long)byte_count_cursor, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7588 (long long)byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7589 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7590 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7591 _("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
|
7592 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7593 (long)curbuf->b_ml.ml_line_count, |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7594 (long long)word_count_cursor, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7595 (long long)word_count, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7596 (long long)char_count_cursor, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7597 (long long)char_count, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7598 (long long)byte_count_cursor, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7599 (long long)byte_count); |
7 | 7600 } |
7601 else | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7602 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7603 p = ml_get_curline(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7604 validate_virtcol(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7605 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
|
7606 (int)curwin->w_virtcol + 1); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7607 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
|
7608 linetabsize(p)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7609 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7610 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
|
7611 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7612 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7613 _("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
|
7614 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7615 (long)curwin->w_cursor.lnum, |
7 | 7616 (long)curbuf->b_ml.ml_line_count, |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7617 (long long)word_count_cursor, (long long)word_count, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7618 (long long)byte_count_cursor, (long long)byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7619 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7620 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7621 _("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
|
7622 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7623 (long)curwin->w_cursor.lnum, |
161 | 7624 (long)curbuf->b_ml.ml_line_count, |
13610
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7625 (long long)word_count_cursor, (long long)word_count, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7626 (long long)char_count_cursor, (long long)char_count, |
e76499e85744
patch 8.0.1677: no compiler warning for wrong format in vim_snprintf()
Christian Brabandt <cb@256bit.org>
parents:
13425
diff
changeset
|
7627 (long long)byte_count_cursor, (long long)byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7628 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7629 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7630 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7631 #ifdef FEAT_MBYTE |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7632 bom_count = bomb_size(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7633 if (bom_count > 0) |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7634 vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE, |
13614
87e5629fc915
patch 8.0.1679: compiler warning for printf format
Christian Brabandt <cb@256bit.org>
parents:
13610
diff
changeset
|
7635 _("(+%lld for BOM)"), (long long)bom_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7636 #endif |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7637 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7638 { |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7639 /* 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
|
7640 p = p_shm; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7641 p_shm = (char_u *)""; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7642 msg(IObuff); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7643 p_shm = p; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7644 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7645 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7646 #if defined(FEAT_EVAL) |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7647 if (dict != NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7648 { |
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7649 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
|
7650 dict_add_number(dict, "chars", char_count); |
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7651 dict_add_number(dict, "bytes", byte_count |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7652 # ifdef FEAT_MBYTE |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7653 + bom_count |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7654 # endif |
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7655 ); |
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7656 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
|
7657 byte_count_cursor); |
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7658 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
|
7659 char_count_cursor); |
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7660 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
|
7661 word_count_cursor); |
7 | 7662 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7663 #endif |
7 | 7664 } |