Mercurial > vim
annotate src/ops.c @ 15422:b55b89692fd2 v8.1.0719
patch 8.1.0719: too many #ifdefs
commit https://github.com/vim/vim/commit/870ba5f6dce974b6c1c47bf9d3b20db805d10b36
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Jan 11 14:37:20 2019 +0100
patch 8.1.0719: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Always build with the +visualextra feature.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 11 Jan 2019 14:45:06 +0100 |
parents | fe428bee74b3 |
children | eae582bfb293 |
rev | line source |
---|---|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9834
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
7 | 2 * |
3 * VIM - Vi IMproved by Bram Moolenaar | |
4 * | |
5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
6 * Do ":help credits" in Vim to see a list of people who contributed. | |
7 * See README.txt for an overview of the Vim source code. | |
8 */ | |
9 | |
10 /* | |
11 * ops.c: implementation of various operators: op_shift, op_delete, op_tilde, | |
12 * op_change, op_yank, do_put, do_join | |
13 */ | |
14 | |
15 #include "vim.h" | |
16 | |
17 /* | |
18 * Number of registers. | |
19 * 0 = unnamed register, for normal yanks and puts | |
20 * 1..9 = registers '1' to '9', for deletes | |
21 * 10..35 = registers 'a' to 'z' | |
22 * 36 = delete register '-' | |
23 * 37 = Selection register '*'. Only if FEAT_CLIPBOARD defined | |
24 * 38 = Clipboard register '+'. Only if FEAT_CLIPBOARD and FEAT_X11 defined | |
25 */ | |
26 /* | |
27 * Symbolic names for some registers. | |
28 */ | |
29 #define DELETION_REGISTER 36 | |
30 #ifdef FEAT_CLIPBOARD | |
31 # define STAR_REGISTER 37 | |
32 # ifdef FEAT_X11 | |
33 # define PLUS_REGISTER 38 | |
34 # else | |
35 # define PLUS_REGISTER STAR_REGISTER /* there is only one */ | |
36 # endif | |
37 #endif | |
38 #ifdef FEAT_DND | |
39 # define TILDE_REGISTER (PLUS_REGISTER + 1) | |
40 #endif | |
41 | |
42 #ifdef FEAT_CLIPBOARD | |
43 # ifdef FEAT_DND | |
44 # define NUM_REGISTERS (TILDE_REGISTER + 1) | |
45 # else | |
46 # define NUM_REGISTERS (PLUS_REGISTER + 1) | |
47 # endif | |
48 #else | |
49 # define NUM_REGISTERS 37 | |
50 #endif | |
51 | |
52 /* | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
53 * Each yank register has an array of pointers to lines. |
7 | 54 */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
55 typedef struct |
7 | 56 { |
57 char_u **y_array; /* pointer to array of line pointers */ | |
58 linenr_T y_size; /* number of lines in y_array */ | |
59 char_u y_type; /* MLINE, MCHAR or MBLOCK */ | |
60 colnr_T y_width; /* only set if y_type == MBLOCK */ | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
61 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
62 time_t y_time_set; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
63 #endif |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
64 } yankreg_T; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
65 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
66 static yankreg_T y_regs[NUM_REGISTERS]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
67 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
68 static yankreg_T *y_current; /* ptr to current yankreg */ |
7 | 69 static int y_append; /* TRUE when appending */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
70 static yankreg_T *y_previous = NULL; /* ptr to last written yankreg */ |
7 | 71 |
72 /* | |
73 * structure used by block_prep, op_delete and op_yank for blockwise operators | |
74 * also op_change, op_shift, op_insert, op_replace - AKelly | |
75 */ | |
76 struct block_def | |
77 { | |
1839 | 78 int startspaces; /* 'extra' cols before first char */ |
79 int endspaces; /* 'extra' cols after last char */ | |
7 | 80 int textlen; /* chars in block */ |
1839 | 81 char_u *textstart; /* pointer to 1st char (partially) in block */ |
82 colnr_T textcol; /* index of chars (partially) in block */ | |
7 | 83 colnr_T start_vcol; /* start col of 1st char wholly inside block */ |
84 colnr_T end_vcol; /* start col of 1st char wholly after block */ | |
85 int is_short; /* TRUE if line is too short to fit in block */ | |
86 int is_MAX; /* TRUE if curswant==MAXCOL when starting */ | |
87 int is_oneChar; /* TRUE if block within one character */ | |
88 int pre_whitesp; /* screen cols of ws before block */ | |
89 int pre_whitesp_c; /* chars of ws before block */ | |
90 colnr_T end_char_vcols; /* number of vcols of post-block char */ | |
91 colnr_T start_char_vcols; /* number of vcols of pre-block char */ | |
92 }; | |
93 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
94 static void shift_block(oparg_T *oap, int amount); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
95 static int stuff_yank(int, char_u *); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
96 static void put_reedit_in_typebuf(int silent); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
97 static int put_in_typebuf(char_u *s, int esc, int colon, |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
98 int silent); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
99 static void stuffescaped(char_u *arg, int literally); |
7 | 100 #ifdef FEAT_MBYTE |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
101 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
|
102 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
103 static void free_yank_all(void); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
104 static int yank_copy_line(struct block_def *bd, long y_idx); |
7 | 105 #ifdef FEAT_CLIPBOARD |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
106 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
|
107 static void may_set_selection(void); |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
108 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
109 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
|
110 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
|
111 static int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1); |
7 | 112 #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
|
113 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
|
114 #endif |
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
115 static int ends_in_white(linenr_T lnum); |
7 | 116 #ifdef FEAT_COMMENTS |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
117 static int fmt_check_par(linenr_T, int *, char_u **, int do_comments); |
7 | 118 #else |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
119 static int fmt_check_par(linenr_T); |
7 | 120 #endif |
121 | |
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
|
122 // 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
|
123 #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
|
124 #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
|
125 |
7 | 126 /* |
127 * The names of operators. | |
128 * 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
|
129 * The third field holds OPF_ flags. |
7 | 130 */ |
131 static char opchars[][3] = | |
132 { | |
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 {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
|
134 {'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
|
135 {'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
|
136 {'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
|
137 {'<', 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
|
138 {'>', 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
|
139 {'!', 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
|
140 {'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
|
141 {'=', 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
|
142 {'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
|
143 {':', 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
|
144 {'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
|
145 {'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
|
146 {'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
|
147 {'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
|
148 {'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
|
149 {'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
|
150 {'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
|
151 {'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
|
152 {'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
|
153 {'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
|
154 {'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
|
155 {'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
|
156 {'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
|
157 {'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
|
158 {'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
|
159 {'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
|
160 {'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
|
161 {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
|
162 {Ctrl_X, NUL, OPF_CHANGE}, // OP_NR_SUB |
7 | 163 }; |
164 | |
165 /* | |
166 * Translate a command name into an operator type. | |
167 * Must only be called with a valid operator name! | |
168 */ | |
169 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
170 get_op_type(int char1, int char2) |
7 | 171 { |
172 int i; | |
173 | |
174 if (char1 == 'r') /* ignore second character */ | |
175 return OP_REPLACE; | |
176 if (char1 == '~') /* when tilde is an operator */ | |
177 return OP_TILDE; | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
178 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
|
179 return OP_NR_ADD; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
180 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
|
181 return OP_NR_SUB; |
7 | 182 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
|
183 { |
7 | 184 if (opchars[i][0] == char1 && opchars[i][1] == char2) |
185 break; | |
13072
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
186 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
|
187 { |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
188 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
|
189 break; |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
190 } |
50aa6da392ce
patch 8.0.1411: reading invalid memory with CTRL-W :
Christian Brabandt <cb@256bit.org>
parents:
13047
diff
changeset
|
191 } |
7 | 192 return i; |
193 } | |
194 | |
195 /* | |
196 * Return TRUE if operator "op" always works on whole lines. | |
197 */ | |
198 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
199 op_on_lines(int op) |
7 | 200 { |
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
|
201 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
|
202 } |
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
203 |
dc67449d648c
patch 8.1.0027: difficult to make a plugin that feeds a line to a job
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
204 /* |
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 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
|
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 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
|
208 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
|
209 { |
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 return opchars[op][2] & OPF_CHANGE; |
7 | 211 } |
212 | |
213 /* | |
214 * Get first operator command character. | |
215 * Returns 'g' or 'z' if there is another command character. | |
216 */ | |
217 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
218 get_op_char(int optype) |
7 | 219 { |
220 return opchars[optype][0]; | |
221 } | |
222 | |
223 /* | |
224 * Get second operator command character. | |
225 */ | |
226 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
227 get_extra_op_char(int optype) |
7 | 228 { |
229 return opchars[optype][1]; | |
230 } | |
231 | |
232 /* | |
233 * op_shift - handle a shift operation | |
234 */ | |
235 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
236 op_shift(oparg_T *oap, int curs_top, int amount) |
7 | 237 { |
238 long i; | |
239 int first_char; | |
240 int block_col = 0; | |
241 | |
242 if (u_save((linenr_T)(oap->start.lnum - 1), | |
243 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
244 return; | |
245 | |
246 if (oap->block_mode) | |
247 block_col = curwin->w_cursor.col; | |
248 | |
249 for (i = oap->line_count; --i >= 0; ) | |
250 { | |
251 first_char = *ml_get_curline(); | |
252 if (first_char == NUL) /* empty line */ | |
253 curwin->w_cursor.col = 0; | |
254 else if (oap->block_mode) | |
255 shift_block(oap, amount); | |
256 else | |
257 /* Move the line right if it doesn't start with '#', 'smartindent' | |
258 * isn't set or 'cindent' isn't set or '#' isn't in 'cino'. */ | |
259 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
260 if (first_char != '#' || !preprocs_left()) | |
261 #endif | |
262 { | |
1516 | 263 shift_line(oap->op_type == OP_LSHIFT, p_sr, amount, FALSE); |
7 | 264 } |
265 ++curwin->w_cursor.lnum; | |
266 } | |
267 | |
268 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
269 if (oap->block_mode) | |
270 { | |
271 curwin->w_cursor.lnum = oap->start.lnum; | |
272 curwin->w_cursor.col = block_col; | |
273 } | |
5735 | 274 else if (curs_top) /* put cursor on first line, for ">>" */ |
7 | 275 { |
276 curwin->w_cursor.lnum = oap->start.lnum; | |
277 beginline(BL_SOL | BL_FIX); /* shift_line() may have set cursor.col */ | |
278 } | |
279 else | |
280 --curwin->w_cursor.lnum; /* put cursor on last line, for ":>" */ | |
281 | |
10486
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
282 #ifdef FEAT_FOLDING |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
283 /* 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
|
284 foldOpenCursor(); |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
285 #endif |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
286 |
99896ee0cac5
commit https://github.com/vim/vim/commit/54b2bfa399017ebae76ed62f21578261d1b55c1f
Christian Brabandt <cb@256bit.org>
parents:
10104
diff
changeset
|
287 |
7 | 288 if (oap->line_count > p_report) |
289 { | |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
290 char *op; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
291 char *msg_line_single; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
292 char *msg_line_plural; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
293 |
7 | 294 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
|
295 op = ">"; |
7 | 296 else |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
297 op = "<"; |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
298 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
|
299 "%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
|
300 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
|
301 "%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
|
302 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
|
303 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
|
304 oap->line_count, op, amount); |
7 | 305 msg(IObuff); |
306 } | |
307 | |
308 /* | |
309 * Set "'[" and "']" marks. | |
310 */ | |
311 curbuf->b_op_start = oap->start; | |
312 curbuf->b_op_end.lnum = oap->end.lnum; | |
313 curbuf->b_op_end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
314 if (curbuf->b_op_end.col > 0) | |
315 --curbuf->b_op_end.col; | |
316 } | |
317 | |
318 /* | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
319 * Shift the current line one shiftwidth left (if left != 0) or right |
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
320 * leaves cursor on first blank in the line. |
7 | 321 */ |
322 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
323 shift_line( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
324 int left, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
325 int round, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
326 int amount, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
327 int call_changed_bytes) /* call changed_bytes() */ |
7 | 328 { |
329 int count; | |
330 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
|
331 int p_sw = (int)get_sw_value_indent(curbuf); |
7 | 332 |
333 count = get_indent(); /* get current indent */ | |
334 | |
335 if (round) /* round off indent */ | |
336 { | |
337 i = count / p_sw; /* number of p_sw rounded down */ | |
338 j = count % p_sw; /* extra spaces */ | |
339 if (j && left) /* first remove extra spaces */ | |
340 --amount; | |
341 if (left) | |
342 { | |
343 i -= amount; | |
344 if (i < 0) | |
345 i = 0; | |
346 } | |
347 else | |
348 i += amount; | |
349 count = i * p_sw; | |
350 } | |
351 else /* original vi indent */ | |
352 { | |
353 if (left) | |
354 { | |
355 count -= p_sw * amount; | |
356 if (count < 0) | |
357 count = 0; | |
358 } | |
359 else | |
360 count += p_sw * amount; | |
361 } | |
362 | |
363 /* Set new indent */ | |
364 if (State & VREPLACE_FLAG) | |
1516 | 365 change_indent(INDENT_SET, count, FALSE, NUL, call_changed_bytes); |
7 | 366 else |
1516 | 367 (void)set_indent(count, call_changed_bytes ? SIN_CHANGED : 0); |
7 | 368 } |
369 | |
370 /* | |
371 * Shift one line of the current block one shiftwidth right or left. | |
372 * Leaves cursor on first character in block. | |
373 */ | |
374 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
375 shift_block(oparg_T *oap, int amount) |
7 | 376 { |
377 int left = (oap->op_type == OP_LSHIFT); | |
378 int oldstate = State; | |
1839 | 379 int total; |
380 char_u *newp, *oldp; | |
7 | 381 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
|
382 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
|
383 #ifdef FEAT_VARTABS |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
384 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
|
385 #endif |
7 | 386 int p_ts = (int)curbuf->b_p_ts; |
387 struct block_def bd; | |
388 int incr; | |
1839 | 389 colnr_T ws_vcol; |
7 | 390 int i = 0, j = 0; |
391 int len; | |
392 #ifdef FEAT_RIGHTLEFT | |
393 int old_p_ri = p_ri; | |
394 | |
4352 | 395 p_ri = 0; /* don't want revins in indent */ |
7 | 396 #endif |
397 | |
398 State = INSERT; /* don't want REPLACE for State */ | |
399 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); | |
400 if (bd.is_short) | |
401 return; | |
402 | |
403 /* 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
|
404 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
|
405 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
|
406 return; /* multiplication overflow */ |
66b677c77467
patch 8.0.0879: crash when shifting with huge number
Christian Brabandt <cb@256bit.org>
parents:
11688
diff
changeset
|
407 |
7 | 408 oldp = ml_get_curline(); |
409 | |
410 if (!left) | |
411 { | |
412 /* | |
413 * 1. Get start vcol | |
414 * 2. Total ws vcols | |
415 * 3. Divvy into TABs & spp | |
416 * 4. Construct new string | |
417 */ | |
418 total += bd.pre_whitesp; /* all virtual WS upto & incl a split TAB */ | |
419 ws_vcol = bd.start_vcol - bd.pre_whitesp; | |
420 if (bd.startspaces) | |
421 { | |
422 #ifdef FEAT_MBYTE | |
423 if (has_mbyte) | |
8399
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
424 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
425 if ((*mb_ptr2len)(bd.textstart) == 1) |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
426 ++bd.textstart; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
427 else |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
428 { |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
429 ws_vcol = 0; |
7d1c42e3ce11
commit https://github.com/vim/vim/commit/20b4f463f4ab50fa9bcc9838aa94101fa5698125
Christian Brabandt <cb@256bit.org>
parents:
7829
diff
changeset
|
430 bd.startspaces = 0; |
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 } |
1995 | 433 else |
434 #endif | |
435 ++bd.textstart; | |
7 | 436 } |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
437 for ( ; VIM_ISWHITE(*bd.textstart); ) |
7 | 438 { |
5995 | 439 /* TODO: is passing bd.textstart for start of the line OK? */ |
440 incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart, | |
441 (colnr_T)(bd.start_vcol)); | |
7 | 442 total += incr; |
443 bd.start_vcol += incr; | |
444 } | |
445 /* OK, now total=all the VWS reqd, and textstart points at the 1st | |
446 * 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
|
447 #ifdef FEAT_VARTABS |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
448 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
|
449 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
|
450 else |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
451 j = total; |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
452 #else |
7 | 453 if (!curbuf->b_p_et) |
454 i = ((ws_vcol % p_ts) + total) / p_ts; /* number of tabs */ | |
455 if (i) | |
456 j = ((ws_vcol % p_ts) + total) % p_ts; /* number of spp */ | |
457 else | |
458 j = total; | |
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
459 #endif |
7 | 460 /* if we're splitting a TAB, allow for it */ |
461 bd.textcol -= bd.pre_whitesp_c - (bd.startspaces != 0); | |
462 len = (int)STRLEN(bd.textstart) + 1; | |
463 newp = alloc_check((unsigned)(bd.textcol + i + j + len)); | |
464 if (newp == NULL) | |
465 return; | |
466 vim_memset(newp, NUL, (size_t)(bd.textcol + i + j + len)); | |
467 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
6929 | 468 vim_memset(newp + bd.textcol, TAB, (size_t)i); |
469 vim_memset(newp + bd.textcol + i, ' ', (size_t)j); | |
7 | 470 /* the end */ |
471 mch_memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len); | |
472 } | |
473 else /* left */ | |
474 { | |
1839 | 475 colnr_T destination_col; /* column to which text in block will |
476 be shifted */ | |
477 char_u *verbatim_copy_end; /* end of the part of the line which is | |
478 copied verbatim */ | |
479 colnr_T verbatim_copy_width;/* the (displayed) width of this part | |
480 of line */ | |
481 unsigned fill; /* nr of spaces that replace a TAB */ | |
482 unsigned new_line_len; /* the length of the line after the | |
483 block shift */ | |
484 size_t block_space_width; | |
485 size_t shift_amount; | |
486 char_u *non_white = bd.textstart; | |
487 colnr_T non_white_col; | |
488 | |
489 /* | |
490 * Firstly, let's find the first non-whitespace character that is | |
491 * displayed after the block's start column and the character's column | |
492 * number. Also, let's calculate the width of all the whitespace | |
493 * characters that are displayed in the block and precede the searched | |
494 * non-whitespace character. | |
495 */ | |
496 | |
497 /* If "bd.startspaces" is set, "bd.textstart" points to the character, | |
498 * the part of which is displayed at the block's beginning. Let's start | |
499 * searching from the next character. */ | |
500 if (bd.startspaces) | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
501 MB_PTR_ADV(non_white); |
1839 | 502 |
503 /* The character's column is in "bd.start_vcol". */ | |
504 non_white_col = bd.start_vcol; | |
505 | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
506 while (VIM_ISWHITE(*non_white)) |
7 | 507 { |
5995 | 508 incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col); |
1839 | 509 non_white_col += incr; |
7 | 510 } |
1839 | 511 |
512 block_space_width = non_white_col - oap->start_vcol; | |
513 /* We will shift by "total" or "block_space_width", whichever is less. | |
514 */ | |
1860 | 515 shift_amount = (block_space_width < (size_t)total |
516 ? block_space_width : (size_t)total); | |
1839 | 517 |
518 /* The column to which we will shift the text. */ | |
1860 | 519 destination_col = (colnr_T)(non_white_col - shift_amount); |
1839 | 520 |
521 /* Now let's find out how much of the beginning of the line we can | |
522 * reuse without modification. */ | |
523 verbatim_copy_end = bd.textstart; | |
524 verbatim_copy_width = bd.start_vcol; | |
525 | |
526 /* If "bd.startspaces" is set, "bd.textstart" points to the character | |
527 * preceding the block. We have to subtract its width to obtain its | |
528 * column number. */ | |
529 if (bd.startspaces) | |
530 verbatim_copy_width -= bd.start_char_vcols; | |
531 while (verbatim_copy_width < destination_col) | |
7 | 532 { |
5995 | 533 char_u *line = verbatim_copy_end; |
534 | |
535 /* TODO: is passing verbatim_copy_end for start of the line OK? */ | |
536 incr = lbr_chartabsize(line, verbatim_copy_end, | |
537 verbatim_copy_width); | |
1839 | 538 if (verbatim_copy_width + incr > destination_col) |
539 break; | |
540 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
|
541 MB_PTR_ADV(verbatim_copy_end); |
7 | 542 } |
543 | |
1839 | 544 /* If "destination_col" is different from the width of the initial |
545 * part of the line that will be copied, it means we encountered a tab | |
546 * character, which we will have to partly replace with spaces. */ | |
547 fill = destination_col - verbatim_copy_width; | |
548 | |
549 /* The replacement line will consist of: | |
550 * - the beginning of the original line up to "verbatim_copy_end", | |
551 * - "fill" number of spaces, | |
552 * - the rest of the line, pointed to by non_white. */ | |
553 new_line_len = (unsigned)(verbatim_copy_end - oldp) | |
554 + fill | |
555 + (unsigned)STRLEN(non_white) + 1; | |
556 | |
557 newp = alloc_check(new_line_len); | |
7 | 558 if (newp == NULL) |
559 return; | |
1839 | 560 mch_memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp)); |
6929 | 561 vim_memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill); |
1839 | 562 STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white); |
7 | 563 } |
564 /* replace the line */ | |
565 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
566 changed_bytes(curwin->w_cursor.lnum, (colnr_T)bd.textcol); | |
567 State = oldstate; | |
568 curwin->w_cursor.col = oldcol; | |
569 #ifdef FEAT_RIGHTLEFT | |
570 p_ri = old_p_ri; | |
571 #endif | |
572 } | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
573 |
7 | 574 /* |
575 * Insert string "s" (b_insert ? before : after) block :AKelly | |
576 * Caller must prepare for undo. | |
577 */ | |
578 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
579 block_insert( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
580 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
581 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
582 int b_insert, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
583 struct block_def *bdp) |
7 | 584 { |
585 int p_ts; | |
586 int count = 0; /* extra spaces to replace a cut TAB */ | |
587 int spaces = 0; /* non-zero if cutting a TAB */ | |
588 colnr_T offset; /* pointer along new line */ | |
589 unsigned s_len; /* STRLEN(s) */ | |
590 char_u *newp, *oldp; /* new, old lines */ | |
591 linenr_T lnum; /* loop var */ | |
592 int oldstate = State; | |
593 | |
594 State = INSERT; /* don't want REPLACE for State */ | |
595 s_len = (unsigned)STRLEN(s); | |
596 | |
597 for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) | |
598 { | |
599 block_prep(oap, bdp, lnum, TRUE); | |
600 if (bdp->is_short && b_insert) | |
601 continue; /* OP_INSERT, line ends before block start */ | |
602 | |
603 oldp = ml_get(lnum); | |
604 | |
605 if (b_insert) | |
606 { | |
607 p_ts = bdp->start_char_vcols; | |
608 spaces = bdp->startspaces; | |
609 if (spaces != 0) | |
610 count = p_ts - 1; /* we're cutting a TAB */ | |
611 offset = bdp->textcol; | |
612 } | |
613 else /* append */ | |
614 { | |
615 p_ts = bdp->end_char_vcols; | |
616 if (!bdp->is_short) /* spaces = padding after block */ | |
617 { | |
618 spaces = (bdp->endspaces ? p_ts - bdp->endspaces : 0); | |
619 if (spaces != 0) | |
620 count = p_ts - 1; /* we're cutting a TAB */ | |
621 offset = bdp->textcol + bdp->textlen - (spaces != 0); | |
622 } | |
623 else /* spaces = padding to block edge */ | |
624 { | |
625 /* if $ used, just append to EOL (ie spaces==0) */ | |
626 if (!bdp->is_MAX) | |
627 spaces = (oap->end_vcol - bdp->end_vcol) + 1; | |
628 count = spaces; | |
629 offset = bdp->textcol + bdp->textlen; | |
630 } | |
631 } | |
632 | |
6140 | 633 #ifdef FEAT_MBYTE |
634 if (has_mbyte && spaces > 0) | |
635 { | |
6460 | 636 int off; |
637 | |
6140 | 638 /* Avoid starting halfway a multi-byte character. */ |
639 if (b_insert) | |
640 { | |
6460 | 641 off = (*mb_head_off)(oldp, oldp + offset + spaces); |
6140 | 642 } |
643 else | |
644 { | |
6460 | 645 off = (*mb_off_next)(oldp, oldp + offset); |
6140 | 646 offset += off; |
647 } | |
6460 | 648 spaces -= off; |
649 count -= off; | |
6140 | 650 } |
651 #endif | |
652 | |
7 | 653 newp = alloc_check((unsigned)(STRLEN(oldp)) + s_len + count + 1); |
654 if (newp == NULL) | |
655 continue; | |
656 | |
657 /* copy up to shifted part */ | |
658 mch_memmove(newp, oldp, (size_t)(offset)); | |
659 oldp += offset; | |
660 | |
661 /* insert pre-padding */ | |
6929 | 662 vim_memset(newp + offset, ' ', (size_t)spaces); |
7 | 663 |
664 /* copy the new text */ | |
665 mch_memmove(newp + offset + spaces, s, (size_t)s_len); | |
666 offset += s_len; | |
667 | |
668 if (spaces && !bdp->is_short) | |
669 { | |
670 /* insert post-padding */ | |
6929 | 671 vim_memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces)); |
7 | 672 /* We're splitting a TAB, don't copy it. */ |
673 oldp++; | |
674 /* We allowed for that TAB, remember this now */ | |
675 count++; | |
676 } | |
677 | |
678 if (spaces > 0) | |
679 offset += count; | |
1622 | 680 STRMOVE(newp + offset, oldp); |
7 | 681 |
682 ml_replace(lnum, newp, FALSE); | |
683 | |
684 if (lnum == oap->end.lnum) | |
685 { | |
686 /* Set "']" mark to the end of the block instead of the end of | |
687 * the insert in the first line. */ | |
688 curbuf->b_op_end.lnum = oap->end.lnum; | |
689 curbuf->b_op_end.col = offset; | |
690 } | |
691 } /* for all lnum */ | |
692 | |
693 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
694 | |
695 State = oldstate; | |
696 } | |
697 | |
698 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(PROTO) | |
699 /* | |
700 * op_reindent - handle reindenting a block of lines. | |
701 */ | |
702 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
703 op_reindent(oparg_T *oap, int (*how)(void)) |
7 | 704 { |
705 long i; | |
706 char_u *l; | |
6971 | 707 int amount; |
7 | 708 linenr_T first_changed = 0; |
709 linenr_T last_changed = 0; | |
710 linenr_T start_lnum = curwin->w_cursor.lnum; | |
711 | |
216 | 712 /* Don't even try when 'modifiable' is off. */ |
713 if (!curbuf->b_p_ma) | |
714 { | |
715 EMSG(_(e_modifiable)); | |
716 return; | |
717 } | |
718 | |
7 | 719 for (i = oap->line_count; --i >= 0 && !got_int; ) |
720 { | |
721 /* it's a slow thing to do, so give feedback so there's no worry that | |
722 * the computer's just hung. */ | |
723 | |
724 if (i > 1 | |
725 && (i % 50 == 0 || i == oap->line_count - 1) | |
726 && oap->line_count > p_report) | |
727 smsg((char_u *)_("%ld lines to indent... "), i); | |
728 | |
729 /* | |
730 * Be vi-compatible: For lisp indenting the first line is not | |
731 * indented, unless there is only one line. | |
732 */ | |
733 #ifdef FEAT_LISP | |
734 if (i != oap->line_count - 1 || oap->line_count == 1 | |
735 || how != get_lisp_indent) | |
736 #endif | |
737 { | |
738 l = skipwhite(ml_get_curline()); | |
739 if (*l == NUL) /* empty or blank line */ | |
6971 | 740 amount = 0; |
7 | 741 else |
6971 | 742 amount = how(); /* get the indent for this line */ |
743 | |
744 if (amount >= 0 && set_indent(amount, SIN_UNDO)) | |
7 | 745 { |
746 /* did change the indent, call changed_lines() later */ | |
747 if (first_changed == 0) | |
748 first_changed = curwin->w_cursor.lnum; | |
749 last_changed = curwin->w_cursor.lnum; | |
750 } | |
751 } | |
752 ++curwin->w_cursor.lnum; | |
1550 | 753 curwin->w_cursor.col = 0; /* make sure it's valid */ |
7 | 754 } |
755 | |
756 /* put cursor on first non-blank of indented line */ | |
757 curwin->w_cursor.lnum = start_lnum; | |
758 beginline(BL_SOL | BL_FIX); | |
759 | |
760 /* Mark changed lines so that they will be redrawn. When Visual | |
761 * highlighting was present, need to continue until the last line. When | |
762 * there is no change still need to remove the Visual highlighting. */ | |
763 if (last_changed != 0) | |
764 changed_lines(first_changed, 0, | |
765 oap->is_VIsual ? start_lnum + oap->line_count : | |
766 last_changed + 1, 0L); | |
767 else if (oap->is_VIsual) | |
768 redraw_curbuf_later(INVERTED); | |
769 | |
770 if (oap->line_count > p_report) | |
771 { | |
772 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
|
773 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
|
774 "%ld lines indented ", i), i); |
7 | 775 } |
776 /* set '[ and '] marks */ | |
777 curbuf->b_op_start = oap->start; | |
778 curbuf->b_op_end = oap->end; | |
779 } | |
780 #endif /* defined(FEAT_LISP) || defined(FEAT_CINDENT) */ | |
781 | |
782 #if defined(FEAT_EVAL) || defined(PROTO) | |
783 /* | |
784 * Keep the last expression line here, for repeating. | |
785 */ | |
786 static char_u *expr_line = NULL; | |
787 | |
788 /* | |
789 * Get an expression for the "\"=expr1" or "CTRL-R =expr1" | |
790 * Returns '=' when OK, NUL otherwise. | |
791 */ | |
792 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
793 get_expr_register(void) |
7 | 794 { |
795 char_u *new_line; | |
796 | |
797 new_line = getcmdline('=', 0L, 0); | |
798 if (new_line == NULL) | |
799 return NUL; | |
800 if (*new_line == NUL) /* use previous line */ | |
801 vim_free(new_line); | |
802 else | |
803 set_expr_line(new_line); | |
804 return '='; | |
805 } | |
806 | |
807 /* | |
808 * Set the expression for the '=' register. | |
809 * Argument must be an allocated string. | |
810 */ | |
811 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
812 set_expr_line(char_u *new_line) |
7 | 813 { |
814 vim_free(expr_line); | |
815 expr_line = new_line; | |
816 } | |
817 | |
818 /* | |
819 * Get the result of the '=' register expression. | |
820 * Returns a pointer to allocated memory, or NULL for failure. | |
821 */ | |
822 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
823 get_expr_line(void) |
7 | 824 { |
825 char_u *expr_copy; | |
826 char_u *rv; | |
994 | 827 static int nested = 0; |
7 | 828 |
829 if (expr_line == NULL) | |
830 return NULL; | |
831 | |
832 /* Make a copy of the expression, because evaluating it may cause it to be | |
833 * changed. */ | |
834 expr_copy = vim_strsave(expr_line); | |
835 if (expr_copy == NULL) | |
836 return NULL; | |
837 | |
994 | 838 /* When we are invoked recursively limit the evaluation to 10 levels. |
839 * Then return the string as-is. */ | |
840 if (nested >= 10) | |
841 return expr_copy; | |
842 | |
843 ++nested; | |
714 | 844 rv = eval_to_string(expr_copy, NULL, TRUE); |
994 | 845 --nested; |
7 | 846 vim_free(expr_copy); |
847 return rv; | |
848 } | |
283 | 849 |
850 /* | |
851 * Get the '=' register expression itself, without evaluating it. | |
852 */ | |
853 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
854 get_expr_line_src(void) |
283 | 855 { |
856 if (expr_line == NULL) | |
857 return NULL; | |
858 return vim_strsave(expr_line); | |
859 } | |
7 | 860 #endif /* FEAT_EVAL */ |
861 | |
862 /* | |
863 * Check if 'regname' is a valid name of a yank register. | |
864 * Note: There is no check for 0 (default register), caller should do this | |
865 */ | |
866 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
867 valid_yank_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
868 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
869 int writing) /* if TRUE check for writable registers */ |
7 | 870 { |
871 if ( (regname > 0 && ASCII_ISALNUM(regname)) | |
872 || (!writing && vim_strchr((char_u *) | |
873 #ifdef FEAT_EVAL | |
6557 | 874 "/.%:=" |
7 | 875 #else |
6557 | 876 "/.%:" |
7 | 877 #endif |
878 , regname) != NULL) | |
6557 | 879 || regname == '#' |
7 | 880 || regname == '"' |
881 || regname == '-' | |
882 || regname == '_' | |
883 #ifdef FEAT_CLIPBOARD | |
884 || regname == '*' | |
885 || regname == '+' | |
886 #endif | |
887 #ifdef FEAT_DND | |
888 || (!writing && regname == '~') | |
889 #endif | |
890 ) | |
891 return TRUE; | |
892 return FALSE; | |
893 } | |
894 | |
895 /* | |
896 * Set y_current and y_append, according to the value of "regname". | |
897 * Cannot handle the '_' register. | |
140 | 898 * Must only be called with a valid register name! |
7 | 899 * |
900 * If regname is 0 and writing, use register 0 | |
901 * 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
|
902 * |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
903 * 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
|
904 * clipboard). |
7 | 905 */ |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
906 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
907 get_yank_register(int regname, int writing) |
7 | 908 { |
909 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
|
910 int ret = FALSE; |
7 | 911 |
912 y_append = FALSE; | |
913 if ((regname == 0 || regname == '"') && !writing && y_previous != NULL) | |
914 { | |
915 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
|
916 return ret; |
7 | 917 } |
918 i = regname; | |
919 if (VIM_ISDIGIT(i)) | |
920 i -= '0'; | |
921 else if (ASCII_ISLOWER(i)) | |
922 i = CharOrdLow(i) + 10; | |
923 else if (ASCII_ISUPPER(i)) | |
924 { | |
925 i = CharOrdUp(i) + 10; | |
926 y_append = TRUE; | |
927 } | |
928 else if (regname == '-') | |
929 i = DELETION_REGISTER; | |
930 #ifdef FEAT_CLIPBOARD | |
931 /* When selection is not available, use register 0 instead of '*' */ | |
932 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
|
933 { |
7 | 934 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
|
935 ret = TRUE; |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
936 } |
7 | 937 /* When clipboard is not available, use register 0 instead of '+' */ |
938 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
|
939 { |
7 | 940 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
|
941 ret = TRUE; |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
942 } |
7 | 943 #endif |
944 #ifdef FEAT_DND | |
945 else if (!writing && regname == '~') | |
946 i = TILDE_REGISTER; | |
947 #endif | |
948 else /* not 0-9, a-z, A-Z or '-': use register 0 */ | |
949 i = 0; | |
950 y_current = &(y_regs[i]); | |
951 if (writing) /* remember the register we write into for do_put() */ | |
952 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
|
953 return ret; |
7 | 954 } |
955 | |
15 | 956 #if defined(FEAT_CLIPBOARD) || defined(PROTO) |
7 | 957 /* |
958 * When "regname" is a clipboard register, obtain the selection. If it's not | |
959 * available return zero, otherwise return "regname". | |
960 */ | |
15 | 961 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
962 may_get_selection(int regname) |
7 | 963 { |
964 if (regname == '*') | |
965 { | |
966 if (!clip_star.available) | |
967 regname = 0; | |
968 else | |
969 clip_get_selection(&clip_star); | |
970 } | |
971 else if (regname == '+') | |
972 { | |
973 if (!clip_plus.available) | |
974 regname = 0; | |
975 else | |
976 clip_get_selection(&clip_plus); | |
977 } | |
978 return regname; | |
979 } | |
980 #endif | |
981 | |
982 /* | |
983 * Obtain the contents of a "normal" register. The register is made empty. | |
984 * The returned pointer has allocated memory, use put_register() later. | |
985 */ | |
986 void * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
987 get_register( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
988 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
989 int copy) /* make a copy, if FALSE make register empty. */ |
7 | 990 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
991 yankreg_T *reg; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
992 int i; |
7 | 993 |
994 #ifdef FEAT_CLIPBOARD | |
995 /* When Visual area changed, may have to update selection. Obtain the | |
996 * selection too. */ | |
1435 | 997 if (name == '*' && clip_star.available) |
7 | 998 { |
3674 | 999 if (clip_isautosel_star()) |
1000 clip_update_selection(&clip_star); | |
1001 may_get_selection(name); | |
1002 } | |
1003 if (name == '+' && clip_plus.available) | |
1004 { | |
1005 if (clip_isautosel_plus()) | |
1006 clip_update_selection(&clip_plus); | |
7 | 1007 may_get_selection(name); |
1008 } | |
1009 #endif | |
1010 | |
1011 get_yank_register(name, 0); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1012 reg = (yankreg_T *)alloc((unsigned)sizeof(yankreg_T)); |
7 | 1013 if (reg != NULL) |
1014 { | |
1015 *reg = *y_current; | |
1016 if (copy) | |
1017 { | |
1018 /* If we run out of memory some or all of the lines are empty. */ | |
1019 if (reg->y_size == 0) | |
1020 reg->y_array = NULL; | |
1021 else | |
1022 reg->y_array = (char_u **)alloc((unsigned)(sizeof(char_u *) | |
1023 * reg->y_size)); | |
1024 if (reg->y_array != NULL) | |
1025 { | |
1026 for (i = 0; i < reg->y_size; ++i) | |
1027 reg->y_array[i] = vim_strsave(y_current->y_array[i]); | |
1028 } | |
1029 } | |
1030 else | |
1031 y_current->y_array = NULL; | |
1032 } | |
1033 return (void *)reg; | |
1034 } | |
1035 | |
1036 /* | |
1451 | 1037 * Put "reg" into register "name". Free any previous contents and "reg". |
7 | 1038 */ |
1039 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1040 put_register(int name, void *reg) |
7 | 1041 { |
1042 get_yank_register(name, 0); | |
1043 free_yank_all(); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1044 *y_current = *(yankreg_T *)reg; |
1451 | 1045 vim_free(reg); |
7 | 1046 |
5735 | 1047 #ifdef FEAT_CLIPBOARD |
7 | 1048 /* Send text written to clipboard register to the clipboard. */ |
1049 may_set_selection(); | |
5735 | 1050 #endif |
7 | 1051 } |
4209 | 1052 |
1053 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1054 free_register(void *reg) |
4209 | 1055 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1056 yankreg_T tmp; |
4209 | 1057 |
1058 tmp = *y_current; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1059 *y_current = *(yankreg_T *)reg; |
4209 | 1060 free_yank_all(); |
1061 vim_free(reg); | |
1062 *y_current = tmp; | |
1063 } | |
7 | 1064 |
1065 #if defined(FEAT_MOUSE) || defined(PROTO) | |
1066 /* | |
1067 * return TRUE if the current yank register has type MLINE | |
1068 */ | |
1069 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1070 yank_register_mline(int regname) |
7 | 1071 { |
1072 if (regname != 0 && !valid_yank_reg(regname, FALSE)) | |
1073 return FALSE; | |
1074 if (regname == '_') /* black hole is always empty */ | |
1075 return FALSE; | |
1076 get_yank_register(regname, FALSE); | |
1077 return (y_current->y_type == MLINE); | |
1078 } | |
1079 #endif | |
1080 | |
1081 /* | |
1157 | 1082 * Start or stop recording into a yank register. |
7 | 1083 * |
1157 | 1084 * Return FAIL for failure, OK otherwise. |
7 | 1085 */ |
1086 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1087 do_record(int c) |
7 | 1088 { |
1157 | 1089 char_u *p; |
1090 static int regname; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1091 yankreg_T *old_y_previous, *old_y_current; |
1157 | 1092 int retval; |
7 | 1093 |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1094 if (reg_recording == 0) /* start recording */ |
7 | 1095 { |
13620
4faf77b96432
patch 8.0.1682: auto indenting breaks inserting a block
Christian Brabandt <cb@256bit.org>
parents:
13614
diff
changeset
|
1096 /* registers 0-9, a-z and " are allowed */ |
7 | 1097 if (c < 0 || (!ASCII_ISALNUM(c) && c != '"')) |
1098 retval = FAIL; | |
1099 else | |
1100 { | |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1101 reg_recording = c; |
7 | 1102 showmode(); |
1103 regname = c; | |
1104 retval = OK; | |
1105 } | |
1106 } | |
1107 else /* stop recording */ | |
1108 { | |
1109 /* | |
1157 | 1110 * Get the recorded key hits. K_SPECIAL and CSI will be escaped, this |
1111 * needs to be removed again to put it in a register. exec_reg then | |
1112 * adds the escaping back later. | |
7 | 1113 */ |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1114 reg_recording = 0; |
7 | 1115 MSG(""); |
1116 p = get_recorded(); | |
1117 if (p == NULL) | |
1118 retval = FAIL; | |
1119 else | |
1120 { | |
1081 | 1121 /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ |
1122 vim_unescape_csi(p); | |
1123 | |
7 | 1124 /* |
1125 * We don't want to change the default register here, so save and | |
1126 * restore the current register name. | |
1127 */ | |
1128 old_y_previous = y_previous; | |
1129 old_y_current = y_current; | |
1130 | |
1131 retval = stuff_yank(regname, p); | |
1132 | |
1133 y_previous = old_y_previous; | |
1134 y_current = old_y_current; | |
1135 } | |
1136 } | |
1137 return retval; | |
1138 } | |
1139 | |
1140 /* | |
1141 * Stuff string "p" into yank register "regname" as a single line (append if | |
1142 * uppercase). "p" must have been alloced. | |
1143 * | |
1144 * return FAIL for failure, OK otherwise | |
1145 */ | |
1146 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1147 stuff_yank(int regname, char_u *p) |
7 | 1148 { |
1149 char_u *lp; | |
1150 char_u **pp; | |
1151 | |
1152 /* check for read-only register */ | |
1153 if (regname != 0 && !valid_yank_reg(regname, TRUE)) | |
1154 { | |
1155 vim_free(p); | |
1156 return FAIL; | |
1157 } | |
1158 if (regname == '_') /* black hole: don't do anything */ | |
1159 { | |
1160 vim_free(p); | |
1161 return OK; | |
1162 } | |
1163 get_yank_register(regname, TRUE); | |
1164 if (y_append && y_current->y_array != NULL) | |
1165 { | |
1166 pp = &(y_current->y_array[y_current->y_size - 1]); | |
1167 lp = lalloc((long_u)(STRLEN(*pp) + STRLEN(p) + 1), TRUE); | |
1168 if (lp == NULL) | |
1169 { | |
1170 vim_free(p); | |
1171 return FAIL; | |
1172 } | |
1173 STRCPY(lp, *pp); | |
1174 STRCAT(lp, p); | |
1175 vim_free(p); | |
1176 vim_free(*pp); | |
1177 *pp = lp; | |
1178 } | |
1179 else | |
1180 { | |
1181 free_yank_all(); | |
1182 if ((y_current->y_array = | |
1183 (char_u **)alloc((unsigned)sizeof(char_u *))) == NULL) | |
1184 { | |
1185 vim_free(p); | |
1186 return FAIL; | |
1187 } | |
1188 y_current->y_array[0] = p; | |
1189 y_current->y_size = 1; | |
1190 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
|
1191 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
1192 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
|
1193 #endif |
7 | 1194 } |
1195 return OK; | |
1196 } | |
1197 | |
1893 | 1198 static int execreg_lastc = NUL; |
1199 | |
7 | 1200 /* |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1201 * Execute a yank register: copy it into the stuff buffer. |
7 | 1202 * |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
1203 * Return FAIL for failure, OK otherwise. |
7 | 1204 */ |
1205 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1206 do_execreg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1207 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1208 int colon, /* insert ':' before each line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1209 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
|
1210 int silent) /* set "silent" flag in typeahead buffer */ |
7 | 1211 { |
1212 long i; | |
1213 char_u *p; | |
1214 int retval = OK; | |
1215 int remap; | |
1216 | |
1217 if (regname == '@') /* repeat previous one */ | |
168 | 1218 { |
1893 | 1219 if (execreg_lastc == NUL) |
168 | 1220 { |
1221 EMSG(_("E748: No previously used register")); | |
1222 return FAIL; | |
1223 } | |
1893 | 1224 regname = execreg_lastc; |
168 | 1225 } |
7 | 1226 /* check for valid regname */ |
1227 if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE)) | |
168 | 1228 { |
1229 emsg_invreg(regname); | |
7 | 1230 return FAIL; |
168 | 1231 } |
1893 | 1232 execreg_lastc = regname; |
7 | 1233 |
1234 #ifdef FEAT_CLIPBOARD | |
1235 regname = may_get_selection(regname); | |
1236 #endif | |
1237 | |
1238 if (regname == '_') /* black hole: don't stuff anything */ | |
1239 return OK; | |
1240 | |
1241 #ifdef FEAT_CMDHIST | |
1242 if (regname == ':') /* use last command line */ | |
1243 { | |
1244 if (last_cmdline == NULL) | |
1245 { | |
1246 EMSG(_(e_nolastcmd)); | |
1247 return FAIL; | |
1248 } | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
1249 VIM_CLEAR(new_last_cmdline); /* don't keep the cmdline containing @: */ |
16 | 1250 /* Escape all control characters with a CTRL-V */ |
1251 p = vim_strsave_escaped_ext(last_cmdline, | |
20 | 1252 (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 | 1253 if (p != NULL) |
480 | 1254 { |
1255 /* When in Visual mode "'<,'>" will be prepended to the command. | |
1256 * Remove it when it's already there. */ | |
1257 if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) | |
1077 | 1258 retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); |
480 | 1259 else |
1077 | 1260 retval = put_in_typebuf(p, TRUE, TRUE, silent); |
480 | 1261 } |
16 | 1262 vim_free(p); |
7 | 1263 } |
1264 #endif | |
1265 #ifdef FEAT_EVAL | |
1266 else if (regname == '=') | |
1267 { | |
1268 p = get_expr_line(); | |
1269 if (p == NULL) | |
1270 return FAIL; | |
1077 | 1271 retval = put_in_typebuf(p, TRUE, colon, silent); |
7 | 1272 vim_free(p); |
1273 } | |
1274 #endif | |
1275 else if (regname == '.') /* use last inserted text */ | |
1276 { | |
1277 p = get_last_insert_save(); | |
1278 if (p == NULL) | |
1279 { | |
1280 EMSG(_(e_noinstext)); | |
1281 return FAIL; | |
1282 } | |
1077 | 1283 retval = put_in_typebuf(p, FALSE, colon, silent); |
7 | 1284 vim_free(p); |
1285 } | |
1286 else | |
1287 { | |
1288 get_yank_register(regname, FALSE); | |
1289 if (y_current->y_array == NULL) | |
1290 return FAIL; | |
1291 | |
1292 /* Disallow remaping for ":@r". */ | |
1293 remap = colon ? REMAP_NONE : REMAP_YES; | |
1294 | |
1295 /* | |
1296 * Insert lines into typeahead buffer, from last one to first one. | |
1297 */ | |
1034 | 1298 put_reedit_in_typebuf(silent); |
7 | 1299 for (i = y_current->y_size; --i >= 0; ) |
1300 { | |
1077 | 1301 char_u *escaped; |
1302 | |
7 | 1303 /* insert NL between lines and after last line if type is MLINE */ |
1304 if (y_current->y_type == MLINE || i < y_current->y_size - 1 | |
1305 || addcr) | |
1306 { | |
1034 | 1307 if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL) |
7 | 1308 return FAIL; |
1309 } | |
1077 | 1310 escaped = vim_strsave_escape_csi(y_current->y_array[i]); |
1311 if (escaped == NULL) | |
1312 return FAIL; | |
1313 retval = ins_typebuf(escaped, remap, 0, TRUE, silent); | |
1314 vim_free(escaped); | |
1315 if (retval == FAIL) | |
7 | 1316 return FAIL; |
1034 | 1317 if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent) |
7 | 1318 == FAIL) |
1319 return FAIL; | |
1320 } | |
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13831
diff
changeset
|
1321 reg_executing = regname == 0 ? '"' : regname; // disable "q" command |
7 | 1322 } |
1323 return retval; | |
1324 } | |
1325 | |
1326 /* | |
1327 * If "restart_edit" is not zero, put it in the typeahead buffer, so that it's | |
1328 * used only after other typeahead has been processed. | |
1329 */ | |
1330 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1331 put_reedit_in_typebuf(int silent) |
7 | 1332 { |
1333 char_u buf[3]; | |
1334 | |
1335 if (restart_edit != NUL) | |
1336 { | |
1337 if (restart_edit == 'V') | |
1338 { | |
1339 buf[0] = 'g'; | |
1340 buf[1] = 'R'; | |
1341 buf[2] = NUL; | |
1342 } | |
1343 else | |
1344 { | |
1345 buf[0] = restart_edit == 'I' ? 'i' : restart_edit; | |
1346 buf[1] = NUL; | |
1347 } | |
1034 | 1348 if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK) |
7 | 1349 restart_edit = NUL; |
1350 } | |
1351 } | |
1352 | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1353 /* |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1354 * 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
|
1355 * executed again. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1356 * 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
|
1357 * no remapping. |
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1358 */ |
7 | 1359 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1360 put_in_typebuf( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1361 char_u *s, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1362 int esc, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1363 int colon, /* add ':' before the line */ |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1364 int silent) |
7 | 1365 { |
1366 int retval = OK; | |
1367 | |
1034 | 1368 put_reedit_in_typebuf(silent); |
7 | 1369 if (colon) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1370 retval = ins_typebuf((char_u *)"\n", REMAP_NONE, 0, TRUE, silent); |
7 | 1371 if (retval == OK) |
1077 | 1372 { |
1373 char_u *p; | |
1374 | |
1375 if (esc) | |
1376 p = vim_strsave_escape_csi(s); | |
1377 else | |
1378 p = s; | |
1379 if (p == NULL) | |
1380 retval = FAIL; | |
1381 else | |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1382 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
|
1383 0, TRUE, silent); |
1077 | 1384 if (esc) |
1385 vim_free(p); | |
1386 } | |
7 | 1387 if (colon && retval == OK) |
2061
2f6e519726f1
updated for version 7.2.346
Bram Moolenaar <bram@zimbu.org>
parents:
2047
diff
changeset
|
1388 retval = ins_typebuf((char_u *)":", REMAP_NONE, 0, TRUE, silent); |
7 | 1389 return retval; |
1390 } | |
1391 | |
1392 /* | |
1393 * Insert a yank register: copy it into the Read buffer. | |
1394 * Used by CTRL-R command and middle mouse button in insert mode. | |
1395 * | |
1396 * return FAIL for failure, OK otherwise | |
1397 */ | |
1398 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1399 insert_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1400 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
|
1401 int literally_arg) /* insert literally, not as if typed */ |
7 | 1402 { |
1403 long i; | |
1404 int retval = OK; | |
1405 char_u *arg; | |
1406 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
|
1407 int literally = literally_arg; |
7 | 1408 |
1409 /* | |
1410 * It is possible to get into an endless loop by having CTRL-R a in | |
1411 * register a and then, in insert mode, doing CTRL-R a. | |
1412 * If you hit CTRL-C, the loop will be broken here. | |
1413 */ | |
1414 ui_breakcheck(); | |
1415 if (got_int) | |
1416 return FAIL; | |
1417 | |
1418 /* check for valid regname */ | |
1419 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
1420 return FAIL; | |
1421 | |
1422 #ifdef FEAT_CLIPBOARD | |
1423 regname = may_get_selection(regname); | |
1424 #endif | |
1425 | |
1426 if (regname == '.') /* insert last inserted text */ | |
1427 retval = stuff_inserted(NUL, 1L, TRUE); | |
1428 else if (get_spec_reg(regname, &arg, &allocated, TRUE)) | |
1429 { | |
1430 if (arg == NULL) | |
1431 return FAIL; | |
1432 stuffescaped(arg, literally); | |
1433 if (allocated) | |
1434 vim_free(arg); | |
1435 } | |
1436 else /* name or number register */ | |
1437 { | |
13425
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1438 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
|
1439 literally = TRUE; |
7 | 1440 if (y_current->y_array == NULL) |
1441 retval = FAIL; | |
1442 else | |
1443 { | |
1444 for (i = 0; i < y_current->y_size; ++i) | |
1445 { | |
1446 stuffescaped(y_current->y_array[i], literally); | |
1447 /* | |
1448 * Insert a newline between lines and after last line if | |
1449 * y_type is MLINE. | |
1450 */ | |
1451 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
1452 stuffcharReadbuff('\n'); | |
1453 } | |
1454 } | |
1455 } | |
1456 | |
1457 return retval; | |
1458 } | |
1459 | |
1460 /* | |
1461 * Stuff a string into the typeahead buffer, such that edit() will insert it | |
1462 * literally ("literally" TRUE) or interpret is as typed characters. | |
1463 */ | |
1464 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1465 stuffescaped(char_u *arg, int literally) |
7 | 1466 { |
1467 int c; | |
1468 char_u *start; | |
1469 | |
1470 while (*arg != NUL) | |
1471 { | |
1472 /* Stuff a sequence of normal ASCII characters, that's fast. Also | |
1473 * stuff K_SPECIAL to get the effect of a special key when "literally" | |
1474 * is TRUE. */ | |
1475 start = arg; | |
1476 while ((*arg >= ' ' | |
1477 #ifndef EBCDIC | |
1478 && *arg < DEL /* EBCDIC: chars above space are normal */ | |
1479 #endif | |
1480 ) | |
1481 || (*arg == K_SPECIAL && !literally)) | |
1482 ++arg; | |
1483 if (arg > start) | |
1484 stuffReadbuffLen(start, (long)(arg - start)); | |
1485 | |
1486 /* stuff a single special character */ | |
1487 if (*arg != NUL) | |
1488 { | |
1489 #ifdef FEAT_MBYTE | |
1490 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
|
1491 c = mb_cptr2char_adv(&arg); |
7 | 1492 else |
1493 #endif | |
1494 c = *arg++; | |
1495 if (literally && ((c < ' ' && c != TAB) || c == DEL)) | |
1496 stuffcharReadbuff(Ctrl_V); | |
1497 stuffcharReadbuff(c); | |
1498 } | |
1499 } | |
1500 } | |
1501 | |
1502 /* | |
1157 | 1503 * If "regname" is a special register, return TRUE and store a pointer to its |
1504 * value in "argp". | |
7 | 1505 */ |
15 | 1506 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1507 get_spec_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1508 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1509 char_u **argp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1510 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
|
1511 int errmsg) /* give error message when failing */ |
7 | 1512 { |
1513 int cnt; | |
1514 | |
1515 *argp = NULL; | |
1516 *allocated = FALSE; | |
1517 switch (regname) | |
1518 { | |
1519 case '%': /* file name */ | |
1520 if (errmsg) | |
1521 check_fname(); /* will give emsg if not set */ | |
1522 *argp = curbuf->b_fname; | |
1523 return TRUE; | |
1524 | |
1525 case '#': /* alternate file name */ | |
1526 *argp = getaltfname(errmsg); /* may give emsg if not set */ | |
1527 return TRUE; | |
1528 | |
1529 #ifdef FEAT_EVAL | |
1530 case '=': /* result of expression */ | |
1531 *argp = get_expr_line(); | |
1532 *allocated = TRUE; | |
1533 return TRUE; | |
1534 #endif | |
1535 | |
1536 case ':': /* last command line */ | |
1537 if (last_cmdline == NULL && errmsg) | |
1538 EMSG(_(e_nolastcmd)); | |
1539 *argp = last_cmdline; | |
1540 return TRUE; | |
1541 | |
1542 case '/': /* last search-pattern */ | |
1543 if (last_search_pat() == NULL && errmsg) | |
1544 EMSG(_(e_noprevre)); | |
1545 *argp = last_search_pat(); | |
1546 return TRUE; | |
1547 | |
1548 case '.': /* last inserted text */ | |
1549 *argp = get_last_insert_save(); | |
1550 *allocated = TRUE; | |
1551 if (*argp == NULL && errmsg) | |
1552 EMSG(_(e_noinstext)); | |
1553 return TRUE; | |
1554 | |
1555 #ifdef FEAT_SEARCHPATH | |
1556 case Ctrl_F: /* Filename under cursor */ | |
1557 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
1558 if (!errmsg) | |
1559 return FALSE; | |
1560 *argp = file_name_at_cursor(FNAME_MESS | FNAME_HYP | |
681 | 1561 | (regname == Ctrl_P ? FNAME_EXP : 0), 1L, NULL); |
7 | 1562 *allocated = TRUE; |
1563 return TRUE; | |
1564 #endif | |
1565 | |
1566 case Ctrl_W: /* word under cursor */ | |
1567 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
1568 if (!errmsg) | |
1569 return FALSE; | |
1570 cnt = find_ident_under_cursor(argp, regname == Ctrl_W | |
1571 ? (FIND_IDENT|FIND_STRING) : FIND_STRING); | |
1572 *argp = cnt ? vim_strnsave(*argp, cnt) : NULL; | |
1573 *allocated = TRUE; | |
1574 return TRUE; | |
1575 | |
13831
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1576 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
|
1577 if (!errmsg) |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1578 return FALSE; |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1579 |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1580 *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
|
1581 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
|
1582 return TRUE; |
1f95ec5de238
patch 8.0.1787: cannot insert the whole cursor line
Christian Brabandt <cb@256bit.org>
parents:
13814
diff
changeset
|
1583 |
7 | 1584 case '_': /* black hole: always empty */ |
1585 *argp = (char_u *)""; | |
1586 return TRUE; | |
1587 } | |
1588 | |
1589 return FALSE; | |
1590 } | |
1591 | |
1592 /* | |
15 | 1593 * Paste a yank register into the command line. |
1594 * Only for non-special registers. | |
1595 * Used by CTRL-R command in command-line mode | |
7 | 1596 * insert_reg() can't be used here, because special characters from the |
1597 * register contents will be interpreted as commands. | |
1598 * | |
1599 * return FAIL for failure, OK otherwise | |
1600 */ | |
1601 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1602 cmdline_paste_reg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1603 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
|
1604 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
|
1605 int remcr) /* don't add CR characters */ |
7 | 1606 { |
1607 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
|
1608 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
|
1609 |
bb789ed5113a
patch 8.0.1587: inserting from the clipboard doesn't work literally
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
1610 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
|
1611 literally = TRUE; |
7 | 1612 if (y_current->y_array == NULL) |
1613 return FAIL; | |
1614 | |
1615 for (i = 0; i < y_current->y_size; ++i) | |
1616 { | |
1617 cmdline_paste_str(y_current->y_array[i], literally); | |
1618 | |
1015 | 1619 /* 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
|
1620 * 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
|
1621 if ((y_current->y_type == MLINE || i < y_current->y_size - 1) && !remcr) |
7 | 1622 cmdline_paste_str((char_u *)"\r", literally); |
1623 | |
1624 /* Check for CTRL-C, in case someone tries to paste a few thousand | |
1625 * lines and gets bored. */ | |
1626 ui_breakcheck(); | |
1627 if (got_int) | |
1628 return FAIL; | |
1629 } | |
1630 return OK; | |
1631 } | |
1632 | |
1633 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
1634 /* | |
1635 * Adjust the register name pointed to with "rp" for the clipboard being | |
1636 * used always and the clipboard being available. | |
1637 */ | |
1638 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1639 adjust_clip_reg(int *rp) |
7 | 1640 { |
2654 | 1641 /* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard', |
1642 * use '*' or '+' reg, respectively. "unnamedplus" prevails. */ | |
6116 | 1643 if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0)) |
1644 { | |
1645 if (clip_unnamed != 0) | |
1646 *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
2654 | 1647 ? '+' : '*'; |
6116 | 1648 else |
1649 *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available) | |
1650 ? '+' : '*'; | |
1651 } | |
7 | 1652 if (!clip_star.available && *rp == '*') |
1653 *rp = 0; | |
1654 if (!clip_plus.available && *rp == '+') | |
1655 *rp = 0; | |
1656 } | |
1657 #endif | |
1658 | |
1659 /* | |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1660 * 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
|
1661 */ |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1662 void |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1663 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
|
1664 { |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1665 int n; |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1666 |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1667 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
|
1668 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
|
1669 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
|
1670 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
|
1671 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
|
1672 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
|
1673 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
|
1674 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
|
1675 } |
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1676 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1677 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1678 static void |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1679 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
|
1680 { |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1681 static int recursive = FALSE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1682 dict_T *v_event; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1683 list_T *list; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1684 int n; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1685 char_u buf[NUMBUFLEN + 2]; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1686 long reglen = 0; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1687 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1688 if (recursive) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1689 return; |
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 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
|
1692 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1693 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
|
1694 if (list == NULL) |
88cc06dc1a50
patch 8.0.1501: out-of-memory situation not correctly handled
Christian Brabandt <cb@256bit.org>
parents:
13244
diff
changeset
|
1695 return; |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1696 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
|
1697 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
|
1698 list->lv_lock = VAR_FIXED; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1699 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
|
1700 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1701 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
|
1702 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
|
1703 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
|
1704 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1705 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
|
1706 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
|
1707 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
|
1708 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
|
1709 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1710 buf[0] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1711 buf[1] = NUL; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1712 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
|
1713 { |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1714 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
|
1715 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
|
1716 case MBLOCK: |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1717 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
|
1718 reglen + 1); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1719 break; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1720 } |
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
1721 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
|
1722 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1723 /* 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
|
1724 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
|
1725 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1726 recursive = TRUE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1727 textlock++; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1728 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
|
1729 textlock--; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1730 recursive = FALSE; |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1731 |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1732 /* 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
|
1733 dict_free_contents(v_event); |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1734 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
|
1735 } |
13047
669c4f75a69e
patch 8.0.1399: warnings and errors when building tiny version
Christian Brabandt <cb@256bit.org>
parents:
13037
diff
changeset
|
1736 #endif |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1737 |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1738 /* |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1739 * Handle a delete operation. |
7 | 1740 * |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1741 * Return FAIL if undo failed, OK otherwise. |
7 | 1742 */ |
1743 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1744 op_delete(oparg_T *oap) |
7 | 1745 { |
1746 int n; | |
1747 linenr_T lnum; | |
1748 char_u *ptr; | |
1749 char_u *newp, *oldp; | |
1750 struct block_def bd; | |
1751 linenr_T old_lcount = curbuf->b_ml.ml_line_count; | |
1752 int did_yank = FALSE; | |
3782 | 1753 int orig_regname = oap->regname; |
7 | 1754 |
1755 if (curbuf->b_ml.ml_flags & ML_EMPTY) /* nothing to do */ | |
1756 return OK; | |
1757 | |
1758 /* Nothing to delete, return here. Do prepare undo, for op_change(). */ | |
1759 if (oap->empty) | |
1760 return u_save_cursor(); | |
1761 | |
1762 if (!curbuf->b_p_ma) | |
1763 { | |
1764 EMSG(_(e_modifiable)); | |
1765 return FAIL; | |
1766 } | |
1767 | |
1768 #ifdef FEAT_CLIPBOARD | |
1769 adjust_clip_reg(&oap->regname); | |
1770 #endif | |
1771 | |
1772 #ifdef FEAT_MBYTE | |
1773 if (has_mbyte) | |
1774 mb_adjust_opend(oap); | |
1775 #endif | |
1776 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1777 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1778 * Imitate the strange Vi behaviour: If the delete spans more than one |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1779 * line and motion_type == MCHAR and the result is a blank line, make the |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1780 * delete linewise. Don't do this for the change command or Visual mode. |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1781 */ |
7 | 1782 if ( oap->motion_type == MCHAR |
1783 && !oap->is_VIsual | |
50 | 1784 && !oap->block_mode |
7 | 1785 && oap->line_count > 1 |
3254 | 1786 && oap->motion_force == NUL |
7 | 1787 && oap->op_type == OP_DELETE) |
1788 { | |
2957 | 1789 ptr = ml_get(oap->end.lnum) + oap->end.col; |
1790 if (*ptr != NUL) | |
1791 ptr += oap->inclusive; | |
7 | 1792 ptr = skipwhite(ptr); |
1793 if (*ptr == NUL && inindent(0)) | |
1794 oap->motion_type = MLINE; | |
1795 } | |
1796 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1797 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1798 * Check for trying to delete (e.g. "D") in an empty line. |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1799 * Note: For the change operator it is ok. |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1800 */ |
7 | 1801 if ( oap->motion_type == MCHAR |
1802 && oap->line_count == 1 | |
1803 && oap->op_type == OP_DELETE | |
1804 && *ml_get(oap->start.lnum) == NUL) | |
1805 { | |
1806 /* | |
446 | 1807 * It's an error to operate on an empty region, when 'E' included in |
7 | 1808 * 'cpoptions' (Vi compatible). |
1809 */ | |
446 | 1810 #ifdef FEAT_VIRTUALEDIT |
1811 if (virtual_op) | |
1812 /* Virtual editing: Nothing gets deleted, but we set the '[ and '] | |
1813 * marks as if it happened. */ | |
1814 goto setmarks; | |
1815 #endif | |
7 | 1816 if (vim_strchr(p_cpo, CPO_EMPTYREGION) != NULL) |
1817 beep_flush(); | |
1818 return OK; | |
1819 } | |
1820 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1821 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1822 * 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
|
1823 * 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
|
1824 * 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
|
1825 */ |
7 | 1826 if (oap->regname != '_') |
1827 { | |
1828 if (oap->regname != 0) | |
1829 { | |
1830 /* check for read-only register */ | |
1831 if (!valid_yank_reg(oap->regname, TRUE)) | |
1832 { | |
1833 beep_flush(); | |
1834 return OK; | |
1835 } | |
1836 get_yank_register(oap->regname, TRUE); /* yank into specif'd reg. */ | |
1837 if (op_yank(oap, TRUE, FALSE) == OK) /* yank without message */ | |
1838 did_yank = TRUE; | |
1839 } | |
1840 | |
1841 /* | |
1842 * Put deleted text into register 1 and shift number registers if the | |
1843 * delete contains a line break, or when a regname has been specified. | |
3782 | 1844 * Use the register name from before adjust_clip_reg() may have |
1845 * changed it. | |
7 | 1846 */ |
3782 | 1847 if (orig_regname != 0 || oap->motion_type == MLINE |
7 | 1848 || oap->line_count > 1 || oap->use_reg_one) |
1849 { | |
10827
e366b968bf08
patch 8.0.0303: bracketed paste does not work in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10803
diff
changeset
|
1850 shift_delete_registers(); |
7 | 1851 if (op_yank(oap, TRUE, FALSE) == OK) |
1852 did_yank = TRUE; | |
1853 } | |
1854 | |
3468 | 1855 /* Yank into small delete register when no named register specified |
1856 * and the delete is within one line. */ | |
1857 if (( | |
1858 #ifdef FEAT_CLIPBOARD | |
3584 | 1859 ((clip_unnamed & CLIP_UNNAMED) && oap->regname == '*') || |
1860 ((clip_unnamed & CLIP_UNNAMED_PLUS) && oap->regname == '+') || | |
3468 | 1861 #endif |
1862 oap->regname == 0) && oap->motion_type != MLINE | |
7 | 1863 && oap->line_count == 1) |
1864 { | |
1865 oap->regname = '-'; | |
1866 get_yank_register(oap->regname, TRUE); | |
1867 if (op_yank(oap, TRUE, FALSE) == OK) | |
1868 did_yank = TRUE; | |
1869 oap->regname = 0; | |
1870 } | |
1871 | |
1872 /* | |
1873 * If there's too much stuff to fit in the yank register, then get a | |
1874 * confirmation before doing the delete. This is crude, but simple. | |
1875 * And it avoids doing a delete of something we can't put back if we | |
1876 * want. | |
1877 */ | |
1878 if (!did_yank) | |
1879 { | |
1880 int msg_silent_save = msg_silent; | |
1881 | |
1882 msg_silent = 0; /* must display the prompt */ | |
1883 n = ask_yesno((char_u *)_("cannot yank; delete anyway"), TRUE); | |
1884 msg_silent = msg_silent_save; | |
1885 if (n != 'y') | |
1886 { | |
1887 EMSG(_(e_abort)); | |
1888 return FAIL; | |
1889 } | |
1890 } | |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1891 |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
1892 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1893 if (did_yank && has_textyankpost()) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
1894 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
|
1895 #endif |
7 | 1896 } |
1897 | |
2289
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1898 /* |
3331756e4232
Make synstack() work on the character just after the end of the line.
Bram Moolenaar <bram@vim.org>
parents:
2278
diff
changeset
|
1899 * 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
|
1900 */ |
7 | 1901 if (oap->block_mode) |
1902 { | |
1903 if (u_save((linenr_T)(oap->start.lnum - 1), | |
1904 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
1905 return FAIL; | |
1906 | |
1907 for (lnum = curwin->w_cursor.lnum; lnum <= oap->end.lnum; ++lnum) | |
1908 { | |
1909 block_prep(oap, &bd, lnum, TRUE); | |
1910 if (bd.textlen == 0) /* nothing to delete */ | |
1911 continue; | |
1912 | |
1913 /* Adjust cursor position for tab replaced by spaces and 'lbr'. */ | |
1914 if (lnum == curwin->w_cursor.lnum) | |
1915 { | |
1916 curwin->w_cursor.col = bd.textcol + bd.startspaces; | |
1917 # ifdef FEAT_VIRTUALEDIT | |
1918 curwin->w_cursor.coladd = 0; | |
1919 # endif | |
1920 } | |
1921 | |
1922 /* n == number of chars deleted | |
1923 * If we delete a TAB, it may be replaced by several characters. | |
1924 * Thus the number of characters may increase! | |
1925 */ | |
1926 n = bd.textlen - bd.startspaces - bd.endspaces; | |
1927 oldp = ml_get(lnum); | |
1928 newp = alloc_check((unsigned)STRLEN(oldp) + 1 - n); | |
1929 if (newp == NULL) | |
1930 continue; | |
1931 /* copy up to deleted part */ | |
1932 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
1933 /* insert spaces */ | |
6929 | 1934 vim_memset(newp + bd.textcol, ' ', |
7 | 1935 (size_t)(bd.startspaces + bd.endspaces)); |
1936 /* copy the part after the deleted part */ | |
1937 oldp += bd.textcol + bd.textlen; | |
1622 | 1938 STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp); |
7 | 1939 /* replace the line */ |
1940 ml_replace(lnum, newp, FALSE); | |
1941 } | |
1942 | |
1943 check_cursor_col(); | |
1944 changed_lines(curwin->w_cursor.lnum, curwin->w_cursor.col, | |
1945 oap->end.lnum + 1, 0L); | |
1946 oap->line_count = 0; /* no lines deleted */ | |
1947 } | |
5735 | 1948 else if (oap->motion_type == MLINE) |
7 | 1949 { |
1950 if (oap->op_type == OP_CHANGE) | |
1951 { | |
1952 /* Delete the lines except the first one. Temporarily move the | |
1953 * cursor to the next line. Save the current line number, if the | |
1954 * last line is deleted it may be changed. | |
1955 */ | |
1956 if (oap->line_count > 1) | |
1957 { | |
1958 lnum = curwin->w_cursor.lnum; | |
1959 ++curwin->w_cursor.lnum; | |
1960 del_lines((long)(oap->line_count - 1), TRUE); | |
1961 curwin->w_cursor.lnum = lnum; | |
1962 } | |
1963 if (u_save_cursor() == FAIL) | |
1964 return FAIL; | |
1965 if (curbuf->b_p_ai) /* don't delete indent */ | |
1966 { | |
1967 beginline(BL_WHITE); /* cursor on first non-white */ | |
1968 did_ai = TRUE; /* delete the indent when ESC hit */ | |
1969 ai_col = curwin->w_cursor.col; | |
1970 } | |
1971 else | |
1972 beginline(0); /* cursor in column 0 */ | |
1973 truncate_line(FALSE); /* delete the rest of the line */ | |
1974 /* leave cursor past last char in line */ | |
1975 if (oap->line_count > 1) | |
1976 u_clearline(); /* "U" command not possible after "2cc" */ | |
1977 } | |
1978 else | |
1979 { | |
1980 del_lines(oap->line_count, TRUE); | |
1981 beginline(BL_WHITE | BL_FIX); | |
1982 u_clearline(); /* "U" command not possible after "dd" */ | |
1983 } | |
1984 } | |
1985 else | |
1986 { | |
1987 #ifdef FEAT_VIRTUALEDIT | |
1988 if (virtual_op) | |
1989 { | |
1990 int endcol = 0; | |
1991 | |
1992 /* For virtualedit: break the tabs that are partly included. */ | |
1993 if (gchar_pos(&oap->start) == '\t') | |
1994 { | |
1995 if (u_save_cursor() == FAIL) /* save first line for undo */ | |
1996 return FAIL; | |
1997 if (oap->line_count == 1) | |
1998 endcol = getviscol2(oap->end.col, oap->end.coladd); | |
1999 coladvance_force(getviscol2(oap->start.col, oap->start.coladd)); | |
2000 oap->start = curwin->w_cursor; | |
2001 if (oap->line_count == 1) | |
2002 { | |
2003 coladvance(endcol); | |
2004 oap->end.col = curwin->w_cursor.col; | |
2005 oap->end.coladd = curwin->w_cursor.coladd; | |
2006 curwin->w_cursor = oap->start; | |
2007 } | |
2008 } | |
2009 | |
2010 /* Break a tab only when it's included in the area. */ | |
2011 if (gchar_pos(&oap->end) == '\t' | |
2012 && (int)oap->end.coladd < oap->inclusive) | |
2013 { | |
2014 /* save last line for undo */ | |
2015 if (u_save((linenr_T)(oap->end.lnum - 1), | |
2016 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2017 return FAIL; | |
2018 curwin->w_cursor = oap->end; | |
2019 coladvance_force(getviscol2(oap->end.col, oap->end.coladd)); | |
2020 oap->end = curwin->w_cursor; | |
2021 curwin->w_cursor = oap->start; | |
2022 } | |
2023 } | |
2024 #endif | |
2025 | |
2026 if (oap->line_count == 1) /* delete characters within one line */ | |
2027 { | |
2028 if (u_save_cursor() == FAIL) /* save line for undo */ | |
2029 return FAIL; | |
2030 | |
2031 /* if 'cpoptions' contains '$', display '$' at end of change */ | |
5735 | 2032 if ( vim_strchr(p_cpo, CPO_DOLLAR) != NULL |
7 | 2033 && oap->op_type == OP_CHANGE |
2034 && oap->end.lnum == curwin->w_cursor.lnum | |
5735 | 2035 && !oap->is_VIsual) |
7 | 2036 display_dollar(oap->end.col - !oap->inclusive); |
2037 | |
2038 n = oap->end.col - oap->start.col + 1 - !oap->inclusive; | |
2039 | |
2040 #ifdef FEAT_VIRTUALEDIT | |
2041 if (virtual_op) | |
2042 { | |
2043 /* fix up things for virtualedit-delete: | |
2044 * break the tabs which are going to get in our way | |
2045 */ | |
2046 char_u *curline = ml_get_curline(); | |
2047 int len = (int)STRLEN(curline); | |
2048 | |
2049 if (oap->end.coladd != 0 | |
2050 && (int)oap->end.col >= len - 1 | |
2051 && !(oap->start.coladd && (int)oap->end.col >= len - 1)) | |
2052 n++; | |
2053 /* Delete at least one char (e.g, when on a control char). */ | |
2054 if (n == 0 && oap->start.coladd != oap->end.coladd) | |
2055 n = 1; | |
2056 | |
2057 /* When deleted a char in the line, reset coladd. */ | |
2058 if (gchar_cursor() != NUL) | |
2059 curwin->w_cursor.coladd = 0; | |
2060 } | |
2061 #endif | |
6826 | 2062 (void)del_bytes((long)n, !virtual_op, |
2063 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
7 | 2064 } |
2065 else /* delete characters between lines */ | |
2066 { | |
2067 pos_T curpos; | |
2068 | |
2069 /* save deleted and changed lines for undo */ | |
2070 if (u_save((linenr_T)(curwin->w_cursor.lnum - 1), | |
2071 (linenr_T)(curwin->w_cursor.lnum + oap->line_count)) == FAIL) | |
2072 return FAIL; | |
2073 | |
2074 truncate_line(TRUE); /* delete from cursor to end of line */ | |
2075 | |
2076 curpos = curwin->w_cursor; /* remember curwin->w_cursor */ | |
2077 ++curwin->w_cursor.lnum; | |
2078 del_lines((long)(oap->line_count - 2), FALSE); | |
2079 | |
6826 | 2080 /* delete from start of line until op_end */ |
2957 | 2081 n = (oap->end.col + 1 - !oap->inclusive); |
6826 | 2082 curwin->w_cursor.col = 0; |
2083 (void)del_bytes((long)n, !virtual_op, | |
2084 oap->op_type == OP_DELETE && !oap->is_VIsual); | |
2085 curwin->w_cursor = curpos; /* restore curwin->w_cursor */ | |
2086 (void)do_join(2, FALSE, FALSE, FALSE, FALSE); | |
7 | 2087 } |
2088 } | |
2089 | |
2090 msgmore(curbuf->b_ml.ml_line_count - old_lcount); | |
2091 | |
446 | 2092 #ifdef FEAT_VIRTUALEDIT |
2093 setmarks: | |
2094 #endif | |
7 | 2095 if (oap->block_mode) |
2096 { | |
2097 curbuf->b_op_end.lnum = oap->end.lnum; | |
2098 curbuf->b_op_end.col = oap->start.col; | |
2099 } | |
2100 else | |
2101 curbuf->b_op_end = oap->start; | |
2102 curbuf->b_op_start = oap->start; | |
2103 | |
2104 return OK; | |
2105 } | |
2106 | |
2107 #ifdef FEAT_MBYTE | |
2108 /* | |
2109 * Adjust end of operating area for ending on a multi-byte character. | |
2110 * Used for deletion. | |
2111 */ | |
2112 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2113 mb_adjust_opend(oparg_T *oap) |
7 | 2114 { |
2115 char_u *p; | |
2116 | |
2117 if (oap->inclusive) | |
2118 { | |
2119 p = ml_get(oap->end.lnum); | |
2120 oap->end.col += mb_tail_off(p, p + oap->end.col); | |
2121 } | |
2122 } | |
2123 #endif | |
2124 | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2125 |
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2126 #ifdef FEAT_MBYTE |
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
|
2127 /* |
12bdbf9f7e20
patch 8.1.0125: virtual edit replace with multi-byte fails at end of line
Christian Brabandt <cb@256bit.org>
parents:
14202
diff
changeset
|
2128 * 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
|
2129 * 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
|
2130 */ |
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
|
2131 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
|
2132 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
|
2133 { |
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
|
2134 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
|
2135 |
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 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
|
2137 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
|
2138 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
|
2139 /* 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
|
2140 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
|
2141 } |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2142 #endif |
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2143 |
7 | 2144 /* |
2145 * Replace a whole area with one character. | |
2146 */ | |
2147 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2148 op_replace(oparg_T *oap, int c) |
7 | 2149 { |
2150 int n, numc; | |
2151 #ifdef FEAT_MBYTE | |
2152 int num_chars; | |
2153 #endif | |
2154 char_u *newp, *oldp; | |
2155 size_t oldlen; | |
2156 struct block_def bd; | |
5428 | 2157 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
|
2158 int had_ctrl_v_cr = FALSE; |
7 | 2159 |
2160 if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) | |
2161 return OK; /* nothing to do */ | |
2162 | |
13202
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2163 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
|
2164 { |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2165 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
|
2166 c = CAR; |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2167 } |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2168 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
|
2169 { |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2170 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
|
2171 c = NL; |
2941a86f8aaa
patch 8.0.1475: invalid memory access in read_redo()
Christian Brabandt <cb@256bit.org>
parents:
13072
diff
changeset
|
2172 } |
5428 | 2173 |
7 | 2174 #ifdef FEAT_MBYTE |
2175 if (has_mbyte) | |
2176 mb_adjust_opend(oap); | |
2177 #endif | |
2178 | |
2179 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2180 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2181 return FAIL; | |
2182 | |
2183 /* | |
2184 * block mode replace | |
2185 */ | |
2186 if (oap->block_mode) | |
2187 { | |
2188 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2189 for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) | |
2190 { | |
1982 | 2191 curwin->w_cursor.col = 0; /* make sure cursor position is valid */ |
7 | 2192 block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); |
2193 if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) | |
2194 continue; /* nothing to replace */ | |
2195 | |
2196 /* n == number of extra chars required | |
2197 * If we split a TAB, it may be replaced by several characters. | |
2198 * Thus the number of characters may increase! | |
2199 */ | |
2200 #ifdef FEAT_VIRTUALEDIT | |
2201 /* If the range starts in virtual space, count the initial | |
2202 * coladd offset as part of "startspaces" */ | |
2203 if (virtual_op && bd.is_short && *bd.textstart == NUL) | |
2204 { | |
2205 pos_T vpos; | |
2206 | |
1982 | 2207 vpos.lnum = curwin->w_cursor.lnum; |
7 | 2208 getvpos(&vpos, oap->start_vcol); |
2209 bd.startspaces += vpos.coladd; | |
2210 n = bd.startspaces; | |
2211 } | |
2212 else | |
2213 #endif | |
2214 /* allow for pre spaces */ | |
2215 n = (bd.startspaces ? bd.start_char_vcols - 1 : 0); | |
2216 | |
2217 /* allow for post spp */ | |
2218 n += (bd.endspaces | |
2219 #ifdef FEAT_VIRTUALEDIT | |
2220 && !bd.is_oneChar | |
2221 #endif | |
2222 && bd.end_char_vcols > 0) ? bd.end_char_vcols - 1 : 0; | |
2223 /* Figure out how many characters to replace. */ | |
2224 numc = oap->end_vcol - oap->start_vcol + 1; | |
2225 if (bd.is_short && (!virtual_op || bd.is_MAX)) | |
2226 numc -= (oap->end_vcol - bd.end_vcol) + 1; | |
2227 | |
2228 #ifdef FEAT_MBYTE | |
2229 /* A double-wide character can be replaced only up to half the | |
2230 * times. */ | |
2231 if ((*mb_char2cells)(c) > 1) | |
2232 { | |
2233 if ((numc & 1) && !bd.is_short) | |
2234 { | |
2235 ++bd.endspaces; | |
2236 ++n; | |
2237 } | |
2238 numc = numc / 2; | |
2239 } | |
2240 | |
2241 /* Compute bytes needed, move character count to num_chars. */ | |
2242 num_chars = numc; | |
2243 numc *= (*mb_char2len)(c); | |
2244 #endif | |
2245 /* oldlen includes textlen, so don't double count */ | |
2246 n += numc - bd.textlen; | |
2247 | |
2248 oldp = ml_get_curline(); | |
2249 oldlen = STRLEN(oldp); | |
2250 newp = alloc_check((unsigned)oldlen + 1 + n); | |
2251 if (newp == NULL) | |
2252 continue; | |
2253 vim_memset(newp, NUL, (size_t)(oldlen + 1 + n)); | |
2254 /* copy up to deleted part */ | |
2255 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2256 oldp += bd.textcol + bd.textlen; | |
2257 /* insert pre-spaces */ | |
6929 | 2258 vim_memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); |
7 | 2259 /* 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
|
2260 /* 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
|
2261 * literally. */ |
5428 | 2262 if (had_ctrl_v_cr || (c != '\r' && c != '\n')) |
7 | 2263 { |
5428 | 2264 #ifdef FEAT_MBYTE |
2265 if (has_mbyte) | |
2266 { | |
2267 n = (int)STRLEN(newp); | |
2268 while (--num_chars >= 0) | |
2269 n += (*mb_char2bytes)(c, newp + n); | |
2270 } | |
2271 else | |
2272 #endif | |
6929 | 2273 vim_memset(newp + STRLEN(newp), c, (size_t)numc); |
5428 | 2274 if (!bd.is_short) |
2275 { | |
2276 /* insert post-spaces */ | |
6929 | 2277 vim_memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces); |
5428 | 2278 /* copy the part after the changed part */ |
2279 STRMOVE(newp + STRLEN(newp), oldp); | |
2280 } | |
7 | 2281 } |
2282 else | |
2283 { | |
5428 | 2284 /* Replacing with \r or \n means splitting the line. */ |
5475 | 2285 after_p = alloc_check( |
2286 (unsigned)(oldlen + 1 + n - STRLEN(newp))); | |
5428 | 2287 if (after_p != NULL) |
2288 STRMOVE(after_p, oldp); | |
7 | 2289 } |
2290 /* replace the line */ | |
2291 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
5428 | 2292 if (after_p != NULL) |
2293 { | |
2294 ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE); | |
2295 appended_lines_mark(curwin->w_cursor.lnum, 1L); | |
2296 oap->end.lnum++; | |
2297 vim_free(after_p); | |
2298 } | |
7 | 2299 } |
2300 } | |
2301 else | |
2302 { | |
2303 /* | |
2304 * MCHAR and MLINE motion replace. | |
2305 */ | |
2306 if (oap->motion_type == MLINE) | |
2307 { | |
2308 oap->start.col = 0; | |
2309 curwin->w_cursor.col = 0; | |
2310 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2311 if (oap->end.col) | |
2312 --oap->end.col; | |
2313 } | |
2314 else if (!oap->inclusive) | |
2315 dec(&(oap->end)); | |
2316 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2317 while (LTOREQ_POS(curwin->w_cursor, oap->end)) |
7 | 2318 { |
2319 n = gchar_cursor(); | |
2320 if (n != NUL) | |
2321 { | |
2322 #ifdef FEAT_MBYTE | |
2323 if ((*mb_char2len)(c) > 1 || (*mb_char2len)(n) > 1) | |
2324 { | |
2325 /* This is slow, but it handles replacing a single-byte | |
2326 * with a multi-byte and the other way around. */ | |
4203 | 2327 if (curwin->w_cursor.lnum == oap->end.lnum) |
2328 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
|
2329 replace_character(c); |
7 | 2330 } |
2331 else | |
2332 #endif | |
2333 { | |
2334 #ifdef FEAT_VIRTUALEDIT | |
2335 if (n == TAB) | |
2336 { | |
2337 int end_vcol = 0; | |
2338 | |
2339 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2340 { | |
2341 /* oap->end has to be recalculated when | |
2342 * the tab breaks */ | |
2343 end_vcol = getviscol2(oap->end.col, | |
2344 oap->end.coladd); | |
2345 } | |
2346 coladvance_force(getviscol()); | |
2347 if (curwin->w_cursor.lnum == oap->end.lnum) | |
2348 getvpos(&oap->end, end_vcol); | |
2349 } | |
2350 #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
|
2351 PBYTE(curwin->w_cursor, c); |
7 | 2352 } |
2353 } | |
2354 #ifdef FEAT_VIRTUALEDIT | |
2355 else if (virtual_op && curwin->w_cursor.lnum == oap->end.lnum) | |
2356 { | |
2357 int virtcols = oap->end.coladd; | |
2358 | |
2359 if (curwin->w_cursor.lnum == oap->start.lnum | |
2360 && oap->start.col == oap->end.col && oap->start.coladd) | |
2361 virtcols -= oap->start.coladd; | |
2362 | |
2363 /* oap->end has been trimmed so it's effectively inclusive; | |
2364 * as a result an extra +1 must be counted so we don't | |
2365 * trample the NUL byte. */ | |
2366 coladvance_force(getviscol2(oap->end.col, oap->end.coladd) + 1); | |
2367 curwin->w_cursor.col -= (virtcols + 1); | |
2368 for (; virtcols >= 0; virtcols--) | |
2369 { | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2370 # ifdef FEAT_MBYTE |
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
|
2371 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
|
2372 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
|
2373 else |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2374 # 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
|
2375 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
|
2376 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
|
2377 break; |
7 | 2378 } |
2379 } | |
2380 #endif | |
2381 | |
2382 /* Advance to next character, stop at the end of the file. */ | |
2383 if (inc_cursor() == -1) | |
2384 break; | |
2385 } | |
2386 } | |
2387 | |
2388 curwin->w_cursor = oap->start; | |
2389 check_cursor(); | |
2390 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, 0L); | |
2391 | |
2392 /* Set "'[" and "']" marks. */ | |
2393 curbuf->b_op_start = oap->start; | |
2394 curbuf->b_op_end = oap->end; | |
2395 | |
2396 return OK; | |
2397 } | |
2398 | |
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7576
diff
changeset
|
2399 static int swapchars(int op_type, pos_T *pos, int length); |
1525 | 2400 |
7 | 2401 /* |
2402 * Handle the (non-standard vi) tilde operator. Also for "gu", "gU" and "g?". | |
2403 */ | |
2404 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2405 op_tilde(oparg_T *oap) |
7 | 2406 { |
2407 pos_T pos; | |
2408 struct block_def bd; | |
1528 | 2409 int did_change = FALSE; |
7 | 2410 |
2411 if (u_save((linenr_T)(oap->start.lnum - 1), | |
2412 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
2413 return; | |
2414 | |
2415 pos = oap->start; | |
2416 if (oap->block_mode) /* Visual block mode */ | |
2417 { | |
2418 for (; pos.lnum <= oap->end.lnum; ++pos.lnum) | |
2419 { | |
1766 | 2420 int one_change; |
2421 | |
7 | 2422 block_prep(oap, &bd, pos.lnum, FALSE); |
2423 pos.col = bd.textcol; | |
1766 | 2424 one_change = swapchars(oap->op_type, &pos, bd.textlen); |
2425 did_change |= one_change; | |
1525 | 2426 |
5735 | 2427 #ifdef FEAT_NETBEANS_INTG |
2210 | 2428 if (netbeans_active() && one_change) |
7 | 2429 { |
2430 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2431 | |
33 | 2432 netbeans_removed(curbuf, pos.lnum, bd.textcol, |
2433 (long)bd.textlen); | |
7 | 2434 netbeans_inserted(curbuf, pos.lnum, bd.textcol, |
2210 | 2435 &ptr[bd.textcol], bd.textlen); |
7 | 2436 } |
5735 | 2437 #endif |
7 | 2438 } |
2439 if (did_change) | |
2440 changed_lines(oap->start.lnum, 0, oap->end.lnum + 1, 0L); | |
2441 } | |
2442 else /* not block mode */ | |
2443 { | |
2444 if (oap->motion_type == MLINE) | |
2445 { | |
2446 oap->start.col = 0; | |
2447 pos.col = 0; | |
2448 oap->end.col = (colnr_T)STRLEN(ml_get(oap->end.lnum)); | |
2449 if (oap->end.col) | |
2450 --oap->end.col; | |
2451 } | |
2452 else if (!oap->inclusive) | |
2453 dec(&(oap->end)); | |
2454 | |
1528 | 2455 if (pos.lnum == oap->end.lnum) |
2456 did_change = swapchars(oap->op_type, &pos, | |
2457 oap->end.col - pos.col + 1); | |
2458 else | |
2459 for (;;) | |
2460 { | |
2461 did_change |= swapchars(oap->op_type, &pos, | |
2462 pos.lnum == oap->end.lnum ? oap->end.col + 1: | |
2463 (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
|
2464 if (LTOREQ_POS(oap->end, pos) || inc(&pos) == -1) |
1528 | 2465 break; |
2466 } | |
7 | 2467 if (did_change) |
2468 { | |
2469 changed_lines(oap->start.lnum, oap->start.col, oap->end.lnum + 1, | |
2470 0L); | |
2471 #ifdef FEAT_NETBEANS_INTG | |
2210 | 2472 if (netbeans_active() && did_change) |
7 | 2473 { |
2474 char_u *ptr; | |
2475 int count; | |
2476 | |
2477 pos = oap->start; | |
2478 while (pos.lnum < oap->end.lnum) | |
2479 { | |
2480 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
835 | 2481 count = (int)STRLEN(ptr) - pos.col; |
33 | 2482 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2483 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2484 &ptr[pos.col], count); |
7 | 2485 pos.col = 0; |
2486 pos.lnum++; | |
2487 } | |
2488 ptr = ml_get_buf(curbuf, pos.lnum, FALSE); | |
2489 count = oap->end.col - pos.col + 1; | |
33 | 2490 netbeans_removed(curbuf, pos.lnum, pos.col, (long)count); |
7 | 2491 netbeans_inserted(curbuf, pos.lnum, pos.col, |
2210 | 2492 &ptr[pos.col], count); |
7 | 2493 } |
2494 #endif | |
2495 } | |
2496 } | |
2497 | |
2498 if (!did_change && oap->is_VIsual) | |
2499 /* No change: need to remove the Visual selection */ | |
2500 redraw_curbuf_later(INVERTED); | |
2501 | |
2502 /* | |
2503 * Set '[ and '] marks. | |
2504 */ | |
2505 curbuf->b_op_start = oap->start; | |
2506 curbuf->b_op_end = oap->end; | |
2507 | |
2508 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
|
2509 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
|
2510 oap->line_count), oap->line_count); |
7 | 2511 } |
2512 | |
2513 /* | |
1525 | 2514 * Invoke swapchar() on "length" bytes at position "pos". |
2515 * "pos" is advanced to just after the changed characters. | |
2516 * "length" is rounded up to include the whole last multi-byte character. | |
2517 * Also works correctly when the number of bytes changes. | |
2518 * Returns TRUE if some character was changed. | |
2519 */ | |
2520 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2521 swapchars(int op_type, pos_T *pos, int length) |
1525 | 2522 { |
2523 int todo; | |
2524 int did_change = 0; | |
2525 | |
2526 for (todo = length; todo > 0; --todo) | |
2527 { | |
2528 # ifdef FEAT_MBYTE | |
2529 if (has_mbyte) | |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2530 { |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2531 int len = (*mb_ptr2len)(ml_get_pos(pos)); |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2532 |
1525 | 2533 /* we're counting bytes, not characters */ |
5288
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2534 if (len > 0) |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2535 todo -= len - 1; |
46cf49cc9289
updated for version 7.4b.020
Bram Moolenaar <bram@vim.org>
parents:
5245
diff
changeset
|
2536 } |
1525 | 2537 # endif |
2538 did_change |= swapchar(op_type, pos); | |
2539 if (inc(pos) == -1) /* at end of file */ | |
2540 break; | |
2541 } | |
2542 return did_change; | |
2543 } | |
2544 | |
2545 /* | |
7 | 2546 * If op_type == OP_UPPER: make uppercase, |
2547 * if op_type == OP_LOWER: make lowercase, | |
2548 * if op_type == OP_ROT13: do rot13 encoding, | |
2549 * else swap case of character at 'pos' | |
2550 * returns TRUE when something actually changed. | |
2551 */ | |
2552 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2553 swapchar(int op_type, pos_T *pos) |
7 | 2554 { |
2555 int c; | |
2556 int nc; | |
2557 | |
2558 c = gchar_pos(pos); | |
2559 | |
2560 /* Only do rot13 encoding for ASCII characters. */ | |
2561 if (c >= 0x80 && op_type == OP_ROT13) | |
2562 return FALSE; | |
2563 | |
2564 #ifdef FEAT_MBYTE | |
1525 | 2565 if (op_type == OP_UPPER && c == 0xdf |
2566 && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) | |
493 | 2567 { |
2568 pos_T sp = curwin->w_cursor; | |
2569 | |
2570 /* Special handling of German sharp s: change to "SS". */ | |
2571 curwin->w_cursor = *pos; | |
2572 del_char(FALSE); | |
2573 ins_char('S'); | |
2574 ins_char('S'); | |
2575 curwin->w_cursor = sp; | |
2576 inc(pos); | |
2577 } | |
2578 | |
7 | 2579 if (enc_dbcs != 0 && c >= 0x100) /* No lower/uppercase letter */ |
2580 return FALSE; | |
2581 #endif | |
2582 nc = c; | |
2583 if (MB_ISLOWER(c)) | |
2584 { | |
2585 if (op_type == OP_ROT13) | |
2586 nc = ROT13(c, 'a'); | |
2587 else if (op_type != OP_LOWER) | |
2588 nc = MB_TOUPPER(c); | |
2589 } | |
2590 else if (MB_ISUPPER(c)) | |
2591 { | |
2592 if (op_type == OP_ROT13) | |
2593 nc = ROT13(c, 'A'); | |
2594 else if (op_type != OP_UPPER) | |
2595 nc = MB_TOLOWER(c); | |
2596 } | |
2597 if (nc != c) | |
2598 { | |
2599 #ifdef FEAT_MBYTE | |
2600 if (enc_utf8 && (c >= 0x80 || nc >= 0x80)) | |
2601 { | |
2602 pos_T sp = curwin->w_cursor; | |
2603 | |
2604 curwin->w_cursor = *pos; | |
2451
0b8612c2814d
Fix: changing case of a character removed combining characters.
Bram Moolenaar <bram@vim.org>
parents:
2446
diff
changeset
|
2605 /* 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
|
2606 del_bytes(utf_ptr2len(ml_get_cursor()), FALSE, FALSE); |
7 | 2607 ins_char(nc); |
2608 curwin->w_cursor = sp; | |
2609 } | |
2610 else | |
2611 #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
|
2612 PBYTE(*pos, nc); |
7 | 2613 return TRUE; |
2614 } | |
2615 return FALSE; | |
2616 } | |
2617 | |
2618 /* | |
2619 * op_insert - Insert and append operators for Visual mode. | |
2620 */ | |
2621 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2622 op_insert(oparg_T *oap, long count1) |
7 | 2623 { |
2624 long ins_len, pre_textlen = 0; | |
2625 char_u *firstline, *ins_text; | |
12329
0b10cff73322
patch 8.0.1044: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12327
diff
changeset
|
2626 colnr_T ind_pre = 0, ind_post; |
7 | 2627 struct block_def bd; |
2628 int i; | |
6579 | 2629 pos_T t1; |
7 | 2630 |
2631 /* edit() changes this - record it for OP_APPEND */ | |
2632 bd.is_MAX = (curwin->w_curswant == MAXCOL); | |
2633 | |
2634 /* vis block is still marked. Get rid of it now. */ | |
2635 curwin->w_cursor.lnum = oap->start.lnum; | |
2636 update_screen(INVERTED); | |
2637 | |
2638 if (oap->block_mode) | |
2639 { | |
2640 #ifdef FEAT_VIRTUALEDIT | |
2641 /* When 'virtualedit' is used, need to insert the extra spaces before | |
2642 * doing block_prep(). When only "block" is used, virtual edit is | |
2643 * already disabled, but still need it when calling | |
2644 * coladvance_force(). */ | |
2645 if (curwin->w_cursor.coladd > 0) | |
2646 { | |
2647 int old_ve_flags = ve_flags; | |
2648 | |
2649 ve_flags = VE_ALL; | |
2650 if (u_save_cursor() == FAIL) | |
2651 return; | |
2652 coladvance_force(oap->op_type == OP_APPEND | |
2653 ? oap->end_vcol + 1 : getviscol()); | |
2654 if (oap->op_type == OP_APPEND) | |
2655 --curwin->w_cursor.col; | |
2656 ve_flags = old_ve_flags; | |
2657 } | |
2658 #endif | |
2659 /* Get the info about the block before entering the text */ | |
2660 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
|
2661 /* 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
|
2662 ind_pre = (colnr_T)getwhitecols_curline(); |
7 | 2663 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
|
2664 |
7 | 2665 if (oap->op_type == OP_APPEND) |
2666 firstline += bd.textlen; | |
2667 pre_textlen = (long)STRLEN(firstline); | |
2668 } | |
2669 | |
2670 if (oap->op_type == OP_APPEND) | |
2671 { | |
2672 if (oap->block_mode | |
2673 #ifdef FEAT_VIRTUALEDIT | |
2674 && curwin->w_cursor.coladd == 0 | |
2675 #endif | |
2676 ) | |
2677 { | |
2678 /* Move the cursor to the character right of the block. */ | |
2679 curwin->w_set_curswant = TRUE; | |
2680 while (*ml_get_cursor() != NUL | |
2681 && (curwin->w_cursor.col < bd.textcol + bd.textlen)) | |
2682 ++curwin->w_cursor.col; | |
2683 if (bd.is_short && !bd.is_MAX) | |
2684 { | |
2685 /* First line was too short, make it longer and adjust the | |
2686 * values in "bd". */ | |
2687 if (u_save_cursor() == FAIL) | |
2688 return; | |
2689 for (i = 0; i < bd.endspaces; ++i) | |
2690 ins_char(' '); | |
2691 bd.textlen += bd.endspaces; | |
2692 } | |
2693 } | |
2694 else | |
2695 { | |
2696 curwin->w_cursor = oap->end; | |
893 | 2697 check_cursor_col(); |
7 | 2698 |
2699 /* 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
|
2700 if (!LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2701 && oap->start_vcol != oap->end_vcol) |
2702 inc_cursor(); | |
2703 } | |
2704 } | |
2705 | |
6579 | 2706 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
|
2707 (void)edit(NUL, FALSE, (linenr_T)count1); |
7 | 2708 |
6579 | 2709 /* When a tab was inserted, and the characters in front of the tab |
2710 * have been converted to a tab as well, the column of the cursor | |
2711 * might have actually been reduced, so need to adjust here. */ | |
2712 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
|
2713 && LT_POS(curbuf->b_op_start_orig, t1)) |
6579 | 2714 oap->start = curbuf->b_op_start_orig; |
2715 | |
1477 | 2716 /* If user has moved off this line, we don't know what to do, so do |
2717 * nothing. | |
2718 * Also don't repeat the insert when Insert mode ended with CTRL-C. */ | |
2719 if (curwin->w_cursor.lnum != oap->start.lnum || got_int) | |
7 | 2720 return; |
2721 | |
2722 if (oap->block_mode) | |
2723 { | |
2724 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
|
2725 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
|
2726 size_t len; |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2727 int add; |
7 | 2728 |
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2729 /* 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
|
2730 * 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
|
2731 ind_post = (colnr_T)getwhitecols_curline(); |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2732 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
|
2733 { |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2734 bd.textcol += ind_post - ind_pre; |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2735 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
|
2736 did_indent = TRUE; |
12327
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2737 } |
17ed65e87db1
patch 8.0.1043: warning for uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
2738 |
5471 | 2739 /* 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
|
2740 * 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
|
2741 * 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
|
2742 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
|
2743 && !bd.is_MAX && !did_indent) |
5471 | 2744 { |
2745 if (oap->op_type == OP_INSERT | |
5730 | 2746 && oap->start.col |
2747 #ifdef FEAT_VIRTUALEDIT | |
2748 + oap->start.coladd | |
2749 #endif | |
2750 != curbuf->b_op_start_orig.col | |
2751 #ifdef FEAT_VIRTUALEDIT | |
2752 + curbuf->b_op_start_orig.coladd | |
2753 #endif | |
2754 ) | |
5471 | 2755 { |
6579 | 2756 int t = getviscol2(curbuf->b_op_start_orig.col, |
2757 curbuf->b_op_start_orig.coladd); | |
5680 | 2758 oap->start.col = curbuf->b_op_start_orig.col; |
6579 | 2759 pre_textlen -= t - oap->start_vcol; |
2760 oap->start_vcol = t; | |
5471 | 2761 } |
2762 else if (oap->op_type == OP_APPEND | |
5730 | 2763 && oap->end.col |
2764 #ifdef FEAT_VIRTUALEDIT | |
2765 + oap->end.coladd | |
2766 #endif | |
2767 >= curbuf->b_op_start_orig.col | |
2768 #ifdef FEAT_VIRTUALEDIT | |
2769 + curbuf->b_op_start_orig.coladd | |
2770 #endif | |
2771 ) | |
5471 | 2772 { |
6579 | 2773 int t = getviscol2(curbuf->b_op_start_orig.col, |
2774 curbuf->b_op_start_orig.coladd); | |
5680 | 2775 oap->start.col = curbuf->b_op_start_orig.col; |
5471 | 2776 /* reset pre_textlen to the value of OP_INSERT */ |
2777 pre_textlen += bd.textlen; | |
6579 | 2778 pre_textlen -= t - oap->start_vcol; |
2779 oap->start_vcol = t; | |
5471 | 2780 oap->op_type = OP_INSERT; |
2781 } | |
2782 } | |
2783 | |
7 | 2784 /* |
2785 * Spaces and tabs in the indent may have changed to other spaces and | |
1392 | 2786 * tabs. Get the starting column again and correct the length. |
7 | 2787 * Don't do this when "$" used, end-of-line will have changed. |
2788 */ | |
2789 block_prep(oap, &bd2, oap->start.lnum, TRUE); | |
2790 if (!bd.is_MAX || bd2.textlen < bd.textlen) | |
2791 { | |
2792 if (oap->op_type == OP_APPEND) | |
2793 { | |
2794 pre_textlen += bd2.textlen - bd.textlen; | |
2795 if (bd2.endspaces) | |
2796 --bd2.textlen; | |
2797 } | |
2798 bd.textcol = bd2.textcol; | |
2799 bd.textlen = bd2.textlen; | |
2800 } | |
2801 | |
2802 /* | |
2803 * Subsequent calls to ml_get() flush the firstline data - take a | |
2804 * copy of the required string. | |
2805 */ | |
13814
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2806 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
|
2807 len = STRLEN(firstline); |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2808 add = bd.textcol; |
7 | 2809 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
|
2810 add += bd.textlen; |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2811 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
|
2812 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
|
2813 else |
7ed76dcf0d94
patch 8.0.1779: deleting in a block selection causes problems
Christian Brabandt <cb@256bit.org>
parents:
13620
diff
changeset
|
2814 firstline += add; |
3421 | 2815 if (pre_textlen >= 0 |
2816 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) | |
7 | 2817 { |
2818 ins_text = vim_strnsave(firstline, (int)ins_len); | |
2819 if (ins_text != NULL) | |
2820 { | |
2821 /* block handled here */ | |
2822 if (u_save(oap->start.lnum, | |
2823 (linenr_T)(oap->end.lnum + 1)) == OK) | |
2824 block_insert(oap, ins_text, (oap->op_type == OP_INSERT), | |
2825 &bd); | |
2826 | |
2827 curwin->w_cursor.col = oap->start.col; | |
2828 check_cursor(); | |
2829 vim_free(ins_text); | |
2830 } | |
2831 } | |
2832 } | |
2833 } | |
2834 | |
2835 /* | |
2836 * op_change - handle a change operation | |
2837 * | |
2838 * return TRUE if edit() returns because of a CTRL-O command | |
2839 */ | |
2840 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2841 op_change(oparg_T *oap) |
7 | 2842 { |
2843 colnr_T l; | |
2844 int retval; | |
2845 long offset; | |
2846 linenr_T linenr; | |
1392 | 2847 long ins_len; |
2848 long pre_textlen = 0; | |
2849 long pre_indent = 0; | |
7 | 2850 char_u *firstline; |
2851 char_u *ins_text, *newp, *oldp; | |
2852 struct block_def bd; | |
2853 | |
2854 l = oap->start.col; | |
2855 if (oap->motion_type == MLINE) | |
2856 { | |
2857 l = 0; | |
2858 #ifdef FEAT_SMARTINDENT | |
2859 if (!p_paste && curbuf->b_p_si | |
2860 # ifdef FEAT_CINDENT | |
2861 && !curbuf->b_p_cin | |
2862 # endif | |
2863 ) | |
2864 can_si = TRUE; /* It's like opening a new line, do si */ | |
2865 #endif | |
2866 } | |
2867 | |
2868 /* First delete the text in the region. In an empty buffer only need to | |
2869 * save for undo */ | |
2870 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
2871 { | |
2872 if (u_save_cursor() == FAIL) | |
2873 return FALSE; | |
2874 } | |
2875 else if (op_delete(oap) == FAIL) | |
2876 return FALSE; | |
2877 | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
2878 if ((l > curwin->w_cursor.col) && !LINEEMPTY(curwin->w_cursor.lnum) |
7 | 2879 && !virtual_op) |
2880 inc_cursor(); | |
2881 | |
2882 /* check for still on same line (<CR> in inserted text meaningless) */ | |
2883 /* skip blank lines too */ | |
2884 if (oap->block_mode) | |
2885 { | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2886 #ifdef FEAT_VIRTUALEDIT |
7 | 2887 /* Add spaces before getting the current line length. */ |
2888 if (virtual_op && (curwin->w_cursor.coladd > 0 | |
2889 || gchar_cursor() == NUL)) | |
2890 coladvance_force(getviscol()); | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2891 #endif |
1392 | 2892 firstline = ml_get(oap->start.lnum); |
2893 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
|
2894 pre_indent = (long)getwhitecols(firstline); |
7 | 2895 bd.textcol = curwin->w_cursor.col; |
2896 } | |
2897 | |
2898 #if defined(FEAT_LISP) || defined(FEAT_CINDENT) | |
2899 if (oap->motion_type == MLINE) | |
2900 fix_indent(); | |
2901 #endif | |
2902 | |
2903 retval = edit(NUL, FALSE, (linenr_T)1); | |
2904 | |
2905 /* | |
39 | 2906 * In Visual block mode, handle copying the new text to all lines of the |
7 | 2907 * block. |
1477 | 2908 * Don't repeat the insert when Insert mode ended with CTRL-C. |
7 | 2909 */ |
1477 | 2910 if (oap->block_mode && oap->start.lnum != oap->end.lnum && !got_int) |
7 | 2911 { |
1392 | 2912 /* Auto-indenting may have changed the indent. If the cursor was past |
2913 * the indent, exclude that indent change from the inserted text. */ | |
7 | 2914 firstline = ml_get(oap->start.lnum); |
1403 | 2915 if (bd.textcol > (colnr_T)pre_indent) |
7 | 2916 { |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
2917 long new_indent = (long)getwhitecols(firstline); |
1392 | 2918 |
2919 pre_textlen += new_indent - pre_indent; | |
2920 bd.textcol += new_indent - pre_indent; | |
2921 } | |
2922 | |
2923 ins_len = (long)STRLEN(firstline) - pre_textlen; | |
2924 if (ins_len > 0) | |
2925 { | |
2926 /* Subsequent calls to ml_get() flush the firstline data - take a | |
2927 * copy of the inserted text. */ | |
7 | 2928 if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL) |
2929 { | |
419 | 2930 vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len); |
7 | 2931 for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum; |
2932 linenr++) | |
2933 { | |
2934 block_prep(oap, &bd, linenr, TRUE); | |
2935 if (!bd.is_short || virtual_op) | |
2936 { | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2937 #ifdef FEAT_VIRTUALEDIT |
7 | 2938 pos_T vpos; |
2939 | |
2940 /* If the block starts in virtual space, count the | |
2941 * initial coladd offset as part of "startspaces" */ | |
2942 if (bd.is_short) | |
2943 { | |
1982 | 2944 vpos.lnum = linenr; |
7 | 2945 (void)getvpos(&vpos, oap->start_vcol); |
2946 } | |
2947 else | |
2948 vpos.coladd = 0; | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2949 #endif |
7 | 2950 oldp = ml_get(linenr); |
2951 newp = alloc_check((unsigned)(STRLEN(oldp) | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2952 #ifdef FEAT_VIRTUALEDIT |
7 | 2953 + vpos.coladd |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2954 #endif |
7 | 2955 + ins_len + 1)); |
2956 if (newp == NULL) | |
2957 continue; | |
2958 /* copy up to block start */ | |
2959 mch_memmove(newp, oldp, (size_t)bd.textcol); | |
2960 offset = bd.textcol; | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2961 #ifdef FEAT_VIRTUALEDIT |
6929 | 2962 vim_memset(newp + offset, ' ', (size_t)vpos.coladd); |
7 | 2963 offset += vpos.coladd; |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
2964 #endif |
7 | 2965 mch_memmove(newp + offset, ins_text, (size_t)ins_len); |
2966 offset += ins_len; | |
2967 oldp += bd.textcol; | |
1622 | 2968 STRMOVE(newp + offset, oldp); |
7 | 2969 ml_replace(linenr, newp, FALSE); |
2970 } | |
2971 } | |
2972 check_cursor(); | |
2973 | |
2974 changed_lines(oap->start.lnum + 1, 0, oap->end.lnum + 1, 0L); | |
2975 } | |
2976 vim_free(ins_text); | |
2977 } | |
2978 } | |
2979 | |
2980 return retval; | |
2981 } | |
2982 | |
2983 /* | |
2984 * set all the yank registers to empty (called from main()) | |
2985 */ | |
2986 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2987 init_yank(void) |
7 | 2988 { |
2989 int i; | |
2990 | |
2991 for (i = 0; i < NUM_REGISTERS; ++i) | |
2992 y_regs[i].y_array = NULL; | |
2993 } | |
2994 | |
356 | 2995 #if defined(EXITFREE) || defined(PROTO) |
2996 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2997 clear_registers(void) |
356 | 2998 { |
2999 int i; | |
3000 | |
3001 for (i = 0; i < NUM_REGISTERS; ++i) | |
3002 { | |
3003 y_current = &y_regs[i]; | |
3004 if (y_current->y_array != NULL) | |
3005 free_yank_all(); | |
3006 } | |
3007 } | |
3008 #endif | |
3009 | |
7 | 3010 /* |
3011 * Free "n" lines from the current yank register. | |
3012 * Called for normal freeing and in case of error. | |
3013 */ | |
3014 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3015 free_yank(long n) |
7 | 3016 { |
3017 if (y_current->y_array != NULL) | |
3018 { | |
3019 long i; | |
3020 | |
3021 for (i = n; --i >= 0; ) | |
3022 { | |
3023 #ifdef AMIGA /* only for very slow machines */ | |
3024 if ((i & 1023) == 1023) /* this may take a while */ | |
3025 { | |
3026 /* | |
3027 * This message should never cause a hit-return message. | |
3028 * Overwrite this message with any next message. | |
3029 */ | |
3030 ++no_wait_return; | |
3031 smsg((char_u *)_("freeing %ld lines"), i + 1); | |
3032 --no_wait_return; | |
3033 msg_didout = FALSE; | |
3034 msg_col = 0; | |
3035 } | |
3036 #endif | |
3037 vim_free(y_current->y_array[i]); | |
3038 } | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
3039 VIM_CLEAR(y_current->y_array); |
7 | 3040 #ifdef AMIGA |
3041 if (n >= 1000) | |
3042 MSG(""); | |
3043 #endif | |
3044 } | |
3045 } | |
3046 | |
3047 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3048 free_yank_all(void) |
7 | 3049 { |
3050 free_yank(y_current->y_size); | |
3051 } | |
3052 | |
3053 /* | |
3054 * Yank the text between "oap->start" and "oap->end" into a yank register. | |
3055 * If we are to append (uppercase register), we first yank into a new yank | |
3056 * register and then concatenate the old and the new one (so we keep the old | |
3057 * one in case of out-of-memory). | |
3058 * | |
5245
8c6615a30951
updated for version 7.4a.047
Bram Moolenaar <bram@vim.org>
parents:
5182
diff
changeset
|
3059 * Return FAIL for failure, OK otherwise. |
7 | 3060 */ |
3061 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3062 op_yank(oparg_T *oap, int deleting, int mess) |
7 | 3063 { |
3064 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
|
3065 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
|
3066 yankreg_T newreg; /* new yank register when appending */ |
7 | 3067 char_u **new_ptr; |
3068 linenr_T lnum; /* current line number */ | |
3069 long j; | |
3070 int yanktype = oap->motion_type; | |
3071 long yanklines = oap->line_count; | |
3072 linenr_T yankendlnum = oap->end.lnum; | |
3073 char_u *p; | |
3074 char_u *pnew; | |
3075 struct block_def bd; | |
2658 | 3076 #if defined(FEAT_CLIPBOARD) && defined(FEAT_X11) |
2654 | 3077 int did_star = FALSE; |
2658 | 3078 #endif |
7 | 3079 |
3080 /* check for read-only register */ | |
3081 if (oap->regname != 0 && !valid_yank_reg(oap->regname, TRUE)) | |
3082 { | |
3083 beep_flush(); | |
3084 return FAIL; | |
3085 } | |
3086 if (oap->regname == '_') /* black hole: nothing to do */ | |
3087 return OK; | |
3088 | |
3089 #ifdef FEAT_CLIPBOARD | |
3090 if (!clip_star.available && oap->regname == '*') | |
3091 oap->regname = 0; | |
3092 else if (!clip_plus.available && oap->regname == '+') | |
3093 oap->regname = 0; | |
3094 #endif | |
3095 | |
3096 if (!deleting) /* op_delete() already set y_current */ | |
3097 get_yank_register(oap->regname, TRUE); | |
3098 | |
3099 curr = y_current; | |
3100 /* append to existing contents */ | |
3101 if (y_append && y_current->y_array != NULL) | |
3102 y_current = &newreg; | |
3103 else | |
3104 free_yank_all(); /* free previously yanked lines */ | |
3105 | |
593 | 3106 /* |
3107 * If the cursor was in column 1 before and after the movement, and the | |
3108 * operator is not inclusive, the yank is always linewise. | |
3109 */ | |
7 | 3110 if ( oap->motion_type == MCHAR |
3111 && oap->start.col == 0 | |
3112 && !oap->inclusive | |
3113 && (!oap->is_VIsual || *p_sel == 'o') | |
50 | 3114 && !oap->block_mode |
7 | 3115 && oap->end.col == 0 |
3116 && yanklines > 1) | |
3117 { | |
3118 yanktype = MLINE; | |
3119 --yankendlnum; | |
3120 --yanklines; | |
3121 } | |
3122 | |
3123 y_current->y_size = yanklines; | |
3124 y_current->y_type = yanktype; /* set the yank register type */ | |
3125 y_current->y_width = 0; | |
3126 y_current->y_array = (char_u **)lalloc_clear((long_u)(sizeof(char_u *) * | |
3127 yanklines), TRUE); | |
3128 if (y_current->y_array == NULL) | |
3129 { | |
3130 y_current = curr; | |
3131 return FAIL; | |
3132 } | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3133 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3134 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
|
3135 #endif |
7 | 3136 |
3137 y_idx = 0; | |
3138 lnum = oap->start.lnum; | |
3139 | |
3140 if (oap->block_mode) | |
3141 { | |
3142 /* Visual block mode */ | |
3143 y_current->y_type = MBLOCK; /* set the yank register type */ | |
3144 y_current->y_width = oap->end_vcol - oap->start_vcol; | |
3145 | |
3146 if (curwin->w_curswant == MAXCOL && y_current->y_width > 0) | |
3147 y_current->y_width--; | |
3148 } | |
3149 | |
3150 for ( ; lnum <= yankendlnum; lnum++, y_idx++) | |
3151 { | |
3152 switch (y_current->y_type) | |
3153 { | |
3154 case MBLOCK: | |
3155 block_prep(oap, &bd, lnum, FALSE); | |
3156 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3157 goto fail; | |
3158 break; | |
3159 | |
3160 case MLINE: | |
3161 if ((y_current->y_array[y_idx] = | |
3162 vim_strsave(ml_get(lnum))) == NULL) | |
3163 goto fail; | |
3164 break; | |
3165 | |
3166 case MCHAR: | |
3167 { | |
3168 colnr_T startcol = 0, endcol = MAXCOL; | |
3169 #ifdef FEAT_VIRTUALEDIT | |
3170 int is_oneChar = FALSE; | |
3171 colnr_T cs, ce; | |
3172 #endif | |
3173 p = ml_get(lnum); | |
3174 bd.startspaces = 0; | |
3175 bd.endspaces = 0; | |
3176 | |
3177 if (lnum == oap->start.lnum) | |
3178 { | |
3179 startcol = oap->start.col; | |
3180 #ifdef FEAT_VIRTUALEDIT | |
3181 if (virtual_op) | |
3182 { | |
3183 getvcol(curwin, &oap->start, &cs, NULL, &ce); | |
3184 if (ce != cs && oap->start.coladd > 0) | |
3185 { | |
3186 /* Part of a tab selected -- but don't | |
3187 * double-count it. */ | |
3188 bd.startspaces = (ce - cs + 1) | |
3189 - oap->start.coladd; | |
3190 startcol++; | |
3191 } | |
3192 } | |
3193 #endif | |
3194 } | |
3195 | |
3196 if (lnum == oap->end.lnum) | |
3197 { | |
3198 endcol = oap->end.col; | |
3199 #ifdef FEAT_VIRTUALEDIT | |
3200 if (virtual_op) | |
3201 { | |
3202 getvcol(curwin, &oap->end, &cs, NULL, &ce); | |
3203 if (p[endcol] == NUL || (cs + oap->end.coladd < ce | |
3204 # ifdef FEAT_MBYTE | |
3205 /* Don't add space for double-wide | |
3206 * char; endcol will be on last byte | |
3207 * of multi-byte char. */ | |
3208 && (*mb_head_off)(p, p + endcol) == 0 | |
3209 # endif | |
3210 )) | |
3211 { | |
3212 if (oap->start.lnum == oap->end.lnum | |
3213 && oap->start.col == oap->end.col) | |
3214 { | |
3215 /* Special case: inside a single char */ | |
3216 is_oneChar = TRUE; | |
3217 bd.startspaces = oap->end.coladd | |
3218 - oap->start.coladd + oap->inclusive; | |
3219 endcol = startcol; | |
3220 } | |
3221 else | |
3222 { | |
3223 bd.endspaces = oap->end.coladd | |
3224 + oap->inclusive; | |
3225 endcol -= oap->inclusive; | |
3226 } | |
3227 } | |
3228 } | |
3229 #endif | |
3230 } | |
3510 | 3231 if (endcol == MAXCOL) |
3232 endcol = (colnr_T)STRLEN(p); | |
7 | 3233 if (startcol > endcol |
3234 #ifdef FEAT_VIRTUALEDIT | |
3235 || is_oneChar | |
3236 #endif | |
3237 ) | |
3238 bd.textlen = 0; | |
3239 else | |
3240 { | |
3241 bd.textlen = endcol - startcol + oap->inclusive; | |
3242 } | |
3243 bd.textstart = p + startcol; | |
3244 if (yank_copy_line(&bd, y_idx) == FAIL) | |
3245 goto fail; | |
3246 break; | |
3247 } | |
3248 /* NOTREACHED */ | |
3249 } | |
3250 } | |
3251 | |
3252 if (curr != y_current) /* append the new block to the old block */ | |
3253 { | |
3254 new_ptr = (char_u **)lalloc((long_u)(sizeof(char_u *) * | |
3255 (curr->y_size + y_current->y_size)), TRUE); | |
3256 if (new_ptr == NULL) | |
3257 goto fail; | |
3258 for (j = 0; j < curr->y_size; ++j) | |
3259 new_ptr[j] = curr->y_array[j]; | |
3260 vim_free(curr->y_array); | |
3261 curr->y_array = new_ptr; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3262 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3263 curr->y_time_set = vim_time(); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3264 #endif |
7 | 3265 |
3266 if (yanktype == MLINE) /* MLINE overrides MCHAR and MBLOCK */ | |
3267 curr->y_type = MLINE; | |
3268 | |
164 | 3269 /* Concatenate the last line of the old block with the first line of |
3270 * the new block, unless being Vi compatible. */ | |
3271 if (curr->y_type == MCHAR && vim_strchr(p_cpo, CPO_REGAPPEND) == NULL) | |
7 | 3272 { |
3273 pnew = lalloc((long_u)(STRLEN(curr->y_array[curr->y_size - 1]) | |
3274 + STRLEN(y_current->y_array[0]) + 1), TRUE); | |
3275 if (pnew == NULL) | |
3276 { | |
3277 y_idx = y_current->y_size - 1; | |
3278 goto fail; | |
3279 } | |
3280 STRCPY(pnew, curr->y_array[--j]); | |
3281 STRCAT(pnew, y_current->y_array[0]); | |
3282 vim_free(curr->y_array[j]); | |
3283 vim_free(y_current->y_array[0]); | |
3284 curr->y_array[j++] = pnew; | |
3285 y_idx = 1; | |
3286 } | |
3287 else | |
3288 y_idx = 0; | |
3289 while (y_idx < y_current->y_size) | |
3290 curr->y_array[j++] = y_current->y_array[y_idx++]; | |
3291 curr->y_size = j; | |
3292 vim_free(y_current->y_array); | |
3293 y_current = curr; | |
3294 } | |
5981 | 3295 if (curwin->w_p_rnu) |
3296 redraw_later(SOME_VALID); /* cursor moved to start */ | |
7 | 3297 if (mess) /* Display message about yank? */ |
3298 { | |
3299 if (yanktype == MCHAR | |
3300 && !oap->block_mode | |
3301 && yanklines == 1) | |
3302 yanklines = 0; | |
3303 /* Some versions of Vi use ">=" here, some don't... */ | |
3304 if (yanklines > p_report) | |
3305 { | |
11682
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3306 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
|
3307 |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3308 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
|
3309 *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
|
3310 else |
b9928ef8632f
patch 8.0.0724: the message for yanking doesn't indicate the register
Christian Brabandt <cb@256bit.org>
parents:
11597
diff
changeset
|
3311 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
|
3312 _(" 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
|
3313 |
7 | 3314 /* redisplay now, so message is not deleted */ |
3315 update_topline_redraw(); | |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3316 if (oap->block_mode) |
205 | 3317 { |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3318 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
|
3319 "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
|
3320 yanklines, namebuf); |
205 | 3321 } |
7 | 3322 else |
14585
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3323 { |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3324 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
|
3325 "%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
|
3326 yanklines, namebuf); |
c8f07e8b273e
patch 8.1.0306: plural messages are not translated properly
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
3327 } |
7 | 3328 } |
3329 } | |
3330 | |
3331 /* | |
3332 * Set "'[" and "']" marks. | |
3333 */ | |
3334 curbuf->b_op_start = oap->start; | |
3335 curbuf->b_op_end = oap->end; | |
5735 | 3336 if (yanktype == MLINE && !oap->block_mode) |
36 | 3337 { |
3338 curbuf->b_op_start.col = 0; | |
3339 curbuf->b_op_end.col = MAXCOL; | |
3340 } | |
7 | 3341 |
3342 #ifdef FEAT_CLIPBOARD | |
3343 /* | |
3344 * If we were yanking to the '*' register, send result to clipboard. | |
3345 * If no register was specified, and "unnamed" in 'clipboard', make a copy | |
3346 * to the '*' register. | |
3347 */ | |
3348 if (clip_star.available | |
3349 && (curr == &(y_regs[STAR_REGISTER]) | |
2654 | 3350 || (!deleting && oap->regname == 0 |
6116 | 3351 && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED)))) |
7 | 3352 { |
3353 if (curr != &(y_regs[STAR_REGISTER])) | |
3354 /* Copy the text from register 0 to the clipboard register. */ | |
3355 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3356 | |
3357 clip_own_selection(&clip_star); | |
3358 clip_gen_set_selection(&clip_star); | |
2658 | 3359 # ifdef FEAT_X11 |
2654 | 3360 did_star = TRUE; |
2658 | 3361 # endif |
7 | 3362 } |
3363 | |
3364 # ifdef FEAT_X11 | |
3365 /* | |
3366 * If we were yanking to the '+' register, send result to selection. | |
3367 * Also copy to the '*' register, in case auto-select is off. | |
3368 */ | |
2654 | 3369 if (clip_plus.available |
3370 && (curr == &(y_regs[PLUS_REGISTER]) | |
3371 || (!deleting && oap->regname == 0 | |
6116 | 3372 && ((clip_unnamed | clip_unnamed_saved) & |
3373 CLIP_UNNAMED_PLUS)))) | |
7 | 3374 { |
2654 | 3375 if (curr != &(y_regs[PLUS_REGISTER])) |
3376 /* Copy the text from register 0 to the clipboard register. */ | |
3377 copy_yank_reg(&(y_regs[PLUS_REGISTER])); | |
3378 | |
7 | 3379 clip_own_selection(&clip_plus); |
3380 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
|
3381 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
|
3382 && !did_star && curr == &(y_regs[PLUS_REGISTER])) |
7 | 3383 { |
3384 copy_yank_reg(&(y_regs[STAR_REGISTER])); | |
3385 clip_own_selection(&clip_star); | |
3386 clip_gen_set_selection(&clip_star); | |
3387 } | |
3388 } | |
3389 # endif | |
3390 #endif | |
3391 | |
13380
69517d67421f
patch 8.0.1564: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
13254
diff
changeset
|
3392 #if defined(FEAT_EVAL) |
13037
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3393 if (!deleting && has_textyankpost()) |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3394 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
|
3395 #endif |
6e81a68d63a1
patch 8.0.1394: cannot intercept a yank command
Christian Brabandt <cb@256bit.org>
parents:
12996
diff
changeset
|
3396 |
7 | 3397 return OK; |
3398 | |
3399 fail: /* free the allocated lines */ | |
3400 free_yank(y_idx + 1); | |
3401 y_current = curr; | |
3402 return FAIL; | |
3403 } | |
3404 | |
3405 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3406 yank_copy_line(struct block_def *bd, long y_idx) |
7 | 3407 { |
3408 char_u *pnew; | |
3409 | |
3410 if ((pnew = alloc(bd->startspaces + bd->endspaces + bd->textlen + 1)) | |
3411 == NULL) | |
3412 return FAIL; | |
3413 y_current->y_array[y_idx] = pnew; | |
6929 | 3414 vim_memset(pnew, ' ', (size_t)bd->startspaces); |
7 | 3415 pnew += bd->startspaces; |
3416 mch_memmove(pnew, bd->textstart, (size_t)bd->textlen); | |
3417 pnew += bd->textlen; | |
6929 | 3418 vim_memset(pnew, ' ', (size_t)bd->endspaces); |
7 | 3419 pnew += bd->endspaces; |
3420 *pnew = NUL; | |
3421 return OK; | |
3422 } | |
3423 | |
3424 #ifdef FEAT_CLIPBOARD | |
3425 /* | |
3426 * Make a copy of the y_current register to register "reg". | |
3427 */ | |
3428 static void | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3429 copy_yank_reg(yankreg_T *reg) |
7 | 3430 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3431 yankreg_T *curr = y_current; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
3432 long j; |
7 | 3433 |
3434 y_current = reg; | |
3435 free_yank_all(); | |
3436 *y_current = *curr; | |
3437 y_current->y_array = (char_u **)lalloc_clear( | |
3438 (long_u)(sizeof(char_u *) * y_current->y_size), TRUE); | |
3439 if (y_current->y_array == NULL) | |
3440 y_current->y_size = 0; | |
3441 else | |
3442 for (j = 0; j < y_current->y_size; ++j) | |
3443 if ((y_current->y_array[j] = vim_strsave(curr->y_array[j])) == NULL) | |
3444 { | |
3445 free_yank(j); | |
3446 y_current->y_size = 0; | |
3447 break; | |
3448 } | |
3449 y_current = curr; | |
3450 } | |
3451 #endif | |
3452 | |
3453 /* | |
140 | 3454 * Put contents of register "regname" into the text. |
3455 * Caller must check "regname" to be valid! | |
3456 * "flags": PUT_FIXINDENT make indent look nice | |
3457 * PUT_CURSEND leave cursor after end of new text | |
3458 * PUT_LINE force linewise put (":put") | |
7 | 3459 */ |
3460 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3461 do_put( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3462 int regname, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3463 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
|
3464 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3465 int flags) |
7 | 3466 { |
3467 char_u *ptr; | |
3468 char_u *newp, *oldp; | |
3469 int yanklen; | |
3470 int totlen = 0; /* init for gcc */ | |
3471 linenr_T lnum; | |
3472 colnr_T col; | |
3473 long i; /* index in y_array[] */ | |
3474 int y_type; | |
3475 long y_size; | |
3476 int oldlen; | |
3477 long y_width = 0; | |
3478 colnr_T vcol; | |
3479 int delcount; | |
3480 int incr = 0; | |
3481 long j; | |
3482 struct block_def bd; | |
3483 char_u **y_array = NULL; | |
3484 long nr_lines = 0; | |
3485 pos_T new_cursor; | |
3486 int indent; | |
3487 int orig_indent = 0; /* init for gcc */ | |
3488 int indent_diff = 0; /* init for gcc */ | |
3489 int first_indent = TRUE; | |
3490 int lendiff = 0; | |
3491 pos_T old_pos; | |
3492 char_u *insert_string = NULL; | |
3493 int allocated = FALSE; | |
3494 long cnt; | |
3495 | |
3496 #ifdef FEAT_CLIPBOARD | |
3497 /* Adjust register name for "unnamed" in 'clipboard'. */ | |
3498 adjust_clip_reg(®name); | |
3499 (void)may_get_selection(regname); | |
3500 #endif | |
3501 | |
3502 if (flags & PUT_FIXINDENT) | |
3503 orig_indent = get_indent(); | |
3504 | |
3505 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3506 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3507 | |
3508 /* | |
3509 * Using inserted text works differently, because the register includes | |
3510 * special characters (newlines, etc.). | |
3511 */ | |
3512 if (regname == '.') | |
3513 { | |
10494
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3514 if (VIsual_active) |
1e700d72561d
commit https://github.com/vim/vim/commit/f8eb9c51e5bbd10e59c9b1247f8f6c7f5b77ccd0
Christian Brabandt <cb@256bit.org>
parents:
10486
diff
changeset
|
3515 stuffcharReadbuff(VIsual_mode); |
7 | 3516 (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') : |
3517 (count == -1 ? 'O' : 'i')), count, FALSE); | |
3518 /* Putting the text is done later, so can't really move the cursor to | |
3519 * the next character. Use "l" to simulate it. */ | |
3520 if ((flags & PUT_CURSEND) && gchar_cursor() != NUL) | |
3521 stuffcharReadbuff('l'); | |
3522 return; | |
3523 } | |
3524 | |
3525 /* | |
3526 * For special registers '%' (file name), '#' (alternate file name) and | |
3527 * ':' (last command line), etc. we have to create a fake yank register. | |
3528 */ | |
3529 if (get_spec_reg(regname, &insert_string, &allocated, TRUE)) | |
3530 { | |
3531 if (insert_string == NULL) | |
3532 return; | |
3533 } | |
3534 | |
14202
51693b1a640e
patch 8.1.0118: duplicate error message for put command
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
3535 /* 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
|
3536 * 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
|
3537 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
|
3538 goto end; |
4005 | 3539 |
7 | 3540 if (insert_string != NULL) |
3541 { | |
3542 y_type = MCHAR; | |
3543 #ifdef FEAT_EVAL | |
3544 if (regname == '=') | |
3545 { | |
3546 /* For the = register we need to split the string at NL | |
3093 | 3547 * characters. |
3548 * Loop twice: count the number of lines and save them. */ | |
7 | 3549 for (;;) |
3550 { | |
3551 y_size = 0; | |
3552 ptr = insert_string; | |
3553 while (ptr != NULL) | |
3554 { | |
3555 if (y_array != NULL) | |
3556 y_array[y_size] = ptr; | |
3557 ++y_size; | |
3558 ptr = vim_strchr(ptr, '\n'); | |
3559 if (ptr != NULL) | |
3560 { | |
3561 if (y_array != NULL) | |
3562 *ptr = NUL; | |
3563 ++ptr; | |
3093 | 3564 /* A trailing '\n' makes the register linewise. */ |
7 | 3565 if (*ptr == NUL) |
3566 { | |
3567 y_type = MLINE; | |
3568 break; | |
3569 } | |
3570 } | |
3571 } | |
3572 if (y_array != NULL) | |
3573 break; | |
3574 y_array = (char_u **)alloc((unsigned) | |
3575 (y_size * sizeof(char_u *))); | |
3576 if (y_array == NULL) | |
3577 goto end; | |
3578 } | |
3579 } | |
3580 else | |
3581 #endif | |
3582 { | |
3583 y_size = 1; /* use fake one-line yank register */ | |
3584 y_array = &insert_string; | |
3585 } | |
3586 } | |
3587 else | |
3588 { | |
3589 get_yank_register(regname, FALSE); | |
3590 | |
3591 y_type = y_current->y_type; | |
3592 y_width = y_current->y_width; | |
3593 y_size = y_current->y_size; | |
3594 y_array = y_current->y_array; | |
3595 } | |
3596 | |
3597 if (y_type == MLINE) | |
3598 { | |
3599 if (flags & PUT_LINE_SPLIT) | |
3600 { | |
6845 | 3601 char_u *p; |
3602 | |
7 | 3603 /* "p" or "P" in Visual mode: split the lines to put the text in |
3604 * between. */ | |
3605 if (u_save_cursor() == FAIL) | |
3606 goto end; | |
6845 | 3607 p = ml_get_cursor(); |
3608 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
|
3609 MB_PTR_ADV(p); |
6845 | 3610 ptr = vim_strsave(p); |
7 | 3611 if (ptr == NULL) |
3612 goto end; | |
3613 ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE); | |
3614 vim_free(ptr); | |
3615 | |
6845 | 3616 oldp = ml_get_curline(); |
3617 p = oldp + curwin->w_cursor.col; | |
3618 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
|
3619 MB_PTR_ADV(p); |
6845 | 3620 ptr = vim_strnsave(oldp, p - oldp); |
7 | 3621 if (ptr == NULL) |
3622 goto end; | |
3623 ml_replace(curwin->w_cursor.lnum, ptr, FALSE); | |
3624 ++nr_lines; | |
3625 dir = FORWARD; | |
3626 } | |
3627 if (flags & PUT_LINE_FORWARD) | |
3628 { | |
3629 /* Must be "p" for a Visual block, put lines below the block. */ | |
692 | 3630 curwin->w_cursor = curbuf->b_visual.vi_end; |
7 | 3631 dir = FORWARD; |
3632 } | |
3633 curbuf->b_op_start = curwin->w_cursor; /* default for '[ mark */ | |
3634 curbuf->b_op_end = curwin->w_cursor; /* default for '] mark */ | |
3635 } | |
3636 | |
3637 if (flags & PUT_LINE) /* :put command or "p" in Visual line mode. */ | |
3638 y_type = MLINE; | |
3639 | |
3640 if (y_size == 0 || y_array == NULL) | |
3641 { | |
3642 EMSG2(_("E353: Nothing in register %s"), | |
3643 regname == 0 ? (char_u *)"\"" : transchar(regname)); | |
3644 goto end; | |
3645 } | |
3646 | |
3647 if (y_type == MBLOCK) | |
3648 { | |
3649 lnum = curwin->w_cursor.lnum + y_size + 1; | |
3650 if (lnum > curbuf->b_ml.ml_line_count) | |
3651 lnum = curbuf->b_ml.ml_line_count + 1; | |
3652 if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) | |
3653 goto end; | |
3654 } | |
5735 | 3655 else if (y_type == MLINE) |
7 | 3656 { |
3657 lnum = curwin->w_cursor.lnum; | |
3658 #ifdef FEAT_FOLDING | |
3659 /* Correct line number for closed fold. Don't move the cursor yet, | |
3660 * u_save() uses it. */ | |
3661 if (dir == BACKWARD) | |
3662 (void)hasFolding(lnum, &lnum, NULL); | |
3663 else | |
3664 (void)hasFolding(lnum, NULL, &lnum); | |
3665 #endif | |
3666 if (dir == FORWARD) | |
3667 ++lnum; | |
5053
35b6fc57a286
updated for version 7.3.1270
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3668 /* 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
|
3669 * 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
|
3670 if ((BUFEMPTY() ? u_save(0, 2) : u_save(lnum - 1, lnum)) == FAIL) |
7 | 3671 goto end; |
3672 #ifdef FEAT_FOLDING | |
3673 if (dir == FORWARD) | |
3674 curwin->w_cursor.lnum = lnum - 1; | |
3675 else | |
3676 curwin->w_cursor.lnum = lnum; | |
3677 curbuf->b_op_start = curwin->w_cursor; /* for mark_adjust() */ | |
3678 #endif | |
3679 } | |
3680 else if (u_save_cursor() == FAIL) | |
3681 goto end; | |
3682 | |
3683 yanklen = (int)STRLEN(y_array[0]); | |
3684 | |
3685 #ifdef FEAT_VIRTUALEDIT | |
3686 if (ve_flags == VE_ALL && y_type == MCHAR) | |
3687 { | |
3688 if (gchar_cursor() == TAB) | |
3689 { | |
3690 /* Don't need to insert spaces when "p" on the last position of a | |
3691 * 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
|
3692 #ifdef FEAT_VARTABS |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3693 int viscol = getviscol(); |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3694 if (dir == FORWARD |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3695 ? 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
|
3696 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
|
3697 : 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
|
3698 coladvance_force(viscol); |
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3699 #else |
7 | 3700 if (dir == FORWARD |
3701 ? (int)curwin->w_cursor.coladd < curbuf->b_p_ts - 1 | |
3702 : curwin->w_cursor.coladd > 0) | |
3703 coladvance_force(getviscol()); | |
14175
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14019
diff
changeset
|
3704 #endif |
7 | 3705 else |
3706 curwin->w_cursor.coladd = 0; | |
3707 } | |
3708 else if (curwin->w_cursor.coladd > 0 || gchar_cursor() == NUL) | |
3709 coladvance_force(getviscol() + (dir == FORWARD)); | |
3710 } | |
3711 #endif | |
3712 | |
3713 lnum = curwin->w_cursor.lnum; | |
3714 col = curwin->w_cursor.col; | |
3715 | |
3716 /* | |
3717 * Block mode | |
3718 */ | |
3719 if (y_type == MBLOCK) | |
3720 { | |
10664
94db9c08e206
patch 8.0.0222: blockwise put on multi-byte character misplaced
Christian Brabandt <cb@256bit.org>
parents:
10494
diff
changeset
|
3721 int c = gchar_cursor(); |
7 | 3722 colnr_T endcol2 = 0; |
3723 | |
3724 if (dir == FORWARD && c != NUL) | |
3725 { | |
3726 #ifdef FEAT_VIRTUALEDIT | |
3727 if (ve_flags == VE_ALL) | |
3728 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3729 else | |
3730 #endif | |
3731 getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col); | |
3732 | |
3733 #ifdef FEAT_MBYTE | |
3734 if (has_mbyte) | |
3735 /* move to start of next multi-byte character */ | |
474 | 3736 curwin->w_cursor.col += (*mb_ptr2len)(ml_get_cursor()); |
7 | 3737 else |
3738 #endif | |
3739 #ifdef FEAT_VIRTUALEDIT | |
3740 if (c != TAB || ve_flags != VE_ALL) | |
3741 #endif | |
3742 ++curwin->w_cursor.col; | |
3743 ++col; | |
3744 } | |
3745 else | |
3746 getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2); | |
3747 | |
3748 #ifdef FEAT_VIRTUALEDIT | |
3749 col += curwin->w_cursor.coladd; | |
1304 | 3750 if (ve_flags == VE_ALL |
3751 && (curwin->w_cursor.coladd > 0 | |
3752 || endcol2 == curwin->w_cursor.col)) | |
7 | 3753 { |
3754 if (dir == FORWARD && c == NUL) | |
3755 ++col; | |
3756 if (dir != FORWARD && c != NUL) | |
3757 ++curwin->w_cursor.col; | |
3758 if (c == TAB) | |
3759 { | |
3760 if (dir == BACKWARD && curwin->w_cursor.col) | |
3761 curwin->w_cursor.col--; | |
3762 if (dir == FORWARD && col - 1 == endcol2) | |
3763 curwin->w_cursor.col++; | |
3764 } | |
3765 } | |
3766 curwin->w_cursor.coladd = 0; | |
3767 #endif | |
699 | 3768 bd.textcol = 0; |
7 | 3769 for (i = 0; i < y_size; ++i) |
3770 { | |
3771 int spaces; | |
3772 char shortline; | |
3773 | |
3774 bd.startspaces = 0; | |
3775 bd.endspaces = 0; | |
3776 vcol = 0; | |
3777 delcount = 0; | |
3778 | |
3779 /* add a new line */ | |
3780 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count) | |
3781 { | |
3782 if (ml_append(curbuf->b_ml.ml_line_count, (char_u *)"", | |
3783 (colnr_T)1, FALSE) == FAIL) | |
3784 break; | |
3785 ++nr_lines; | |
3786 } | |
3787 /* get the old line and advance to the position to insert at */ | |
3788 oldp = ml_get_curline(); | |
3789 oldlen = (int)STRLEN(oldp); | |
3790 for (ptr = oldp; vcol < col && *ptr; ) | |
3791 { | |
3792 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 3793 incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol); |
7 | 3794 vcol += incr; |
3795 } | |
3796 bd.textcol = (colnr_T)(ptr - oldp); | |
3797 | |
3798 shortline = (vcol < col) || (vcol == col && !*ptr) ; | |
3799 | |
3800 if (vcol < col) /* line too short, padd with spaces */ | |
3801 bd.startspaces = col - vcol; | |
3802 else if (vcol > col) | |
3803 { | |
3804 bd.endspaces = vcol - col; | |
3805 bd.startspaces = incr - bd.endspaces; | |
3806 --bd.textcol; | |
3807 delcount = 1; | |
3808 #ifdef FEAT_MBYTE | |
3809 if (has_mbyte) | |
3810 bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol); | |
3811 #endif | |
3812 if (oldp[bd.textcol] != TAB) | |
3813 { | |
3814 /* Only a Tab can be split into spaces. Other | |
3815 * characters will have to be moved to after the | |
3816 * block, causing misalignment. */ | |
3817 delcount = 0; | |
3818 bd.endspaces = 0; | |
3819 } | |
3820 } | |
3821 | |
3822 yanklen = (int)STRLEN(y_array[i]); | |
3823 | |
3824 /* calculate number of spaces required to fill right side of block*/ | |
3825 spaces = y_width + 1; | |
3826 for (j = 0; j < yanklen; j++) | |
5995 | 3827 spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0); |
7 | 3828 if (spaces < 0) |
3829 spaces = 0; | |
3830 | |
3831 /* insert the new text */ | |
3832 totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces; | |
3833 newp = alloc_check((unsigned)totlen + oldlen + 1); | |
3834 if (newp == NULL) | |
3835 break; | |
3836 /* copy part up to cursor to new line */ | |
3837 ptr = newp; | |
3838 mch_memmove(ptr, oldp, (size_t)bd.textcol); | |
3839 ptr += bd.textcol; | |
3840 /* may insert some spaces before the new text */ | |
6929 | 3841 vim_memset(ptr, ' ', (size_t)bd.startspaces); |
7 | 3842 ptr += bd.startspaces; |
3843 /* insert the new text */ | |
3844 for (j = 0; j < count; ++j) | |
3845 { | |
3846 mch_memmove(ptr, y_array[i], (size_t)yanklen); | |
3847 ptr += yanklen; | |
3848 | |
3849 /* insert block's trailing spaces only if there's text behind */ | |
3850 if ((j < count - 1 || !shortline) && spaces) | |
3851 { | |
6929 | 3852 vim_memset(ptr, ' ', (size_t)spaces); |
7 | 3853 ptr += spaces; |
3854 } | |
3855 } | |
3856 /* may insert some spaces after the new text */ | |
6929 | 3857 vim_memset(ptr, ' ', (size_t)bd.endspaces); |
7 | 3858 ptr += bd.endspaces; |
3859 /* move the text after the cursor to the end of the line. */ | |
3860 mch_memmove(ptr, oldp + bd.textcol + delcount, | |
3861 (size_t)(oldlen - bd.textcol - delcount + 1)); | |
3862 ml_replace(curwin->w_cursor.lnum, newp, FALSE); | |
3863 | |
3864 ++curwin->w_cursor.lnum; | |
3865 if (i == 0) | |
3866 curwin->w_cursor.col += bd.startspaces; | |
3867 } | |
3868 | |
3869 changed_lines(lnum, 0, curwin->w_cursor.lnum, nr_lines); | |
3870 | |
3871 /* Set '[ mark. */ | |
3872 curbuf->b_op_start = curwin->w_cursor; | |
3873 curbuf->b_op_start.lnum = lnum; | |
3874 | |
3875 /* adjust '] mark */ | |
3876 curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1; | |
3877 curbuf->b_op_end.col = bd.textcol + totlen - 1; | |
237 | 3878 # ifdef FEAT_VIRTUALEDIT |
7 | 3879 curbuf->b_op_end.coladd = 0; |
237 | 3880 # endif |
7 | 3881 if (flags & PUT_CURSEND) |
3882 { | |
916 | 3883 colnr_T len; |
3884 | |
7 | 3885 curwin->w_cursor = curbuf->b_op_end; |
3886 curwin->w_cursor.col++; | |
916 | 3887 |
3888 /* in Insert mode we might be after the NUL, correct for that */ | |
3889 len = (colnr_T)STRLEN(ml_get_curline()); | |
3890 if (curwin->w_cursor.col > len) | |
3891 curwin->w_cursor.col = len; | |
7 | 3892 } |
3893 else | |
3894 curwin->w_cursor.lnum = lnum; | |
3895 } | |
3896 else | |
3897 { | |
3898 /* | |
3899 * Character or Line mode | |
3900 */ | |
3901 if (y_type == MCHAR) | |
3902 { | |
3903 /* if type is MCHAR, FORWARD is the same as BACKWARD on the next | |
3904 * char */ | |
3905 if (dir == FORWARD && gchar_cursor() != NUL) | |
3906 { | |
3907 #ifdef FEAT_MBYTE | |
3908 if (has_mbyte) | |
3909 { | |
474 | 3910 int bytelen = (*mb_ptr2len)(ml_get_cursor()); |
7 | 3911 |
3912 /* put it on the next of the multi-byte character. */ | |
3913 col += bytelen; | |
3914 if (yanklen) | |
3915 { | |
3916 curwin->w_cursor.col += bytelen; | |
3917 curbuf->b_op_end.col += bytelen; | |
3918 } | |
3919 } | |
3920 else | |
3921 #endif | |
3922 { | |
3923 ++col; | |
3924 if (yanklen) | |
3925 { | |
3926 ++curwin->w_cursor.col; | |
3927 ++curbuf->b_op_end.col; | |
3928 } | |
3929 } | |
3930 } | |
3931 curbuf->b_op_start = curwin->w_cursor; | |
3932 } | |
3933 /* | |
3934 * Line mode: BACKWARD is the same as FORWARD on the previous line | |
3935 */ | |
3936 else if (dir == BACKWARD) | |
3937 --lnum; | |
699 | 3938 new_cursor = curwin->w_cursor; |
7 | 3939 |
3940 /* | |
3941 * simple case: insert into current line | |
3942 */ | |
3943 if (y_type == MCHAR && y_size == 1) | |
3944 { | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3945 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
|
3946 |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3947 if (VIsual_active) |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3948 { |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3949 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
|
3950 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
|
3951 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
|
3952 } |
10670
bce3eccea39a
patch 8.0.0225: put in Visual block mode terminates early
Christian Brabandt <cb@256bit.org>
parents:
10664
diff
changeset
|
3953 |
5365 | 3954 do { |
3955 totlen = count * yanklen; | |
3956 if (totlen > 0) | |
7 | 3957 { |
5365 | 3958 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
|
3959 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
|
3960 { |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3961 lnum++; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3962 continue; |
3d1872fbecc4
patch 8.0.0234: crash when using put in Visual mode
Christian Brabandt <cb@256bit.org>
parents:
10670
diff
changeset
|
3963 } |
5365 | 3964 newp = alloc_check((unsigned)(STRLEN(oldp) + totlen + 1)); |
3965 if (newp == NULL) | |
3966 goto end; /* alloc() gave an error message */ | |
3967 mch_memmove(newp, oldp, (size_t)col); | |
3968 ptr = newp + col; | |
3969 for (i = 0; i < count; ++i) | |
3970 { | |
3971 mch_memmove(ptr, y_array[0], (size_t)yanklen); | |
3972 ptr += yanklen; | |
3973 } | |
3974 STRMOVE(ptr, oldp + col); | |
3975 ml_replace(lnum, newp, FALSE); | |
3976 /* Place cursor on last putted char. */ | |
3977 if (lnum == curwin->w_cursor.lnum) | |
5496 | 3978 { |
3979 /* make sure curwin->w_virtcol is updated */ | |
3980 changed_cline_bef_curs(); | |
5365 | 3981 curwin->w_cursor.col += (colnr_T)(totlen - 1); |
5496 | 3982 } |
7 | 3983 } |
5365 | 3984 if (VIsual_active) |
3985 lnum++; | |
10692
d9aeddd9086b
patch 8.0.0236: gcc complains about uninitialized variable
Christian Brabandt <cb@256bit.org>
parents:
10688
diff
changeset
|
3986 } while (VIsual_active && lnum <= end_lnum); |
5365 | 3987 |
6379 | 3988 if (VIsual_active) /* reset lnum to the last visual line */ |
3989 lnum--; | |
3990 | |
7 | 3991 curbuf->b_op_end = curwin->w_cursor; |
3992 /* For "CTRL-O p" in Insert mode, put cursor after last char */ | |
3993 if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND))) | |
3994 ++curwin->w_cursor.col; | |
3995 changed_bytes(lnum, col); | |
3996 } | |
3997 else | |
3998 { | |
3999 /* | |
4000 * Insert at least one line. When y_type is MCHAR, break the first | |
4001 * line in two. | |
4002 */ | |
4003 for (cnt = 1; cnt <= count; ++cnt) | |
4004 { | |
4005 i = 0; | |
4006 if (y_type == MCHAR) | |
4007 { | |
4008 /* | |
4009 * Split the current line in two at the insert position. | |
4010 * First insert y_array[size - 1] in front of second line. | |
4011 * Then append y_array[0] to first line. | |
4012 */ | |
4013 lnum = new_cursor.lnum; | |
4014 ptr = ml_get(lnum) + col; | |
4015 totlen = (int)STRLEN(y_array[y_size - 1]); | |
4016 newp = alloc_check((unsigned)(STRLEN(ptr) + totlen + 1)); | |
4017 if (newp == NULL) | |
4018 goto error; | |
4019 STRCPY(newp, y_array[y_size - 1]); | |
4020 STRCAT(newp, ptr); | |
4021 /* insert second line */ | |
4022 ml_append(lnum, newp, (colnr_T)0, FALSE); | |
4023 vim_free(newp); | |
4024 | |
4025 oldp = ml_get(lnum); | |
4026 newp = alloc_check((unsigned)(col + yanklen + 1)); | |
4027 if (newp == NULL) | |
4028 goto error; | |
4029 /* copy first part of line */ | |
4030 mch_memmove(newp, oldp, (size_t)col); | |
4031 /* append to first line */ | |
4032 mch_memmove(newp + col, y_array[0], (size_t)(yanklen + 1)); | |
4033 ml_replace(lnum, newp, FALSE); | |
4034 | |
4035 curwin->w_cursor.lnum = lnum; | |
4036 i = 1; | |
4037 } | |
4038 | |
4039 for (; i < y_size; ++i) | |
4040 { | |
4041 if ((y_type != MCHAR || i < y_size - 1) | |
4042 && ml_append(lnum, y_array[i], (colnr_T)0, FALSE) | |
4043 == FAIL) | |
4044 goto error; | |
4045 lnum++; | |
4046 ++nr_lines; | |
4047 if (flags & PUT_FIXINDENT) | |
4048 { | |
4049 old_pos = curwin->w_cursor; | |
4050 curwin->w_cursor.lnum = lnum; | |
4051 ptr = ml_get(lnum); | |
4052 if (cnt == count && i == y_size - 1) | |
4053 lendiff = (int)STRLEN(ptr); | |
4054 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | |
4055 if (*ptr == '#' && preprocs_left()) | |
4056 indent = 0; /* Leave # lines at start */ | |
4057 else | |
4058 #endif | |
4059 if (*ptr == NUL) | |
4060 indent = 0; /* Ignore empty lines */ | |
4061 else if (first_indent) | |
4062 { | |
4063 indent_diff = orig_indent - get_indent(); | |
4064 indent = orig_indent; | |
4065 first_indent = FALSE; | |
4066 } | |
4067 else if ((indent = get_indent() + indent_diff) < 0) | |
4068 indent = 0; | |
4069 (void)set_indent(indent, 0); | |
4070 curwin->w_cursor = old_pos; | |
4071 /* remember how many chars were removed */ | |
4072 if (cnt == count && i == y_size - 1) | |
4073 lendiff -= (int)STRLEN(ml_get(lnum)); | |
4074 } | |
4075 } | |
4076 } | |
4077 | |
4078 error: | |
4079 /* Adjust marks. */ | |
4080 if (y_type == MLINE) | |
4081 { | |
4082 curbuf->b_op_start.col = 0; | |
4083 if (dir == FORWARD) | |
4084 curbuf->b_op_start.lnum++; | |
4085 } | |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
4086 /* 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
|
4087 * 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
|
4088 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
|
4089 < 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
|
4090 #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
|
4091 || 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
|
4092 #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
|
4093 ) |
9225
b0b2bd8e5217
commit https://github.com/vim/vim/commit/82faa259cc42379f2a17d598a2a39d14048685b0
Christian Brabandt <cb@256bit.org>
parents:
8989
diff
changeset
|
4094 mark_adjust(curbuf->b_op_start.lnum + (y_type == MCHAR), |
7 | 4095 (linenr_T)MAXLNUM, nr_lines, 0L); |
4096 | |
4097 /* note changed text for displaying and folding */ | |
4098 if (y_type == MCHAR) | |
4099 changed_lines(curwin->w_cursor.lnum, col, | |
4100 curwin->w_cursor.lnum + 1, nr_lines); | |
4101 else | |
4102 changed_lines(curbuf->b_op_start.lnum, 0, | |
4103 curbuf->b_op_start.lnum, nr_lines); | |
4104 | |
4105 /* put '] mark at last inserted character */ | |
4106 curbuf->b_op_end.lnum = lnum; | |
4107 /* correct length for change in indent */ | |
4108 col = (colnr_T)STRLEN(y_array[y_size - 1]) - lendiff; | |
4109 if (col > 1) | |
4110 curbuf->b_op_end.col = col - 1; | |
4111 else | |
4112 curbuf->b_op_end.col = 0; | |
4113 | |
168 | 4114 if (flags & PUT_CURSLINE) |
4115 { | |
237 | 4116 /* ":put": put cursor on last inserted line */ |
168 | 4117 curwin->w_cursor.lnum = lnum; |
4118 beginline(BL_WHITE | BL_FIX); | |
4119 } | |
4120 else if (flags & PUT_CURSEND) | |
7 | 4121 { |
4122 /* put cursor after inserted text */ | |
4123 if (y_type == MLINE) | |
4124 { | |
4125 if (lnum >= curbuf->b_ml.ml_line_count) | |
4126 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count; | |
4127 else | |
4128 curwin->w_cursor.lnum = lnum + 1; | |
4129 curwin->w_cursor.col = 0; | |
4130 } | |
4131 else | |
4132 { | |
4133 curwin->w_cursor.lnum = lnum; | |
4134 curwin->w_cursor.col = col; | |
4135 } | |
4136 } | |
4137 else if (y_type == MLINE) | |
4138 { | |
168 | 4139 /* put cursor on first non-blank in first inserted line */ |
7 | 4140 curwin->w_cursor.col = 0; |
4141 if (dir == FORWARD) | |
4142 ++curwin->w_cursor.lnum; | |
4143 beginline(BL_WHITE | BL_FIX); | |
4144 } | |
4145 else /* put cursor on first inserted character */ | |
4146 curwin->w_cursor = new_cursor; | |
4147 } | |
4148 } | |
4149 | |
4150 msgmore(nr_lines); | |
4151 curwin->w_set_curswant = TRUE; | |
4152 | |
4153 end: | |
4154 if (allocated) | |
4155 vim_free(insert_string); | |
840 | 4156 if (regname == '=') |
4157 vim_free(y_array); | |
4158 | |
5380 | 4159 VIsual_active = FALSE; |
4160 | |
140 | 4161 /* If the cursor is past the end of the line put it at the end. */ |
844 | 4162 adjust_cursor_eol(); |
4163 } | |
4164 | |
4165 /* | |
4166 * When the cursor is on the NUL past the end of the line and it should not be | |
4167 * there move it left. | |
4168 */ | |
4169 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4170 adjust_cursor_eol(void) |
844 | 4171 { |
4172 if (curwin->w_cursor.col > 0 | |
4173 && gchar_cursor() == NUL | |
773 | 4174 #ifdef FEAT_VIRTUALEDIT |
4175 && (ve_flags & VE_ONEMORE) == 0 | |
4176 #endif | |
7 | 4177 && !(restart_edit || (State & INSERT))) |
4178 { | |
557 | 4179 /* Put the cursor on the last character in the line. */ |
555 | 4180 dec_cursor(); |
844 | 4181 |
7 | 4182 #ifdef FEAT_VIRTUALEDIT |
4183 if (ve_flags == VE_ALL) | |
557 | 4184 { |
4185 colnr_T scol, ecol; | |
4186 | |
4187 /* Coladd is set to the width of the last character. */ | |
4188 getvcol(curwin, &curwin->w_cursor, &scol, NULL, &ecol); | |
4189 curwin->w_cursor.coladd = ecol - scol + 1; | |
4190 } | |
7 | 4191 #endif |
4192 } | |
4193 } | |
4194 | |
4195 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) || defined(PROTO) | |
4196 /* | |
4197 * Return TRUE if lines starting with '#' should be left aligned. | |
4198 */ | |
4199 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4200 preprocs_left(void) |
7 | 4201 { |
4202 return | |
4203 # ifdef FEAT_SMARTINDENT | |
4204 # ifdef FEAT_CINDENT | |
4205 (curbuf->b_p_si && !curbuf->b_p_cin) || | |
4206 # else | |
4207 curbuf->b_p_si | |
4208 # endif | |
4209 # endif | |
4210 # ifdef FEAT_CINDENT | |
5438 | 4211 (curbuf->b_p_cin && in_cinkeys('#', ' ', TRUE) |
4212 && curbuf->b_ind_hash_comment == 0) | |
7 | 4213 # endif |
4214 ; | |
4215 } | |
4216 #endif | |
4217 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4218 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4219 * 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
|
4220 */ |
7 | 4221 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4222 get_register_name(int num) |
7 | 4223 { |
4224 if (num == -1) | |
4225 return '"'; | |
4226 else if (num < 10) | |
4227 return num + '0'; | |
4228 else if (num == DELETION_REGISTER) | |
4229 return '-'; | |
4230 #ifdef FEAT_CLIPBOARD | |
4231 else if (num == STAR_REGISTER) | |
4232 return '*'; | |
4233 else if (num == PLUS_REGISTER) | |
4234 return '+'; | |
4235 #endif | |
4236 else | |
4237 { | |
4238 #ifdef EBCDIC | |
4239 int i; | |
4240 | |
4241 /* EBCDIC is really braindead ... */ | |
4242 i = 'a' + (num - 10); | |
4243 if (i > 'i') | |
4244 i += 7; | |
4245 if (i > 'r') | |
4246 i += 8; | |
4247 return i; | |
4248 #else | |
4249 return num + 'a' - 10; | |
4250 #endif | |
4251 } | |
4252 } | |
4253 | |
4254 /* | |
4255 * ":dis" and ":registers": Display the contents of the yank registers. | |
4256 */ | |
4257 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4258 ex_display(exarg_T *eap) |
7 | 4259 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4260 int i, n; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4261 long j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4262 char_u *p; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4263 yankreg_T *yb; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4264 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4265 int attr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4266 char_u *arg = eap->arg; |
22 | 4267 #ifdef FEAT_MBYTE |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
4268 int clen; |
22 | 4269 #else |
4270 # define clen 1 | |
4271 #endif | |
7 | 4272 |
4273 if (arg != NULL && *arg == NUL) | |
4274 arg = NULL; | |
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11131
diff
changeset
|
4275 attr = HL_ATTR(HLF_8); |
7 | 4276 |
4277 /* Highlight title */ | |
4278 MSG_PUTS_TITLE(_("\n--- Registers ---")); | |
4279 for (i = -1; i < NUM_REGISTERS && !got_int; ++i) | |
4280 { | |
4281 name = get_register_name(i); | |
2644 | 4282 if (arg != NULL && vim_strchr(arg, name) == NULL |
4283 #ifdef ONE_CLIPBOARD | |
4284 /* Star register and plus register contain the same thing. */ | |
4285 && (name != '*' || vim_strchr(arg, '+') == NULL) | |
4286 #endif | |
4287 ) | |
7 | 4288 continue; /* did not ask for this register */ |
4289 | |
4290 #ifdef FEAT_CLIPBOARD | |
4291 /* Adjust register name for "unnamed" in 'clipboard'. | |
4292 * When it's a clipboard register, fill it with the current contents | |
4293 * of the clipboard. */ | |
4294 adjust_clip_reg(&name); | |
4295 (void)may_get_selection(name); | |
4296 #endif | |
4297 | |
4298 if (i == -1) | |
4299 { | |
4300 if (y_previous != NULL) | |
4301 yb = y_previous; | |
4302 else | |
4303 yb = &(y_regs[0]); | |
4304 } | |
4305 else | |
4306 yb = &(y_regs[i]); | |
2000 | 4307 |
4308 #ifdef FEAT_EVAL | |
4309 if (name == MB_TOLOWER(redir_reg) | |
4310 || (redir_reg == '"' && yb == y_previous)) | |
4311 continue; /* do not list register being written to, the | |
4312 * pointer can be freed */ | |
4313 #endif | |
4314 | |
7 | 4315 if (yb->y_array != NULL) |
4316 { | |
4317 msg_putchar('\n'); | |
4318 msg_putchar('"'); | |
4319 msg_putchar(name); | |
4320 MSG_PUTS(" "); | |
4321 | |
4322 n = (int)Columns - 6; | |
4323 for (j = 0; j < yb->y_size && n > 1; ++j) | |
4324 { | |
4325 if (j) | |
4326 { | |
4327 MSG_PUTS_ATTR("^J", attr); | |
4328 n -= 2; | |
4329 } | |
4330 for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p) | |
4331 { | |
4332 #ifdef FEAT_MBYTE | |
474 | 4333 clen = (*mb_ptr2len)(p); |
22 | 4334 #endif |
4335 msg_outtrans_len(p, clen); | |
4336 #ifdef FEAT_MBYTE | |
4337 p += clen - 1; | |
7 | 4338 #endif |
4339 } | |
4340 } | |
4341 if (n > 1 && yb->y_type == MLINE) | |
4342 MSG_PUTS_ATTR("^J", attr); | |
4343 out_flush(); /* show one line at a time */ | |
4344 } | |
4345 ui_breakcheck(); | |
4346 } | |
4347 | |
4348 /* | |
4349 * display last inserted text | |
4350 */ | |
4351 if ((p = get_last_insert()) != NULL | |
4352 && (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int) | |
4353 { | |
4354 MSG_PUTS("\n\". "); | |
4355 dis_msg(p, TRUE); | |
4356 } | |
4357 | |
4358 /* | |
4359 * display last command line | |
4360 */ | |
4361 if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL) | |
4362 && !got_int) | |
4363 { | |
4364 MSG_PUTS("\n\": "); | |
4365 dis_msg(last_cmdline, FALSE); | |
4366 } | |
4367 | |
4368 /* | |
4369 * display current file name | |
4370 */ | |
4371 if (curbuf->b_fname != NULL | |
4372 && (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4373 { | |
4374 MSG_PUTS("\n\"% "); | |
4375 dis_msg(curbuf->b_fname, FALSE); | |
4376 } | |
4377 | |
4378 /* | |
4379 * display alternate file name | |
4380 */ | |
4381 if ((arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int) | |
4382 { | |
4383 char_u *fname; | |
4384 linenr_T dummy; | |
4385 | |
4386 if (buflist_name_nr(0, &fname, &dummy) != FAIL) | |
4387 { | |
4388 MSG_PUTS("\n\"# "); | |
4389 dis_msg(fname, FALSE); | |
4390 } | |
4391 } | |
4392 | |
4393 /* | |
4394 * display last search pattern | |
4395 */ | |
4396 if (last_search_pat() != NULL | |
4397 && (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int) | |
4398 { | |
4399 MSG_PUTS("\n\"/ "); | |
4400 dis_msg(last_search_pat(), FALSE); | |
4401 } | |
4402 | |
4403 #ifdef FEAT_EVAL | |
4404 /* | |
4405 * display last used expression | |
4406 */ | |
4407 if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL) | |
4408 && !got_int) | |
4409 { | |
4410 MSG_PUTS("\n\"= "); | |
4411 dis_msg(expr_line, FALSE); | |
4412 } | |
4413 #endif | |
4414 } | |
4415 | |
4416 /* | |
4417 * display a string for do_dis() | |
4418 * truncate at end of screen line | |
4419 */ | |
4420 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4421 dis_msg( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4422 char_u *p, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4423 int skip_esc) /* if TRUE, ignore trailing ESC */ |
7 | 4424 { |
4425 int n; | |
4426 #ifdef FEAT_MBYTE | |
4427 int l; | |
4428 #endif | |
4429 | |
4430 n = (int)Columns - 6; | |
4431 while (*p != NUL | |
4432 && !(*p == ESC && skip_esc && *(p + 1) == NUL) | |
4433 && (n -= ptr2cells(p)) >= 0) | |
4434 { | |
4435 #ifdef FEAT_MBYTE | |
474 | 4436 if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) |
7 | 4437 { |
4438 msg_outtrans_len(p, l); | |
4439 p += l; | |
4440 } | |
4441 else | |
4442 #endif | |
4443 msg_outtrans_len(p++, 1); | |
4444 } | |
4445 ui_breakcheck(); | |
4446 } | |
4447 | |
3562 | 4448 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4449 /* | |
4450 * If "process" is TRUE and the line begins with a comment leader (possibly | |
4451 * after some white space), return a pointer to the text after it. Put a boolean | |
4452 * value indicating whether the line ends with an unclosed comment in | |
4453 * "is_comment". | |
4454 * line - line to be processed, | |
4455 * process - if FALSE, will only check whether the line ends with an unclosed | |
3584 | 4456 * comment, |
3562 | 4457 * include_space - whether to also skip space following the comment leader, |
4458 * is_comment - will indicate whether the current line ends with an unclosed | |
3584 | 4459 * comment. |
3562 | 4460 */ |
11131
8d9ecf09183a
patch 8.0.0453: adding fold marker creates new comment
Christian Brabandt <cb@256bit.org>
parents:
11129
diff
changeset
|
4461 char_u * |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4462 skip_comment( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4463 char_u *line, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4464 int process, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4465 int include_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4466 int *is_comment) |
3562 | 4467 { |
4468 char_u *comment_flags = NULL; | |
4469 int lead_len; | |
4470 int leader_offset = get_last_leader_offset(line, &comment_flags); | |
4471 | |
4472 *is_comment = FALSE; | |
4473 if (leader_offset != -1) | |
4474 { | |
4475 /* Let's check whether the line ends with an unclosed comment. | |
4476 * If the last comment leader has COM_END in flags, there's no comment. | |
4477 */ | |
4478 while (*comment_flags) | |
4479 { | |
4480 if (*comment_flags == COM_END | |
4481 || *comment_flags == ':') | |
4482 break; | |
4483 ++comment_flags; | |
4484 } | |
4485 if (*comment_flags != COM_END) | |
4486 *is_comment = TRUE; | |
4487 } | |
4488 | |
4489 if (process == FALSE) | |
4490 return line; | |
4491 | |
4492 lead_len = get_leader_len(line, &comment_flags, FALSE, include_space); | |
4493 | |
4494 if (lead_len == 0) | |
4495 return line; | |
4496 | |
4497 /* Find: | |
4498 * - COM_END, | |
4499 * - colon, | |
4500 * whichever comes first. | |
4501 */ | |
4502 while (*comment_flags) | |
4503 { | |
3580 | 4504 if (*comment_flags == COM_END |
3562 | 4505 || *comment_flags == ':') |
4506 { | |
4507 break; | |
4508 } | |
4509 ++comment_flags; | |
4510 } | |
4511 | |
4512 /* If we found a colon, it means that we are not processing a line | |
3580 | 4513 * starting with a closing part of a three-part comment. That's good, |
4514 * because we don't want to remove those as this would be annoying. | |
3562 | 4515 */ |
4516 if (*comment_flags == ':' || *comment_flags == NUL) | |
4517 line += lead_len; | |
4518 | |
4519 return line; | |
4520 } | |
4521 #endif | |
4522 | |
7 | 4523 /* |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4524 * 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
|
4525 * When "save_undo" is TRUE save lines for undo first. |
5848 | 4526 * Set "use_formatoptions" to FALSE when e.g. processing backspace and comment |
4527 * leaders should not be removed. | |
4528 * When setmark is TRUE, sets the '[ and '] mark, else, the caller is expected | |
4529 * to set those marks. | |
7 | 4530 * |
1217 | 4531 * return FAIL for failure, OK otherwise |
7 | 4532 */ |
4533 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4534 do_join( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4535 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4536 int insert_space, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4537 int save_undo, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4538 int use_formatoptions UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4539 int setmark) |
7 | 4540 { |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4541 char_u *curr = NULL; |
2597 | 4542 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
|
4543 char_u *cend; |
7 | 4544 char_u *newp; |
2597 | 4545 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
|
4546 int endcurr1 = NUL; |
3e4574a4b627
Fix a few compiler warnings.
Bram Moolenaar <bram@vim.org>
parents:
2298
diff
changeset
|
4547 int endcurr2 = NUL; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4548 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
|
4549 int sumsize = 0; /* size of the long new line */ |
7 | 4550 linenr_T t; |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4551 colnr_T col = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4552 int ret = OK; |
3562 | 4553 #if defined(FEAT_COMMENTS) || defined(PROTO) |
3574 | 4554 int *comments = NULL; |
3562 | 4555 int remove_comments = (use_formatoptions == TRUE) |
4556 && has_format_option(FO_REMOVE_COMS); | |
4557 int prev_was_comment; | |
4558 #endif | |
4559 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4560 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4561 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
|
4562 (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
|
4563 return FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4564 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4565 /* 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
|
4566 * 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
|
4567 * 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
|
4568 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
|
4569 if (spaces == NULL) |
7 | 4570 return FAIL; |
3562 | 4571 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4572 if (remove_comments) | |
4573 { | |
4574 comments = (int *)lalloc_clear((long_u)count * sizeof(int), TRUE); | |
4575 if (comments == NULL) | |
4576 { | |
4577 vim_free(spaces); | |
4578 return FAIL; | |
4579 } | |
4580 } | |
4581 #endif | |
7 | 4582 |
4583 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4584 * 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
|
4585 * and setup the array of space strings lengths |
7 | 4586 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4587 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
|
4588 { |
2597 | 4589 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); |
5848 | 4590 if (t == 0 && setmark) |
5664 | 4591 { |
4592 /* Set the '[ mark. */ | |
4593 curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum; | |
4594 curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr); | |
4595 } | |
3562 | 4596 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4597 if (remove_comments) | |
4598 { | |
4599 /* We don't want to remove the comment leader if the | |
4600 * previous line is not a comment. */ | |
4601 if (t > 0 && prev_was_comment) | |
4602 { | |
4603 | |
4604 char_u *new_curr = skip_comment(curr, TRUE, insert_space, | |
4605 &prev_was_comment); | |
3576 | 4606 comments[t] = (int)(new_curr - curr); |
3562 | 4607 curr = new_curr; |
4608 } | |
4609 else | |
4610 curr = skip_comment(curr, FALSE, insert_space, | |
4611 &prev_was_comment); | |
4612 } | |
4613 #endif | |
4614 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4615 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
|
4616 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4617 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4618 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
|
4619 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4620 && (!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
|
4621 || (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
|
4622 && (!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
|
4623 || 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
|
4624 #endif |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4625 ) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4626 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4627 /* 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
|
4628 if (endcurr1 == ' ') |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4629 endcurr1 = endcurr2; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4630 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4631 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4632 /* 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
|
4633 if ( p_js |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4634 && (endcurr1 == '.' |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4635 || (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
|
4636 && (endcurr1 == '?' || endcurr1 == '!')))) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4637 ++spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4638 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4639 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4640 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4641 sumsize += currsize + spaces[t]; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4642 endcurr1 = endcurr2 = NUL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4643 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
|
4644 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4645 #ifdef FEAT_MBYTE |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4646 if (has_mbyte) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4647 { |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4648 cend = curr + currsize; |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4649 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
|
4650 endcurr1 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4651 if (cend > curr) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4652 { |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
4653 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
|
4654 endcurr2 = (*mb_ptr2char)(cend); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4655 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4656 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4657 else |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4658 #endif |
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 endcurr1 = *(curr + currsize - 1); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4661 if (currsize > 1) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4662 endcurr2 = *(curr + currsize - 2); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4663 } |
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 line_breakcheck(); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4666 if (got_int) |
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 ret = FAIL; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4669 goto theend; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4670 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4671 } |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4672 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4673 /* 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
|
4674 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
|
4675 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4676 /* 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
|
4677 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
|
4678 cend = newp + sumsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4679 *cend = 0; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4680 |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4681 /* |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4682 * 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
|
4683 * |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4684 * 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
|
4685 * 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
|
4686 * 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
|
4687 */ |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4688 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
|
4689 { |
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4690 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
|
4691 |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4692 cend -= currsize; |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4693 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
|
4694 if (spaces[t] > 0) |
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 cend -= spaces[t]; |
6929 | 4697 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
|
4698 } |
15326
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4699 |
fe428bee74b3
patch 8.1.0671: cursor in the wrong column after auto-formatting
Bram Moolenaar <Bram@vim.org>
parents:
15062
diff
changeset
|
4700 // 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
|
4701 // 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
|
4702 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
|
4703 |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4704 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
|
4705 (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
|
4706 if (t == 0) |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4707 break; |
2597 | 4708 curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t - 1)); |
3562 | 4709 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4710 if (remove_comments) | |
4711 curr += comments[t - 1]; | |
4712 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4713 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
|
4714 curr = skipwhite(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4715 currsize = (int)STRLEN(curr); |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4716 } |
7 | 4717 ml_replace(curwin->w_cursor.lnum, newp, FALSE); |
4718 | |
5848 | 4719 if (setmark) |
4720 { | |
4721 /* Set the '] mark. */ | |
4722 curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum; | |
4723 curwin->w_buffer->b_op_end.col = (colnr_T)STRLEN(newp); | |
4724 } | |
5664 | 4725 |
7 | 4726 /* Only report the change in the first line here, del_lines() will report |
4727 * the deleted line. */ | |
4728 changed_lines(curwin->w_cursor.lnum, currsize, | |
4729 curwin->w_cursor.lnum + 1, 0L); | |
4730 | |
4731 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4732 * Delete following lines. To do this we move the cursor there |
7 | 4733 * briefly, and then move it back. After del_lines() the cursor may |
4734 * have moved up (last line deleted), so the current lnum is kept in t. | |
4735 */ | |
4736 t = curwin->w_cursor.lnum; | |
4737 ++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
|
4738 del_lines(count - 1, FALSE); |
7 | 4739 curwin->w_cursor.lnum = t; |
4740 | |
4741 /* | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4742 * Set the cursor column: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4743 * 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
|
4744 * vim: use the column of the last join |
7 | 4745 */ |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4746 curwin->w_cursor.col = |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4747 (vim_strchr(p_cpo, CPO_JOINCOL) != NULL ? currsize : col); |
7 | 4748 check_cursor_col(); |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4749 |
7 | 4750 #ifdef FEAT_VIRTUALEDIT |
4751 curwin->w_cursor.coladd = 0; | |
4752 #endif | |
4753 curwin->w_set_curswant = TRUE; | |
4754 | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4755 theend: |
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4756 vim_free(spaces); |
3562 | 4757 #if defined(FEAT_COMMENTS) || defined(PROTO) |
4758 if (remove_comments) | |
4759 vim_free(comments); | |
4760 #endif | |
2294
2209060c340d
Make joining a range of lines much faster. (Milan Vancura)
Bram Moolenaar <bram@vim.org>
parents:
2289
diff
changeset
|
4761 return ret; |
7 | 4762 } |
4763 | |
4764 #ifdef FEAT_COMMENTS | |
4765 /* | |
4766 * Return TRUE if the two comment leaders given are the same. "lnum" is | |
4767 * the first line. White-space is ignored. Note that the whole of | |
4768 * 'leader1' must match 'leader2_len' characters from 'leader2' -- webb | |
4769 */ | |
4770 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4771 same_leader( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4772 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4773 int leader1_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4774 char_u *leader1_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4775 int leader2_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4776 char_u *leader2_flags) |
7 | 4777 { |
4778 int idx1 = 0, idx2 = 0; | |
4779 char_u *p; | |
4780 char_u *line1; | |
4781 char_u *line2; | |
4782 | |
4783 if (leader1_len == 0) | |
4784 return (leader2_len == 0); | |
4785 | |
4786 /* | |
4787 * If first leader has 'f' flag, the lines can be joined only if the | |
4788 * second line does not have a leader. | |
4789 * If first leader has 'e' flag, the lines can never be joined. | |
4790 * If fist leader has 's' flag, the lines can only be joined if there is | |
4791 * some text after it and the second line has the 'm' flag. | |
4792 */ | |
4793 if (leader1_flags != NULL) | |
4794 { | |
4795 for (p = leader1_flags; *p && *p != ':'; ++p) | |
4796 { | |
4797 if (*p == COM_FIRST) | |
4798 return (leader2_len == 0); | |
4799 if (*p == COM_END) | |
4800 return FALSE; | |
4801 if (*p == COM_START) | |
4802 { | |
4803 if (*(ml_get(lnum) + leader1_len) == NUL) | |
4804 return FALSE; | |
4805 if (leader2_flags == NULL || leader2_len == 0) | |
4806 return FALSE; | |
4807 for (p = leader2_flags; *p && *p != ':'; ++p) | |
4808 if (*p == COM_MIDDLE) | |
4809 return TRUE; | |
4810 return FALSE; | |
4811 } | |
4812 } | |
4813 } | |
4814 | |
4815 /* | |
4816 * Get current line and next line, compare the leaders. | |
4817 * The first line has to be saved, only one line can be locked at a time. | |
4818 */ | |
4819 line1 = vim_strsave(ml_get(lnum)); | |
4820 if (line1 != NULL) | |
4821 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4822 for (idx1 = 0; VIM_ISWHITE(line1[idx1]); ++idx1) |
7 | 4823 ; |
4824 line2 = ml_get(lnum + 1); | |
4825 for (idx2 = 0; idx2 < leader2_len; ++idx2) | |
4826 { | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4827 if (!VIM_ISWHITE(line2[idx2])) |
7 | 4828 { |
4829 if (line1[idx1++] != line2[idx2]) | |
4830 break; | |
4831 } | |
4832 else | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4833 while (VIM_ISWHITE(line1[idx1])) |
7 | 4834 ++idx1; |
4835 } | |
4836 vim_free(line1); | |
4837 } | |
4838 return (idx2 == leader2_len && idx1 == leader1_len); | |
4839 } | |
4840 #endif | |
4841 | |
4842 /* | |
3252 | 4843 * Implementation of the format operator 'gq'. |
7 | 4844 */ |
4845 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4846 op_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4847 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4848 int keep_cursor) /* keep cursor on same text char */ |
7 | 4849 { |
4850 long old_line_count = curbuf->b_ml.ml_line_count; | |
4851 | |
4852 /* Place the cursor where the "gq" or "gw" command was given, so that "u" | |
4853 * can put it back there. */ | |
4854 curwin->w_cursor = oap->cursor_start; | |
4855 | |
4856 if (u_save((linenr_T)(oap->start.lnum - 1), | |
4857 (linenr_T)(oap->end.lnum + 1)) == FAIL) | |
4858 return; | |
4859 curwin->w_cursor = oap->start; | |
4860 | |
4861 if (oap->is_VIsual) | |
4862 /* When there is no change: need to remove the Visual selection */ | |
4863 redraw_curbuf_later(INVERTED); | |
4864 | |
4865 /* Set '[ mark at the start of the formatted area */ | |
4866 curbuf->b_op_start = oap->start; | |
4867 | |
4868 /* For "gw" remember the cursor position and put it back below (adjusted | |
4869 * for joined and split lines). */ | |
4870 if (keep_cursor) | |
4871 saved_cursor = oap->cursor_start; | |
4872 | |
1563 | 4873 format_lines(oap->line_count, keep_cursor); |
7 | 4874 |
4875 /* | |
4876 * Leave the cursor at the first non-blank of the last formatted line. | |
4877 * If the cursor was moved one line back (e.g. with "Q}") go to the next | |
4878 * line, so "." will do the next lines. | |
4879 */ | |
4880 if (oap->end_adjusted && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) | |
4881 ++curwin->w_cursor.lnum; | |
4882 beginline(BL_WHITE | BL_FIX); | |
4883 old_line_count = curbuf->b_ml.ml_line_count - old_line_count; | |
4884 msgmore(old_line_count); | |
4885 | |
4886 /* put '] mark on the end of the formatted area */ | |
4887 curbuf->b_op_end = curwin->w_cursor; | |
4888 | |
4889 if (keep_cursor) | |
4890 { | |
4891 curwin->w_cursor = saved_cursor; | |
4892 saved_cursor.lnum = 0; | |
4893 } | |
4894 | |
4895 if (oap->is_VIsual) | |
4896 { | |
4897 win_T *wp; | |
4898 | |
4899 FOR_ALL_WINDOWS(wp) | |
4900 { | |
4901 if (wp->w_old_cursor_lnum != 0) | |
4902 { | |
4903 /* When lines have been inserted or deleted, adjust the end of | |
4904 * the Visual area to be redrawn. */ | |
4905 if (wp->w_old_cursor_lnum > wp->w_old_visual_lnum) | |
4906 wp->w_old_cursor_lnum += old_line_count; | |
4907 else | |
4908 wp->w_old_visual_lnum += old_line_count; | |
4909 } | |
4910 } | |
4911 } | |
4912 } | |
4913 | |
667 | 4914 #if defined(FEAT_EVAL) || defined(PROTO) |
4915 /* | |
4916 * Implementation of the format operator 'gq' for when using 'formatexpr'. | |
4917 */ | |
4918 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4919 op_formatexpr(oparg_T *oap) |
667 | 4920 { |
4921 if (oap->is_VIsual) | |
4922 /* When there is no change: need to remove the Visual selection */ | |
4923 redraw_curbuf_later(INVERTED); | |
4924 | |
2298
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4925 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
|
4926 /* 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
|
4927 * internal formatting. */ |
a3562a127cf6
When 'formatexpr' evaluates to non-zero fall back to internal formatting, also
Bram Moolenaar <bram@vim.org>
parents:
2294
diff
changeset
|
4928 op_format(oap, FALSE); |
667 | 4929 } |
4930 | |
4931 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4932 fex_format( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4933 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4934 long count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4935 int c) /* character to be inserted */ |
667 | 4936 { |
681 | 4937 int use_sandbox = was_set_insecurely((char_u *)"formatexpr", |
4938 OPT_LOCAL); | |
667 | 4939 int r; |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4940 char_u *fex; |
667 | 4941 |
4942 /* | |
4943 * Set v:lnum to the first line number and v:count to the number of lines. | |
844 | 4944 * Set v:char to the character to be inserted (can be NUL). |
667 | 4945 */ |
4946 set_vim_var_nr(VV_LNUM, lnum); | |
4947 set_vim_var_nr(VV_COUNT, count); | |
1969 | 4948 set_vim_var_char(c); |
844 | 4949 |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4950 /* 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
|
4951 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
|
4952 if (fex == NULL) |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4953 return 0; |
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4954 |
667 | 4955 /* |
4956 * Evaluate the function. | |
4957 */ | |
4958 if (use_sandbox) | |
4959 ++sandbox; | |
10104
b2dbe79639a2
commit https://github.com/vim/vim/commit/d77f9d595eb5f301b39b4373f2900a13c0ca30e2
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
4960 r = (int)eval_to_number(fex); |
667 | 4961 if (use_sandbox) |
4962 --sandbox; | |
844 | 4963 |
4964 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
|
4965 vim_free(fex); |
844 | 4966 |
667 | 4967 return r; |
4968 } | |
4969 #endif | |
4970 | |
7 | 4971 /* |
4972 * Format "line_count" lines, starting at the cursor position. | |
4973 * When "line_count" is negative, format until the end of the paragraph. | |
4974 * Lines after the cursor line are saved for undo, caller must have saved the | |
4975 * first line. | |
4976 */ | |
4977 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4978 format_lines( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4979 linenr_T line_count, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
4980 int avoid_fex) /* don't use 'formatexpr' */ |
7 | 4981 { |
4982 int max_len; | |
4983 int is_not_par; /* current line not part of parag. */ | |
4984 int next_is_not_par; /* next line not part of paragraph */ | |
4985 int is_end_par; /* at end of paragraph */ | |
4986 int prev_is_end_par = FALSE;/* prev. line not part of parag. */ | |
4987 int next_is_start_par = FALSE; | |
4988 #ifdef FEAT_COMMENTS | |
4989 int leader_len = 0; /* leader len of current line */ | |
4990 int next_leader_len; /* leader len of next line */ | |
4991 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
4992 char_u *next_leader_flags; /* flags for leader of next line */ | |
4993 int do_comments; /* format comments */ | |
3584 | 4994 int do_comments_list = 0; /* format comments with 'n' or '2' */ |
7 | 4995 #endif |
4996 int advance = TRUE; | |
3584 | 4997 int second_indent = -1; /* indent for second line (comment |
4998 * aware) */ | |
7 | 4999 int do_second_indent; |
5000 int do_number_indent; | |
5001 int do_trail_white; | |
5002 int first_par_line = TRUE; | |
5003 int smd_save; | |
5004 long count; | |
5005 int need_set_indent = TRUE; /* set indent of next paragraph */ | |
5006 int force_format = FALSE; | |
5007 int old_State = State; | |
5008 | |
5009 /* length of a line to force formatting: 3 * 'tw' */ | |
5010 max_len = comp_textwidth(TRUE) * 3; | |
5011 | |
5012 /* check for 'q', '2' and '1' in 'formatoptions' */ | |
5013 #ifdef FEAT_COMMENTS | |
5014 do_comments = has_format_option(FO_Q_COMS); | |
5015 #endif | |
5016 do_second_indent = has_format_option(FO_Q_SECOND); | |
5017 do_number_indent = has_format_option(FO_Q_NUMBER); | |
5018 do_trail_white = has_format_option(FO_WHITE_PAR); | |
5019 | |
5020 /* | |
5021 * Get info about the previous and current line. | |
5022 */ | |
5023 if (curwin->w_cursor.lnum > 1) | |
5024 is_not_par = fmt_check_par(curwin->w_cursor.lnum - 1 | |
5025 #ifdef FEAT_COMMENTS | |
5026 , &leader_len, &leader_flags, do_comments | |
5027 #endif | |
5028 ); | |
5029 else | |
5030 is_not_par = TRUE; | |
5031 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum | |
5032 #ifdef FEAT_COMMENTS | |
5033 , &next_leader_len, &next_leader_flags, do_comments | |
5034 #endif | |
5035 ); | |
5036 is_end_par = (is_not_par || next_is_not_par); | |
5037 if (!is_end_par && do_trail_white) | |
5038 is_end_par = !ends_in_white(curwin->w_cursor.lnum - 1); | |
5039 | |
5040 curwin->w_cursor.lnum--; | |
5041 for (count = line_count; count != 0 && !got_int; --count) | |
5042 { | |
5043 /* | |
5044 * Advance to next paragraph. | |
5045 */ | |
5046 if (advance) | |
5047 { | |
5048 curwin->w_cursor.lnum++; | |
5049 prev_is_end_par = is_end_par; | |
5050 is_not_par = next_is_not_par; | |
5051 #ifdef FEAT_COMMENTS | |
5052 leader_len = next_leader_len; | |
5053 leader_flags = next_leader_flags; | |
5054 #endif | |
5055 } | |
5056 | |
5057 /* | |
5058 * The last line to be formatted. | |
5059 */ | |
5060 if (count == 1 || curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count) | |
5061 { | |
5062 next_is_not_par = TRUE; | |
5063 #ifdef FEAT_COMMENTS | |
5064 next_leader_len = 0; | |
5065 next_leader_flags = NULL; | |
5066 #endif | |
5067 } | |
5068 else | |
5069 { | |
5070 next_is_not_par = fmt_check_par(curwin->w_cursor.lnum + 1 | |
5071 #ifdef FEAT_COMMENTS | |
5072 , &next_leader_len, &next_leader_flags, do_comments | |
5073 #endif | |
5074 ); | |
5075 if (do_number_indent) | |
5076 next_is_start_par = | |
5077 (get_number_indent(curwin->w_cursor.lnum + 1) > 0); | |
5078 } | |
5079 advance = TRUE; | |
5080 is_end_par = (is_not_par || next_is_not_par || next_is_start_par); | |
5081 if (!is_end_par && do_trail_white) | |
5082 is_end_par = !ends_in_white(curwin->w_cursor.lnum); | |
5083 | |
5084 /* | |
5085 * Skip lines that are not in a paragraph. | |
5086 */ | |
5087 if (is_not_par) | |
5088 { | |
5089 if (line_count < 0) | |
5090 break; | |
5091 } | |
5092 else | |
5093 { | |
5094 /* | |
5095 * For the first line of a paragraph, check indent of second line. | |
5096 * Don't do this for comments and empty lines. | |
5097 */ | |
5098 if (first_par_line | |
5099 && (do_second_indent || do_number_indent) | |
5100 && prev_is_end_par | |
3584 | 5101 && curwin->w_cursor.lnum < curbuf->b_ml.ml_line_count) |
5102 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
5103 if (do_second_indent && !LINEEMPTY(curwin->w_cursor.lnum + 1)) |
3584 | 5104 { |
5105 #ifdef FEAT_COMMENTS | |
5106 if (leader_len == 0 && next_leader_len == 0) | |
5107 { | |
5108 /* no comment found */ | |
5109 #endif | |
5110 second_indent = | |
5111 get_indent_lnum(curwin->w_cursor.lnum + 1); | |
7 | 5112 #ifdef FEAT_COMMENTS |
3584 | 5113 } |
5114 else | |
5115 { | |
5116 second_indent = next_leader_len; | |
5117 do_comments_list = 1; | |
5118 } | |
5119 #endif | |
5120 } | |
7 | 5121 else if (do_number_indent) |
3584 | 5122 { |
5123 #ifdef FEAT_COMMENTS | |
5124 if (leader_len == 0 && next_leader_len == 0) | |
5125 { | |
5126 /* no comment found */ | |
5127 #endif | |
5128 second_indent = | |
5129 get_number_indent(curwin->w_cursor.lnum); | |
5130 #ifdef FEAT_COMMENTS | |
5131 } | |
5132 else | |
5133 { | |
5134 /* get_number_indent() is now "comment aware"... */ | |
5135 second_indent = | |
5136 get_number_indent(curwin->w_cursor.lnum); | |
5137 do_comments_list = 1; | |
5138 } | |
5139 #endif | |
5140 } | |
7 | 5141 } |
5142 | |
5143 /* | |
5144 * When the comment leader changes, it's the end of the paragraph. | |
5145 */ | |
5146 if (curwin->w_cursor.lnum >= curbuf->b_ml.ml_line_count | |
5147 #ifdef FEAT_COMMENTS | |
5148 || !same_leader(curwin->w_cursor.lnum, | |
5149 leader_len, leader_flags, | |
5150 next_leader_len, next_leader_flags) | |
5151 #endif | |
5152 ) | |
5153 is_end_par = TRUE; | |
5154 | |
5155 /* | |
5156 * If we have got to the end of a paragraph, or the line is | |
5157 * getting long, format it. | |
5158 */ | |
5159 if (is_end_par || force_format) | |
5160 { | |
5161 if (need_set_indent) | |
5162 /* replace indent in first line with minimal number of | |
5163 * tabs and spaces, according to current options */ | |
5164 (void)set_indent(get_indent(), SIN_CHANGED); | |
5165 | |
5166 /* put cursor on last non-space */ | |
5167 State = NORMAL; /* don't go past end-of-line */ | |
5168 coladvance((colnr_T)MAXCOL); | |
5169 while (curwin->w_cursor.col && vim_isspace(gchar_cursor())) | |
5170 dec_cursor(); | |
5171 | |
5172 /* do the formatting, without 'showmode' */ | |
5173 State = INSERT; /* for open_line() */ | |
5174 smd_save = p_smd; | |
5175 p_smd = FALSE; | |
5176 insertchar(NUL, INSCHAR_FORMAT | |
5177 #ifdef FEAT_COMMENTS | |
5178 + (do_comments ? INSCHAR_DO_COM : 0) | |
3584 | 5179 + (do_comments && do_comments_list |
5180 ? INSCHAR_COM_LIST : 0) | |
7 | 5181 #endif |
1563 | 5182 + (avoid_fex ? INSCHAR_NO_FEX : 0), second_indent); |
7 | 5183 State = old_State; |
5184 p_smd = smd_save; | |
5185 second_indent = -1; | |
5186 /* at end of par.: need to set indent of next par. */ | |
5187 need_set_indent = is_end_par; | |
5188 if (is_end_par) | |
5189 { | |
5190 /* When called with a negative line count, break at the | |
5191 * end of the paragraph. */ | |
5192 if (line_count < 0) | |
5193 break; | |
5194 first_par_line = TRUE; | |
5195 } | |
5196 force_format = FALSE; | |
5197 } | |
5198 | |
5199 /* | |
5200 * When still in same paragraph, join the lines together. But | |
5403 | 5201 * first delete the leader from the second line. |
7 | 5202 */ |
5203 if (!is_end_par) | |
5204 { | |
5205 advance = FALSE; | |
5206 curwin->w_cursor.lnum++; | |
5207 curwin->w_cursor.col = 0; | |
5208 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
|
5209 break; |
7 | 5210 #ifdef FEAT_COMMENTS |
5211 if (next_leader_len > 0) | |
5403 | 5212 { |
5213 (void)del_bytes((long)next_leader_len, FALSE, FALSE); | |
7 | 5214 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
|
5215 (long)-next_leader_len, 0); |
5403 | 5216 } else |
5217 #endif | |
5218 if (second_indent > 0) /* the "leader" for FO_Q_SECOND */ | |
5219 { | |
12323
4dba3e4f3b01
patch 8.0.1041: bogus characters when indenting during visual-block append
Christian Brabandt <cb@256bit.org>
parents:
11997
diff
changeset
|
5220 int indent = getwhitecols_curline(); |
5403 | 5221 |
5222 if (indent > 0) | |
5223 { | |
5224 (void)del_bytes(indent, FALSE, FALSE); | |
5225 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
|
5226 (colnr_T)0, 0L, (long)-indent, 0); |
5415 | 5227 } |
5403 | 5228 } |
7 | 5229 curwin->w_cursor.lnum--; |
5848 | 5230 if (do_join(2, TRUE, FALSE, FALSE, FALSE) == FAIL) |
7 | 5231 { |
5232 beep_flush(); | |
5233 break; | |
5234 } | |
5235 first_par_line = FALSE; | |
5236 /* If the line is getting long, format it next time */ | |
5237 if (STRLEN(ml_get_curline()) > (size_t)max_len) | |
5238 force_format = TRUE; | |
5239 else | |
5240 force_format = FALSE; | |
5241 } | |
5242 } | |
5243 line_breakcheck(); | |
5244 } | |
5245 } | |
5246 | |
5247 /* | |
5248 * Return TRUE if line "lnum" ends in a white character. | |
5249 */ | |
5250 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5251 ends_in_white(linenr_T lnum) |
7 | 5252 { |
5253 char_u *s = ml_get(lnum); | |
5254 size_t l; | |
5255 | |
5256 if (*s == NUL) | |
5257 return FALSE; | |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5258 /* Don't use STRLEN() inside VIM_ISWHITE(), SAS/C complains: "macro |
7 | 5259 * invocation may call function multiple times". */ |
5260 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
|
5261 return VIM_ISWHITE(s[l]); |
7 | 5262 } |
5263 | |
5264 /* | |
5265 * Blank lines, and lines containing only the comment leader, are left | |
5266 * untouched by the formatting. The function returns TRUE in this | |
5267 * case. It also returns TRUE when a line starts with the end of a comment | |
5268 * ('e' in comment flags), so that this line is skipped, and not joined to the | |
5269 * previous line. A new paragraph starts after a blank line, or when the | |
5270 * comment leader changes -- webb. | |
5271 */ | |
5272 #ifdef FEAT_COMMENTS | |
5273 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5274 fmt_check_par( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5275 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5276 int *leader_len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5277 char_u **leader_flags, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5278 int do_comments) |
7 | 5279 { |
5280 char_u *flags = NULL; /* init for GCC */ | |
5281 char_u *ptr; | |
5282 | |
5283 ptr = ml_get(lnum); | |
5284 if (do_comments) | |
3562 | 5285 *leader_len = get_leader_len(ptr, leader_flags, FALSE, TRUE); |
7 | 5286 else |
5287 *leader_len = 0; | |
5288 | |
5289 if (*leader_len > 0) | |
5290 { | |
5291 /* | |
5292 * Search for 'e' flag in comment leader flags. | |
5293 */ | |
5294 flags = *leader_flags; | |
5295 while (*flags && *flags != ':' && *flags != COM_END) | |
5296 ++flags; | |
5297 } | |
5298 | |
5299 return (*skipwhite(ptr + *leader_len) == NUL | |
5300 || (*leader_len > 0 && *flags == COM_END) | |
5301 || startPS(lnum, NUL, FALSE)); | |
5302 } | |
5303 #else | |
5304 static int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5305 fmt_check_par(linenr_T lnum) |
7 | 5306 { |
5307 return (*skipwhite(ml_get(lnum)) == NUL || startPS(lnum, NUL, FALSE)); | |
5308 } | |
5309 #endif | |
5310 | |
5311 /* | |
5312 * Return TRUE when a paragraph starts in line "lnum". Return FALSE when the | |
5313 * previous line is in the same paragraph. Used for auto-formatting. | |
5314 */ | |
5315 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5316 paragraph_start(linenr_T lnum) |
7 | 5317 { |
5318 char_u *p; | |
5319 #ifdef FEAT_COMMENTS | |
5320 int leader_len = 0; /* leader len of current line */ | |
5321 char_u *leader_flags = NULL; /* flags for leader of current line */ | |
5322 int next_leader_len; /* leader len of next line */ | |
5323 char_u *next_leader_flags; /* flags for leader of next line */ | |
5324 int do_comments; /* format comments */ | |
5325 #endif | |
5326 | |
5327 if (lnum <= 1) | |
5328 return TRUE; /* start of the file */ | |
5329 | |
5330 p = ml_get(lnum - 1); | |
5331 if (*p == NUL) | |
5332 return TRUE; /* after empty line */ | |
5333 | |
5334 #ifdef FEAT_COMMENTS | |
5335 do_comments = has_format_option(FO_Q_COMS); | |
5336 #endif | |
5337 if (fmt_check_par(lnum - 1 | |
5338 #ifdef FEAT_COMMENTS | |
5339 , &leader_len, &leader_flags, do_comments | |
5340 #endif | |
5341 )) | |
5342 return TRUE; /* after non-paragraph line */ | |
5343 | |
5344 if (fmt_check_par(lnum | |
5345 #ifdef FEAT_COMMENTS | |
5346 , &next_leader_len, &next_leader_flags, do_comments | |
5347 #endif | |
5348 )) | |
5349 return TRUE; /* "lnum" is not a paragraph line */ | |
5350 | |
5351 if (has_format_option(FO_WHITE_PAR) && !ends_in_white(lnum - 1)) | |
5352 return TRUE; /* missing trailing space in previous line. */ | |
5353 | |
5354 if (has_format_option(FO_Q_NUMBER) && (get_number_indent(lnum) > 0)) | |
5355 return TRUE; /* numbered item starts in "lnum". */ | |
5356 | |
5357 #ifdef FEAT_COMMENTS | |
5358 if (!same_leader(lnum - 1, leader_len, leader_flags, | |
5359 next_leader_len, next_leader_flags)) | |
5360 return TRUE; /* change of comment leader. */ | |
5361 #endif | |
5362 | |
5363 return FALSE; | |
5364 } | |
5365 | |
5366 /* | |
5367 * prepare a few things for block mode yank/delete/tilde | |
5368 * | |
5369 * for delete: | |
5370 * - textlen includes the first/last char to be (partly) deleted | |
5371 * - start/endspaces is the number of columns that are taken by the | |
5372 * first/last deleted char minus the number of columns that have to be | |
1839 | 5373 * deleted. |
5374 * for yank and tilde: | |
7 | 5375 * - textlen includes the first/last char to be wholly yanked |
5376 * - start/endspaces is the number of columns of the first/last yanked char | |
5377 * that are to be yanked. | |
5378 */ | |
5379 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5380 block_prep( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5381 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5382 struct block_def *bdp, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5383 linenr_T lnum, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5384 int is_del) |
7 | 5385 { |
5386 int incr = 0; | |
5387 char_u *pend; | |
5388 char_u *pstart; | |
5389 char_u *line; | |
5390 char_u *prev_pstart; | |
5391 char_u *prev_pend; | |
5392 | |
5393 bdp->startspaces = 0; | |
5394 bdp->endspaces = 0; | |
5395 bdp->textlen = 0; | |
5396 bdp->start_vcol = 0; | |
5397 bdp->end_vcol = 0; | |
5398 bdp->is_short = FALSE; | |
5399 bdp->is_oneChar = FALSE; | |
5400 bdp->pre_whitesp = 0; | |
5401 bdp->pre_whitesp_c = 0; | |
5402 bdp->end_char_vcols = 0; | |
5403 bdp->start_char_vcols = 0; | |
5404 | |
5405 line = ml_get(lnum); | |
5406 pstart = line; | |
5407 prev_pstart = line; | |
5408 while (bdp->start_vcol < oap->start_vcol && *pstart) | |
5409 { | |
5410 /* Count a tab for what it's worth (if list mode not on) */ | |
5995 | 5411 incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol); |
7 | 5412 bdp->start_vcol += incr; |
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5413 if (VIM_ISWHITE(*pstart)) |
7 | 5414 { |
5415 bdp->pre_whitesp += incr; | |
5416 bdp->pre_whitesp_c++; | |
5417 } | |
5418 else | |
5419 { | |
5420 bdp->pre_whitesp = 0; | |
5421 bdp->pre_whitesp_c = 0; | |
5422 } | |
5423 prev_pstart = pstart; | |
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
5424 MB_PTR_ADV(pstart); |
7 | 5425 } |
5426 bdp->start_char_vcols = incr; | |
5427 if (bdp->start_vcol < oap->start_vcol) /* line too short */ | |
5428 { | |
5429 bdp->end_vcol = bdp->start_vcol; | |
5430 bdp->is_short = TRUE; | |
5431 if (!is_del || oap->op_type == OP_APPEND) | |
5432 bdp->endspaces = oap->end_vcol - oap->start_vcol + 1; | |
5433 } | |
5434 else | |
5435 { | |
5436 /* notice: this converts partly selected Multibyte characters to | |
5437 * spaces, too. */ | |
5438 bdp->startspaces = bdp->start_vcol - oap->start_vcol; | |
5439 if (is_del && bdp->startspaces) | |
5440 bdp->startspaces = bdp->start_char_vcols - bdp->startspaces; | |
5441 pend = pstart; | |
5442 bdp->end_vcol = bdp->start_vcol; | |
5443 if (bdp->end_vcol > oap->end_vcol) /* it's all in one character */ | |
5444 { | |
5445 bdp->is_oneChar = TRUE; | |
5446 if (oap->op_type == OP_INSERT) | |
5447 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5448 else if (oap->op_type == OP_APPEND) | |
5449 { | |
5450 bdp->startspaces += oap->end_vcol - oap->start_vcol + 1; | |
5451 bdp->endspaces = bdp->start_char_vcols - bdp->startspaces; | |
5452 } | |
5453 else | |
5454 { | |
5455 bdp->startspaces = oap->end_vcol - oap->start_vcol + 1; | |
5456 if (is_del && oap->op_type != OP_LSHIFT) | |
5457 { | |
5458 /* just putting the sum of those two into | |
5459 * bdp->startspaces doesn't work for Visual replace, | |
5460 * so we have to split the tab in two */ | |
5461 bdp->startspaces = bdp->start_char_vcols | |
5462 - (bdp->start_vcol - oap->start_vcol); | |
5463 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5464 } | |
5465 } | |
5466 } | |
5467 else | |
5468 { | |
5469 prev_pend = pend; | |
5470 while (bdp->end_vcol <= oap->end_vcol && *pend != NUL) | |
5471 { | |
5472 /* Count a tab for what it's worth (if list mode not on) */ | |
5473 prev_pend = pend; | |
6535 | 5474 incr = lbr_chartabsize_adv(line, &pend, (colnr_T)bdp->end_vcol); |
7 | 5475 bdp->end_vcol += incr; |
5476 } | |
5477 if (bdp->end_vcol <= oap->end_vcol | |
5478 && (!is_del | |
5479 || oap->op_type == OP_APPEND | |
5480 || oap->op_type == OP_REPLACE)) /* line too short */ | |
5481 { | |
5482 bdp->is_short = TRUE; | |
5483 /* Alternative: include spaces to fill up the block. | |
5484 * Disadvantage: can lead to trailing spaces when the line is | |
5485 * short where the text is put */ | |
5486 /* if (!is_del || oap->op_type == OP_APPEND) */ | |
5487 if (oap->op_type == OP_APPEND || virtual_op) | |
5488 bdp->endspaces = oap->end_vcol - bdp->end_vcol | |
593 | 5489 + oap->inclusive; |
7 | 5490 else |
5491 bdp->endspaces = 0; /* replace doesn't add characters */ | |
5492 } | |
5493 else if (bdp->end_vcol > oap->end_vcol) | |
5494 { | |
5495 bdp->endspaces = bdp->end_vcol - oap->end_vcol - 1; | |
5496 if (!is_del && bdp->endspaces) | |
5497 { | |
5498 bdp->endspaces = incr - bdp->endspaces; | |
5499 if (pend != pstart) | |
5500 pend = prev_pend; | |
5501 } | |
5502 } | |
5503 } | |
5504 bdp->end_char_vcols = incr; | |
5505 if (is_del && bdp->startspaces) | |
5506 pstart = prev_pstart; | |
5507 bdp->textlen = (int)(pend - pstart); | |
5508 } | |
5509 bdp->textcol = (colnr_T) (pstart - line); | |
5510 bdp->textstart = pstart; | |
5511 } | |
5512 | |
5513 /* | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5514 * Handle the add/subtract operator. |
7 | 5515 */ |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5516 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5517 op_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5518 oparg_T *oap, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5519 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
|
5520 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
|
5521 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5522 pos_T pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5523 struct block_def bd; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5524 int change_cnt = 0; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5525 linenr_T amount = Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5526 |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5527 // 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
|
5528 // 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
|
5529 // 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
|
5530 #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
|
5531 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
|
5532 #endif |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5533 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5534 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5535 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5536 pos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5537 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
|
5538 { |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5539 #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
|
5540 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
|
5541 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5542 return; |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5543 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5544 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
|
5545 #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
|
5546 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
|
5547 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5548 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5549 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
|
5550 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5551 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5552 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5553 int one_change; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5554 int length; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5555 pos_T startpos; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5556 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5557 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
|
5558 (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
|
5559 { |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5560 #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
|
5561 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
|
5562 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5563 return; |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5564 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5565 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5566 pos = oap->start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5567 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
|
5568 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5569 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
|
5570 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5571 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
|
5572 pos.col = bd.textcol; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5573 length = bd.textlen; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5574 } |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5575 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
|
5576 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5577 curwin->w_cursor.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5578 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5579 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
|
5580 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5581 else /* oap->motion_type == MCHAR */ |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5582 { |
12996
973a0037f4c3
patch 8.0.1374: CTRL-A does not work with an empty line
Christian Brabandt <cb@256bit.org>
parents:
12642
diff
changeset
|
5583 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
|
5584 dec(&(oap->end)); |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5585 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
|
5586 pos.col = 0; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5587 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
|
5588 { |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5589 pos.col += oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5590 length -= oap->start.col; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5591 } |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5592 if (pos.lnum == oap->end.lnum) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5593 { |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5594 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
|
5595 if (oap->end.col >= length) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5596 oap->end.col = length - 1; |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5597 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
|
5598 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5599 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5600 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
|
5601 if (one_change) |
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 /* 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
|
5604 if (change_cnt == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5605 startpos = curbuf->b_op_start; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5606 ++change_cnt; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5607 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5608 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5609 #ifdef FEAT_NETBEANS_INTG |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5610 if (netbeans_active() && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5611 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5612 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
|
5613 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5614 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
|
5615 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
|
5616 &ptr[pos.col], length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5617 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5618 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5619 if (g_cmd && one_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5620 amount += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5621 } |
15048
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5622 |
73f59cd01ba7
patch 8.1.0535: increment/decrement might get interrupted by updating folds
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
5623 #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
|
5624 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
|
5625 #endif |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5626 if (change_cnt) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5627 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
|
5628 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5629 if (!change_cnt && oap->is_VIsual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5630 /* 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
|
5631 redraw_curbuf_later(INVERTED); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5632 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5633 /* 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
|
5634 * position from do_addsub(). */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5635 if (change_cnt > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5636 curbuf->b_op_start = startpos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5637 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5638 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
|
5639 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
|
5640 change_cnt), change_cnt); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5641 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5642 } |
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 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5645 * 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
|
5646 * 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
|
5647 * |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5648 * 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
|
5649 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5650 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5651 do_addsub( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5652 int op_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5653 pos_T *pos, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5654 int length, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
5655 linenr_T Prenum1) |
7 | 5656 { |
5657 int col; | |
5658 char_u *buf1; | |
5659 char_u buf2[NUMBUFLEN]; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5660 int pre; /* 'X'/'x': hex; '0': octal; 'B'/'b': bin */ |
7 | 5661 static int hexupper = FALSE; /* 0xABC */ |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5662 uvarnumber_T n; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5663 uvarnumber_T oldn; |
7 | 5664 char_u *ptr; |
5665 int c; | |
5666 int todel; | |
5667 int dohex; | |
5668 int dooct; | |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5669 int dobin; |
7 | 5670 int doalp; |
5671 int firstdigit; | |
5672 int subtract; | |
6868 | 5673 int negative = FALSE; |
6891 | 5674 int was_positive = TRUE; |
6868 | 5675 int visual = VIsual_active; |
6921 | 5676 int did_change = FALSE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
5677 pos_T save_cursor = curwin->w_cursor; |
6927 | 5678 int maxlen = 0; |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5679 pos_T startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
5680 pos_T endpos; |
7 | 5681 |
5682 dohex = (vim_strchr(curbuf->b_p_nf, 'x') != NULL); /* "heX" */ | |
5683 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
|
5684 dobin = (vim_strchr(curbuf->b_p_nf, 'b') != NULL); /* "Bin" */ |
7 | 5685 doalp = (vim_strchr(curbuf->b_p_nf, 'p') != NULL); /* "alPha" */ |
5686 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5687 curwin->w_cursor = *pos; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5688 ptr = ml_get(pos->lnum); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5689 col = pos->col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5690 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5691 if (*ptr == NUL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5692 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5693 |
7 | 5694 /* |
5695 * First check if we are on a hexadecimal number, after the "0x". | |
5696 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5697 if (!VIsual_active) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5698 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5699 if (dobin) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5700 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
|
5701 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5702 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5703 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5704 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5705 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
|
5706 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5707 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5708 |
6868 | 5709 if (dohex) |
5710 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
|
5711 { |
6868 | 5712 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5713 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5714 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5715 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
|
5716 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5717 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5718 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5719 if ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5720 && dohex |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5721 && ! ((col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5722 && (ptr[col] == 'X' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5723 || ptr[col] == 'x') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5724 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5725 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5726 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5727 !(*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
|
5728 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5729 && vim_isxdigit(ptr[col + 1])))) |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5730 { |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5731 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5732 /* 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
|
5733 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5734 col = pos->col; |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5735 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5736 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
|
5737 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5738 col--; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5739 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5740 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5741 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
|
5742 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5743 } |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5744 } |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5745 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5746 if (( dohex |
6868 | 5747 && col > 0 |
5748 && (ptr[col] == 'X' | |
5749 || ptr[col] == 'x') | |
5750 && ptr[col - 1] == '0' | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5751 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5752 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5753 !(*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
|
5754 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5755 && vim_isxdigit(ptr[col + 1])) || |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5756 ( dobin |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5757 && col > 0 |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5758 && (ptr[col] == 'B' |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5759 || ptr[col] == 'b') |
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5760 && ptr[col - 1] == '0' |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5761 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5762 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5763 !(*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
|
5764 #endif |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5765 && vim_isbdigit(ptr[col + 1]))) |
6868 | 5766 { |
7447
ad432f8f68fb
commit https://github.com/vim/vim/commit/887c1fea4a114e7170091942d0446c8882701b5b
Christian Brabandt <cb@256bit.org>
parents:
7336
diff
changeset
|
5767 /* Found hexadecimal or binary number, move to its start. */ |
7 | 5768 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5769 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5770 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5771 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
|
5772 #endif |
6868 | 5773 } |
5774 else | |
7 | 5775 { |
6868 | 5776 /* |
5777 * Search forward and then backward to find the start of number. | |
5778 */ | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5779 col = pos->col; |
6868 | 5780 |
5781 while (ptr[col] != NUL | |
5782 && !vim_isdigit(ptr[col]) | |
5783 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5784 col += MB_PTR2LEN(ptr + col); |
6868 | 5785 |
5786 while (col > 0 | |
5787 && vim_isdigit(ptr[col - 1]) | |
5788 && !(doalp && ASCII_ISALPHA(ptr[col]))) | |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5789 { |
6868 | 5790 --col; |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5791 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5792 if (has_mbyte) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5793 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
|
5794 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5795 } |
6868 | 5796 } |
5797 } | |
5798 | |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5799 if (visual) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5800 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5801 while (ptr[col] != NUL && length > 0 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5802 && !vim_isdigit(ptr[col]) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5803 && !(doalp && ASCII_ISALPHA(ptr[col]))) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5804 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5805 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
|
5806 |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5807 col += mb_len; |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5808 length -= mb_len; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5809 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5810 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5811 if (length == 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5812 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5813 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5814 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
|
5815 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5816 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5817 !(*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
|
5818 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5819 ) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5820 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5821 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5822 was_positive = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5823 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5824 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5825 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5826 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5827 * 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
|
5828 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5829 firstdigit = ptr[col]; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5830 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
|
5831 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5832 beep_flush(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5833 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5834 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5835 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5836 if (doalp && ASCII_ISALPHA(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5837 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5838 /* decrement or increment alphabetic character */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5839 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5840 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5841 if (CharOrd(firstdigit) < Prenum1) |
6927 | 5842 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5843 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5844 firstdigit = 'A'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5845 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5846 firstdigit = 'a'; |
6927 | 5847 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5848 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5849 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5850 firstdigit = EBCDIC_CHAR_ADD(firstdigit, -Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5851 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5852 firstdigit -= Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5853 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5854 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5855 else |
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 if (26 - CharOrd(firstdigit) - 1 < Prenum1) |
6927 | 5858 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5859 if (isupper(firstdigit)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5860 firstdigit = 'Z'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5861 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5862 firstdigit = 'z'; |
6927 | 5863 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5864 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5865 #ifdef EBCDIC |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5866 firstdigit = EBCDIC_CHAR_ADD(firstdigit, Prenum1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5867 #else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5868 firstdigit += Prenum1; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5869 #endif |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5870 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5871 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5872 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5873 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5874 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5875 (void)del_char(FALSE); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5876 ins_char(firstdigit); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5877 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5878 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5879 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5880 else |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5881 { |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5882 if (col > 0 && ptr[col - 1] == '-' |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5883 #ifdef FEAT_MBYTE |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5884 && (!has_mbyte || |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5885 !(*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
|
5886 #endif |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
5887 && !visual) |
7574
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 /* negative number */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5890 --col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5891 negative = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5892 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5893 /* get the number value (unsigned) */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5894 if (visual && VIsual_mode != 'V') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5895 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
|
5896 ? (int)STRLEN(ptr) - col |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5897 : length); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5898 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5899 vim_str2nr(ptr + col, &pre, &length, |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5900 0 + (dobin ? STR2NR_BIN : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5901 + (dooct ? STR2NR_OCT : 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5902 + (dohex ? STR2NR_HEX : 0), |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5903 NULL, &n, maxlen); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5904 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5905 /* 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
|
5906 if (pre && negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5907 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5908 ++col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5909 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5910 negative = FALSE; |
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 /* add or subtract */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5913 subtract = FALSE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5914 if (op_type == OP_NR_SUB) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5915 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5916 if (negative) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5917 subtract ^= TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5918 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5919 oldn = n; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5920 if (subtract) |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5921 n -= (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5922 else |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5923 n += (uvarnumber_T)Prenum1; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5924 /* handle wraparound for decimal numbers */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5925 if (!pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5926 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5927 if (subtract) |
6927 | 5928 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5929 if (n > oldn) |
6868 | 5930 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5931 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
|
5932 negative ^= TRUE; |
6868 | 5933 } |
7 | 5934 } |
5935 else | |
6868 | 5936 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5937 /* add */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5938 if (n < oldn) |
6868 | 5939 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
5940 n = (n ^ (uvarnumber_T)-1); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5941 negative ^= TRUE; |
6868 | 5942 } |
6927 | 5943 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5944 if (n == 0) |
6868 | 5945 negative = FALSE; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5946 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5947 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5948 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
|
5949 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5950 /* need to remove the '-' */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5951 col--; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5952 length++; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5953 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5954 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5955 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5956 * Delete the old number. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5957 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5958 curwin->w_cursor.col = col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5959 if (!did_change) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5960 startpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5961 did_change = TRUE; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5962 todel = length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5963 c = gchar_cursor(); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5964 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5965 * 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
|
5966 * 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
|
5967 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5968 if (c == '-') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5969 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5970 while (todel-- > 0) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5971 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5972 if (c < 0x100 && isalpha(c)) |
6868 | 5973 { |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5974 if (isupper(c)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5975 hexupper = TRUE; |
6868 | 5976 else |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5977 hexupper = FALSE; |
6891 | 5978 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5979 /* 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
|
5980 (void)del_char(FALSE); |
6868 | 5981 c = gchar_cursor(); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5982 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5983 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5984 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5985 * Prepare the leading characters in buf1[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5986 * 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
|
5987 * Allocate a bit too much. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5988 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5989 buf1 = alloc((unsigned)length + NUMBUFLEN); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5990 if (buf1 == NULL) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5991 goto theend; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5992 ptr = buf1; |
8989
e600e696c0a1
commit https://github.com/vim/vim/commit/dc633cf82758f67f656cda7fa8ccc30414ee53f8
Christian Brabandt <cb@256bit.org>
parents:
8863
diff
changeset
|
5993 if (negative && (!visual || was_positive)) |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5994 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5995 *ptr++ = '-'; |
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 if (pre) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5998 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
5999 *ptr++ = '0'; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6000 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6001 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6002 if (pre == 'b' || pre == 'B' || |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6003 pre == 'x' || pre == 'X') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6004 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6005 *ptr++ = pre; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6006 --length; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6007 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6008 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6009 /* |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6010 * Put the number characters in buf2[]. |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6011 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6012 if (pre == 'b' || pre == 'B') |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6013 { |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6014 int i; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6015 int bit = 0; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
6016 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
|
6017 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6018 /* leading zeros */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6019 for (bit = bits; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6020 if ((n >> (bit - 1)) & 0x1) break; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6021 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6022 for (i = 0; bit > 0; bit--) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6023 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
|
6024 |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6025 buf2[i] = '\0'; |
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 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
|
6028 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
|
6029 (long long unsigned)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6030 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
|
6031 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
|
6032 (long long unsigned)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6033 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
|
6034 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
|
6035 (long long unsigned)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6036 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
|
6037 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
|
6038 (long long unsigned)n); |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6039 length -= (int)STRLEN(buf2); |
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 * 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
|
6043 * 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
|
6044 * Don't do this when |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6045 * 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
|
6046 */ |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6047 if (firstdigit == '0' && !(dooct && pre == 0)) |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6048 while (length-- > 0) |
6868 | 6049 *ptr++ = '0'; |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6050 *ptr = NUL; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6051 STRCAT(buf1, buf2); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6052 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
|
6053 vim_free(buf1); |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6054 endpos = curwin->w_cursor; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6055 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
|
6056 --curwin->w_cursor.col; |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6057 } |
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6058 |
7570
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6059 if (did_change) |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6060 { |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6061 /* set the '[ and '] marks */ |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6062 curbuf->b_op_start = startpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6063 curbuf->b_op_end = endpos; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6064 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
|
6065 --curbuf->b_op_end.col; |
4250ecde6009
commit https://github.com/vim/vim/commit/a52dfaed104183c1fa2a3b6e4430b23d86bcbece
Christian Brabandt <cb@256bit.org>
parents:
7551
diff
changeset
|
6066 } |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6067 |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6068 theend: |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6069 if (visual) |
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6070 curwin->w_cursor = save_cursor; |
8690
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
6071 else if (did_change) |
6a1becf4f282
commit https://github.com/vim/vim/commit/8e08125d3a9afd0b16cd84454ae9ddad0abaaab0
Christian Brabandt <cb@256bit.org>
parents:
8399
diff
changeset
|
6072 curwin->w_set_curswant = TRUE; |
7576
e008ca0e2af2
commit https://github.com/vim/vim/commit/7ae4fbca552c972eb3645ece02a2807e517610d7
Christian Brabandt <cb@256bit.org>
parents:
7574
diff
changeset
|
6073 |
7574
b872724c37db
commit https://github.com/vim/vim/commit/d79e55016cf8268cee935f1ac3b5b28712d1399e
Christian Brabandt <cb@256bit.org>
parents:
7570
diff
changeset
|
6074 return did_change; |
7 | 6075 } |
6076 | |
6077 #ifdef FEAT_VIMINFO | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6078 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6079 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
|
6080 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6081 #define REG_PREVIOUS 1 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6082 #define REG_EXEC 2 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6083 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6084 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6085 * 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
|
6086 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6087 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
6088 prepare_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6089 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6090 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
|
6091 * (int)sizeof(yankreg_T)); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6092 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6093 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6094 void |
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9272
diff
changeset
|
6095 finish_viminfo_registers(void) |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6096 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6097 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6098 int j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6099 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6100 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6101 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6102 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
|
6103 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
|
6104 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6105 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
|
6106 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
|
6107 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
|
6108 } |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
6109 VIM_CLEAR(y_read_regs); |
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 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6112 |
7 | 6113 int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6114 read_viminfo_register(vir_T *virp, int force) |
7 | 6115 { |
6116 int eof; | |
6117 int do_it = TRUE; | |
6118 int size; | |
6119 int limit; | |
6120 int i; | |
6121 int set_prev = FALSE; | |
6122 char_u *str; | |
6123 char_u **array = NULL; | |
6508 | 6124 int new_type = MCHAR; /* init to shut up compiler */ |
6125 colnr_T new_width = 0; /* init to shut up compiler */ | |
7 | 6126 |
6127 /* We only get here (hopefully) if line[0] == '"' */ | |
6128 str = virp->vir_line + 1; | |
1893 | 6129 |
6130 /* If the line starts with "" this is the y_previous register. */ | |
7 | 6131 if (*str == '"') |
6132 { | |
6133 set_prev = TRUE; | |
6134 str++; | |
6135 } | |
1893 | 6136 |
7 | 6137 if (!ASCII_ISALNUM(*str) && *str != '-') |
6138 { | |
6139 if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line)) | |
6140 return TRUE; /* too many errors, pretend end-of-file */ | |
6141 do_it = FALSE; | |
6142 } | |
6143 get_yank_register(*str++, FALSE); | |
6144 if (!force && y_current->y_array != NULL) | |
6145 do_it = FALSE; | |
1893 | 6146 |
6147 if (*str == '@') | |
6148 { | |
6149 /* "x@: register x used for @@ */ | |
6150 if (force || execreg_lastc == NUL) | |
6151 execreg_lastc = str[-1]; | |
6152 } | |
6153 | |
7 | 6154 size = 0; |
6155 limit = 100; /* Optimized for registers containing <= 100 lines */ | |
6156 if (do_it) | |
6157 { | |
6462 | 6158 /* |
6159 * Build the new register in array[]. | |
6160 * y_array is kept as-is until done. | |
6161 * The "do_it" flag is reset when something is wrong, in which case | |
6162 * array[] needs to be freed. | |
6163 */ | |
7 | 6164 if (set_prev) |
6165 y_previous = y_current; | |
6462 | 6166 array = (char_u **)alloc((unsigned)(limit * sizeof(char_u *))); |
1893 | 6167 str = skipwhite(skiptowhite(str)); |
7 | 6168 if (STRNCMP(str, "CHAR", 4) == 0) |
6462 | 6169 new_type = MCHAR; |
7 | 6170 else if (STRNCMP(str, "BLOCK", 5) == 0) |
6462 | 6171 new_type = MBLOCK; |
7 | 6172 else |
6462 | 6173 new_type = MLINE; |
7 | 6174 /* get the block width; if it's missing we get a zero, which is OK */ |
6175 str = skipwhite(skiptowhite(str)); | |
6462 | 6176 new_width = getdigits(&str); |
7 | 6177 } |
6178 | |
6179 while (!(eof = viminfo_readline(virp)) | |
6180 && (virp->vir_line[0] == TAB || virp->vir_line[0] == '<')) | |
6181 { | |
6182 if (do_it) | |
6183 { | |
6462 | 6184 if (size == limit) |
7 | 6185 { |
6462 | 6186 char_u **new_array = (char_u **) |
7 | 6187 alloc((unsigned)(limit * 2 * sizeof(char_u *))); |
6462 | 6188 |
6189 if (new_array == NULL) | |
6190 { | |
6191 do_it = FALSE; | |
6192 break; | |
6193 } | |
7 | 6194 for (i = 0; i < limit; i++) |
6462 | 6195 new_array[i] = array[i]; |
7 | 6196 vim_free(array); |
6462 | 6197 array = new_array; |
7 | 6198 limit *= 2; |
6199 } | |
6200 str = viminfo_readstring(virp, 1, TRUE); | |
6201 if (str != NULL) | |
6202 array[size++] = str; | |
6203 else | |
6462 | 6204 /* error, don't store the result */ |
7 | 6205 do_it = FALSE; |
6206 } | |
6207 } | |
6508 | 6208 |
7 | 6209 if (do_it) |
6210 { | |
6462 | 6211 /* free y_array[] */ |
6212 for (i = 0; i < y_current->y_size; i++) | |
6213 vim_free(y_current->y_array[i]); | |
6214 vim_free(y_current->y_array); | |
6215 | |
6216 y_current->y_type = new_type; | |
6217 y_current->y_width = new_width; | |
6218 y_current->y_size = size; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6219 y_current->y_time_set = 0; |
7 | 6220 if (size == 0) |
6221 { | |
6222 y_current->y_array = NULL; | |
6223 } | |
6462 | 6224 else |
7 | 6225 { |
6462 | 6226 /* Move the lines from array[] to y_array[]. */ |
7 | 6227 y_current->y_array = |
6228 (char_u **)alloc((unsigned)(size * sizeof(char_u *))); | |
6229 for (i = 0; i < size; i++) | |
6462 | 6230 { |
6231 if (y_current->y_array == NULL) | |
6232 vim_free(array[i]); | |
6233 else | |
6234 y_current->y_array[i] = array[i]; | |
6235 } | |
7 | 6236 } |
6462 | 6237 } |
6238 else | |
6239 { | |
6240 /* Free array[] if it was filled. */ | |
6241 for (i = 0; i < size; i++) | |
6242 vim_free(array[i]); | |
6243 } | |
6244 vim_free(array); | |
6245 | |
7 | 6246 return eof; |
6247 } | |
6248 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6249 /* |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6250 * 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
|
6251 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6252 void |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6253 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
|
6254 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6255 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
|
6256 int flags; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6257 int name; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6258 int type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6259 int linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6260 int width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6261 time_t timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6262 yankreg_T *y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6263 int i; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6264 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6265 /* Check the format: |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6266 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6267 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6268 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6269 if (values->ga_len < 6 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6270 || vp[0].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6271 || vp[1].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6272 || vp[2].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6273 || vp[3].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6274 || vp[4].bv_type != BVAL_NR |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6275 || vp[5].bv_type != BVAL_NR) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6276 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6277 flags = vp[0].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6278 name = vp[1].bv_nr; |
9307
eb52a2670c96
commit https://github.com/vim/vim/commit/67e3720a9ddd8a9d2e8344358c28fa1f4196db0d
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
6279 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
|
6280 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6281 type = vp[2].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6282 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
|
6283 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6284 linecount = vp[3].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6285 if (values->ga_len < 6 + linecount) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6286 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6287 width = vp[4].bv_nr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6288 if (width < 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6289 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6290 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6291 if (y_read_regs != NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6292 /* 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
|
6293 * 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
|
6294 y_ptr = &y_read_regs[name]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6295 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6296 y_ptr = &y_regs[name]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6297 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6298 /* 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
|
6299 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
|
6300 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
|
6301 && (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
|
6302 return; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6303 |
9332
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6304 if (y_ptr->y_array != NULL) |
a9b8f5613601
commit https://github.com/vim/vim/commit/ad5ca9bc1e7145474adb082775a805f1731e9e37
Christian Brabandt <cb@256bit.org>
parents:
9307
diff
changeset
|
6305 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
|
6306 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
|
6307 vim_free(y_ptr->y_array); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6308 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6309 if (y_read_regs == NULL) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6310 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6311 if (flags & REG_PREVIOUS) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6312 y_previous = y_ptr; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6313 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
|
6314 execreg_lastc = get_register_name(name); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6315 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6316 y_ptr->y_type = type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6317 y_ptr->y_width = width; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6318 y_ptr->y_size = linecount; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6319 y_ptr->y_time_set = timestamp; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6320 if (linecount == 0) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6321 y_ptr->y_array = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6322 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6323 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6324 y_ptr->y_array = |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6325 (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
|
6326 for (i = 0; i < linecount; i++) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6327 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6328 if (vp[i + 6].bv_allocated) |
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 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
|
6331 vp[i + 6].bv_string = NULL; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6332 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6333 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6334 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
|
6335 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6336 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6337 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6338 |
7 | 6339 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6340 write_viminfo_registers(FILE *fp) |
7 | 6341 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6342 int i, j; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6343 char_u *type; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6344 char_u c; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6345 int num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6346 int max_num_lines; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6347 int max_kbyte; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6348 long len; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6349 yankreg_T *y_ptr; |
7 | 6350 |
2278
0b3be97064e5
Various small fixes from Dominique Pelle.
Bram Moolenaar <bram@vim.org>
parents:
2210
diff
changeset
|
6351 fputs(_("\n# Registers:\n"), fp); |
7 | 6352 |
6353 /* Get '<' value, use old '"' value if '<' is not found. */ | |
6354 max_num_lines = get_viminfo_parameter('<'); | |
6355 if (max_num_lines < 0) | |
6356 max_num_lines = get_viminfo_parameter('"'); | |
6357 if (max_num_lines == 0) | |
6358 return; | |
6359 max_kbyte = get_viminfo_parameter('s'); | |
6360 if (max_kbyte == 0) | |
6361 return; | |
1893 | 6362 |
7 | 6363 for (i = 0; i < NUM_REGISTERS; i++) |
6364 { | |
6365 #ifdef FEAT_CLIPBOARD | |
6366 /* Skip '*'/'+' register, we don't want them back next time */ | |
6367 if (i == STAR_REGISTER || i == PLUS_REGISTER) | |
6368 continue; | |
6369 #endif | |
6370 #ifdef FEAT_DND | |
6371 /* Neither do we want the '~' register */ | |
6372 if (i == TILDE_REGISTER) | |
6373 continue; | |
6374 #endif | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6375 /* 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
|
6376 * viminfo if it's newer. */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6377 if (y_read_regs != NULL |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6378 && 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
|
6379 && (y_regs[i].y_array == NULL || |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6380 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
|
6381 y_ptr = &y_read_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6382 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
|
6383 continue; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6384 else |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6385 y_ptr = &y_regs[i]; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6386 |
55 | 6387 /* Skip empty registers. */ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6388 num_lines = y_ptr->y_size; |
55 | 6389 if (num_lines == 0 |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6390 || (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
|
6391 && *y_ptr->y_array[0] == NUL)) |
55 | 6392 continue; |
6393 | |
7 | 6394 if (max_kbyte > 0) |
6395 { | |
6396 /* Skip register if there is more text than the maximum size. */ | |
6397 len = 0; | |
6398 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
|
6399 len += (long)STRLEN(y_ptr->y_array[j]) + 1L; |
7 | 6400 if (len > (long)max_kbyte * 1024L) |
6401 continue; | |
6402 } | |
6403 | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6404 switch (y_ptr->y_type) |
7 | 6405 { |
6406 case MLINE: | |
6407 type = (char_u *)"LINE"; | |
6408 break; | |
6409 case MCHAR: | |
6410 type = (char_u *)"CHAR"; | |
6411 break; | |
6412 case MBLOCK: | |
6413 type = (char_u *)"BLOCK"; | |
6414 break; | |
6415 default: | |
6416 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
|
6417 y_ptr->y_type); |
7 | 6418 emsg(IObuff); |
6419 type = (char_u *)"LINE"; | |
6420 break; | |
6421 } | |
6422 if (y_previous == &y_regs[i]) | |
6423 fprintf(fp, "\""); | |
6424 c = get_register_name(i); | |
1893 | 6425 fprintf(fp, "\"%c", c); |
6426 if (c == execreg_lastc) | |
6427 fprintf(fp, "@"); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6428 fprintf(fp, "\t%s\t%d\n", type, (int)y_ptr->y_width); |
7 | 6429 |
6430 /* If max_num_lines < 0, then we save ALL the lines in the register */ | |
6431 if (max_num_lines > 0 && num_lines > max_num_lines) | |
6432 num_lines = max_num_lines; | |
6433 for (j = 0; j < num_lines; j++) | |
6434 { | |
6435 putc('\t', fp); | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6436 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
|
6437 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6438 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6439 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6440 int flags = 0; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6441 int remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6442 |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6443 /* 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
|
6444 * |{bartype},{flags},{name},{type}, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6445 * {linecount},{width},{timestamp},"line1","line2" |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6446 * 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
|
6447 * REG_EXEC - used for @@ |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6448 */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6449 if (y_previous == &y_regs[i]) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6450 flags |= REG_PREVIOUS; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6451 if (c == execreg_lastc) |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6452 flags |= REG_EXEC; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6453 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
|
6454 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
|
6455 (long)y_ptr->y_time_set); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6456 /* 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
|
6457 remaining = LSIZE - 71; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6458 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
|
6459 { |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6460 putc(',', fp); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6461 --remaining; |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6462 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
|
6463 remaining); |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6464 } |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6465 putc('\n', fp); |
7 | 6466 } |
6467 } | |
6468 } | |
6469 #endif /* FEAT_VIMINFO */ | |
6470 | |
6471 #if defined(FEAT_CLIPBOARD) || defined(PROTO) | |
6472 /* | |
6473 * SELECTION / PRIMARY ('*') | |
6474 * | |
6475 * Text selection stuff that uses the GUI selection register '*'. When using a | |
6476 * GUI this may be text from another window, otherwise it is the last text we | |
6477 * had highlighted with VIsual mode. With mouse support, clicking the middle | |
6478 * button performs the paste, otherwise you will need to do <"*p>. " | |
6479 * If not under X, it is synonymous with the clipboard register '+'. | |
6480 * | |
6481 * X CLIPBOARD ('+') | |
6482 * | |
6483 * Text selection stuff that uses the GUI clipboard register '+'. | |
6484 * Under X, this matches the standard cut/paste buffer CLIPBOARD selection. | |
6485 * It will be used for unnamed cut/pasting is 'clipboard' contains "unnamed", | |
6486 * otherwise you will need to do <"+p>. " | |
6487 * If not under X, it is synonymous with the selection register '*'. | |
6488 */ | |
6489 | |
6490 /* | |
6491 * 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
|
6492 * so that the text is still available after Vim has exited. X selections |
7 | 6493 * only exist while the owning application exists, so we write to the |
6494 * permanent (while X runs) store CUT_BUFFER0. | |
6495 * Dump the CLIPBOARD selection if we own it (it's logically the more | |
6496 * 'permanent' of the two), otherwise the PRIMARY one. | |
6497 * For now, use a hard-coded sanity limit of 1Mb of data. | |
6498 */ | |
9834
80ace3687eec
commit https://github.com/vim/vim/commit/a6b7a08ae04a3cd4d9c45c906bb7a197e2135179
Christian Brabandt <cb@256bit.org>
parents:
9389
diff
changeset
|
6499 #if (defined(FEAT_X11) && defined(FEAT_CLIPBOARD)) || defined(PROTO) |
7 | 6500 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6501 x11_export_final_selection(void) |
7 | 6502 { |
6503 Display *dpy; | |
6504 char_u *str = NULL; | |
6505 long_u len = 0; | |
6506 int motion_type = -1; | |
6507 | |
6508 # ifdef FEAT_GUI | |
6509 if (gui.in_use) | |
6510 dpy = X_DISPLAY; | |
6511 else | |
6512 # endif | |
6513 # ifdef FEAT_XCLIPBOARD | |
6514 dpy = xterm_dpy; | |
6515 # else | |
6516 return; | |
6517 # endif | |
6518 | |
6519 /* Get selection to export */ | |
6520 if (clip_plus.owned) | |
6521 motion_type = clip_convert_selection(&str, &len, &clip_plus); | |
6522 else if (clip_star.owned) | |
6523 motion_type = clip_convert_selection(&str, &len, &clip_star); | |
6524 | |
6525 /* Check it's OK */ | |
6526 if (dpy != NULL && str != NULL && motion_type >= 0 | |
6527 && len < 1024*1024 && len > 0) | |
6528 { | |
1924 | 6529 #ifdef FEAT_MBYTE |
4201 | 6530 int ok = TRUE; |
6531 | |
1924 | 6532 /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from |
6533 * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit | |
6534 * encoding conversion usually doesn't work, so keep the text as-is. | |
6535 */ | |
6536 if (has_mbyte) | |
6537 { | |
6538 vimconv_T vc; | |
6539 | |
6540 vc.vc_type = CONV_NONE; | |
6541 if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) | |
6542 { | |
2047
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6543 int intlen = len; |
85da03763130
updated for version 7.2.333
Bram Moolenaar <bram@zimbu.org>
parents:
2007
diff
changeset
|
6544 char_u *conv_str; |
2007 | 6545 |
4201 | 6546 vc.vc_fail = TRUE; |
2007 | 6547 conv_str = string_convert(&vc, str, &intlen); |
6548 len = intlen; | |
1924 | 6549 if (conv_str != NULL) |
6550 { | |
6551 vim_free(str); | |
6552 str = conv_str; | |
6553 } | |
4201 | 6554 else |
6555 { | |
6556 ok = FALSE; | |
6557 } | |
1924 | 6558 convert_setup(&vc, NULL, NULL); |
6559 } | |
4201 | 6560 else |
6561 { | |
6562 ok = FALSE; | |
6563 } | |
1924 | 6564 } |
4201 | 6565 |
6566 /* Do not store the string if conversion failed. Better to use any | |
6567 * other selection than garbled text. */ | |
6568 if (ok) | |
6569 #endif | |
6570 { | |
6571 XStoreBuffer(dpy, (char *)str, (int)len, 0); | |
6572 XFlush(dpy); | |
6573 } | |
7 | 6574 } |
6575 | |
6576 vim_free(str); | |
6577 } | |
6578 #endif | |
6579 | |
6580 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6581 clip_free_selection(VimClipboard *cbd) |
7 | 6582 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6583 yankreg_T *y_ptr = y_current; |
7 | 6584 |
6585 if (cbd == &clip_plus) | |
6586 y_current = &y_regs[PLUS_REGISTER]; | |
6587 else | |
6588 y_current = &y_regs[STAR_REGISTER]; | |
6589 free_yank_all(); | |
6590 y_current->y_size = 0; | |
6591 y_current = y_ptr; | |
6592 } | |
6593 | |
6594 /* | |
15422
b55b89692fd2
patch 8.1.0719: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15326
diff
changeset
|
6595 * Get the selected text and put it in register '*' or '+'. |
7 | 6596 */ |
6597 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6598 clip_get_selection(VimClipboard *cbd) |
7 | 6599 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6600 yankreg_T *old_y_previous, *old_y_current; |
7 | 6601 pos_T old_cursor; |
6602 pos_T old_visual; | |
6603 int old_visual_mode; | |
6604 colnr_T old_curswant; | |
6605 int old_set_curswant; | |
6606 pos_T old_op_start, old_op_end; | |
6607 oparg_T oa; | |
6608 cmdarg_T ca; | |
6609 | |
6610 if (cbd->owned) | |
6611 { | |
6612 if ((cbd == &clip_plus && y_regs[PLUS_REGISTER].y_array != NULL) | |
6613 || (cbd == &clip_star && y_regs[STAR_REGISTER].y_array != NULL)) | |
6614 return; | |
6615 | |
6616 /* Get the text between clip_star.start & clip_star.end */ | |
6617 old_y_previous = y_previous; | |
6618 old_y_current = y_current; | |
6619 old_cursor = curwin->w_cursor; | |
6620 old_curswant = curwin->w_curswant; | |
6621 old_set_curswant = curwin->w_set_curswant; | |
6622 old_op_start = curbuf->b_op_start; | |
6623 old_op_end = curbuf->b_op_end; | |
6624 old_visual = VIsual; | |
6625 old_visual_mode = VIsual_mode; | |
6626 clear_oparg(&oa); | |
6627 oa.regname = (cbd == &clip_plus ? '+' : '*'); | |
6628 oa.op_type = OP_YANK; | |
6629 vim_memset(&ca, 0, sizeof(ca)); | |
6630 ca.oap = &oa; | |
6631 ca.cmdchar = 'y'; | |
6632 ca.count1 = 1; | |
6633 ca.retval = CA_NO_ADJ_OP_END; | |
6634 do_pending_operator(&ca, 0, TRUE); | |
6635 y_previous = old_y_previous; | |
6636 y_current = old_y_current; | |
6637 curwin->w_cursor = old_cursor; | |
688 | 6638 changed_cline_bef_curs(); /* need to update w_virtcol et al */ |
7 | 6639 curwin->w_curswant = old_curswant; |
6640 curwin->w_set_curswant = old_set_curswant; | |
6641 curbuf->b_op_start = old_op_start; | |
6642 curbuf->b_op_end = old_op_end; | |
6643 VIsual = old_visual; | |
6644 VIsual_mode = old_visual_mode; | |
6645 } | |
11273
96d83cd2904a
patch 8.0.0522: Win32: when 'clipboard' is "unnamed" yyp does not work
Christian Brabandt <cb@256bit.org>
parents:
11158
diff
changeset
|
6646 else if (!is_clipboard_needs_update()) |
7 | 6647 { |
6648 clip_free_selection(cbd); | |
6649 | |
6650 /* Try to get selected text from another window */ | |
6651 clip_gen_request_selection(cbd); | |
6652 } | |
6653 } | |
6654 | |
2896 | 6655 /* |
6656 * Convert from the GUI selection string into the '*'/'+' register. | |
6657 */ | |
7 | 6658 void |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6659 clip_yank_selection( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6660 int type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6661 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6662 long len, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6663 VimClipboard *cbd) |
7 | 6664 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6665 yankreg_T *y_ptr; |
7 | 6666 |
6667 if (cbd == &clip_plus) | |
6668 y_ptr = &y_regs[PLUS_REGISTER]; | |
6669 else | |
6670 y_ptr = &y_regs[STAR_REGISTER]; | |
6671 | |
6672 clip_free_selection(cbd); | |
6673 | |
5798 | 6674 str_to_reg(y_ptr, type, str, len, 0L, FALSE); |
7 | 6675 } |
6676 | |
6677 /* | |
6678 * Convert the '*'/'+' register into a GUI selection string returned in *str | |
6679 * with length *len. | |
6680 * Returns the motion type, or -1 for failure. | |
6681 */ | |
6682 int | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6683 clip_convert_selection(char_u **str, long_u *len, VimClipboard *cbd) |
7 | 6684 { |
6685 char_u *p; | |
6686 int lnum; | |
6687 int i, j; | |
6688 int_u eolsize; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6689 yankreg_T *y_ptr; |
7 | 6690 |
6691 if (cbd == &clip_plus) | |
6692 y_ptr = &y_regs[PLUS_REGISTER]; | |
6693 else | |
6694 y_ptr = &y_regs[STAR_REGISTER]; | |
6695 | |
6696 #ifdef USE_CRNL | |
6697 eolsize = 2; | |
6698 #else | |
6699 eolsize = 1; | |
6700 #endif | |
6701 | |
6702 *str = NULL; | |
6703 *len = 0; | |
6704 if (y_ptr->y_array == NULL) | |
6705 return -1; | |
6706 | |
6707 for (i = 0; i < y_ptr->y_size; i++) | |
6708 *len += (long_u)STRLEN(y_ptr->y_array[i]) + eolsize; | |
6709 | |
6710 /* | |
6711 * Don't want newline character at end of last line if we're in MCHAR mode. | |
6712 */ | |
6713 if (y_ptr->y_type == MCHAR && *len >= eolsize) | |
6714 *len -= eolsize; | |
6715 | |
6716 p = *str = lalloc(*len + 1, TRUE); /* add one to avoid zero */ | |
6717 if (p == NULL) | |
6718 return -1; | |
6719 lnum = 0; | |
6720 for (i = 0, j = 0; i < (int)*len; i++, j++) | |
6721 { | |
6722 if (y_ptr->y_array[lnum][j] == '\n') | |
6723 p[i] = NUL; | |
6724 else if (y_ptr->y_array[lnum][j] == NUL) | |
6725 { | |
6726 #ifdef USE_CRNL | |
6727 p[i++] = '\r'; | |
6728 #endif | |
6729 #ifdef USE_CR | |
6730 p[i] = '\r'; | |
6731 #else | |
6732 p[i] = '\n'; | |
6733 #endif | |
6734 lnum++; | |
6735 j = -1; | |
6736 } | |
6737 else | |
6738 p[i] = y_ptr->y_array[lnum][j]; | |
6739 } | |
6740 return y_ptr->y_type; | |
6741 } | |
6742 | |
6743 | |
6744 /* | |
6745 * If we have written to a clipboard register, send the text to the clipboard. | |
6746 */ | |
6747 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6748 may_set_selection(void) |
7 | 6749 { |
6750 if (y_current == &(y_regs[STAR_REGISTER]) && clip_star.available) | |
6751 { | |
6752 clip_own_selection(&clip_star); | |
6753 clip_gen_set_selection(&clip_star); | |
6754 } | |
6755 else if (y_current == &(y_regs[PLUS_REGISTER]) && clip_plus.available) | |
6756 { | |
6757 clip_own_selection(&clip_plus); | |
6758 clip_gen_set_selection(&clip_plus); | |
6759 } | |
6760 } | |
6761 | |
6762 #endif /* FEAT_CLIPBOARD || PROTO */ | |
6763 | |
6764 | |
6765 #if defined(FEAT_DND) || defined(PROTO) | |
6766 /* | |
6767 * Replace the contents of the '~' register with str. | |
6768 */ | |
6769 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6770 dnd_yank_drag_data(char_u *str, long len) |
7 | 6771 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6772 yankreg_T *curr; |
7 | 6773 |
6774 curr = y_current; | |
6775 y_current = &y_regs[TILDE_REGISTER]; | |
6776 free_yank_all(); | |
5798 | 6777 str_to_reg(y_current, MCHAR, str, len, 0L, FALSE); |
7 | 6778 y_current = curr; |
6779 } | |
6780 #endif | |
6781 | |
6782 | |
6783 #if defined(FEAT_EVAL) || defined(PROTO) | |
6784 /* | |
6785 * Return the type of a register. | |
6786 * Used for getregtype() | |
6787 * Returns MAUTO for error. | |
6788 */ | |
6789 char_u | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6790 get_reg_type(int regname, long *reglen) |
7 | 6791 { |
6792 switch (regname) | |
6793 { | |
6794 case '%': /* file name */ | |
6795 case '#': /* alternate file name */ | |
6796 case '=': /* expression */ | |
6797 case ':': /* last command line */ | |
6798 case '/': /* last search-pattern */ | |
6799 case '.': /* last inserted text */ | |
6800 #ifdef FEAT_SEARCHPATH | |
6801 case Ctrl_F: /* Filename under cursor */ | |
6802 case Ctrl_P: /* Path under cursor, expand via "path" */ | |
6803 #endif | |
6804 case Ctrl_W: /* word under cursor */ | |
6805 case Ctrl_A: /* WORD (mnemonic All) under cursor */ | |
6806 case '_': /* black hole: always empty */ | |
6807 return MCHAR; | |
6808 } | |
6809 | |
6810 #ifdef FEAT_CLIPBOARD | |
6811 regname = may_get_selection(regname); | |
6812 #endif | |
6813 | |
5596 | 6814 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
|
6815 return MAUTO; |
5596 | 6816 |
7 | 6817 get_yank_register(regname, FALSE); |
6818 | |
6819 if (y_current->y_array != NULL) | |
6820 { | |
6821 if (reglen != NULL && y_current->y_type == MBLOCK) | |
6822 *reglen = y_current->y_width; | |
6823 return y_current->y_type; | |
6824 } | |
6825 return MAUTO; | |
6826 } | |
6827 | |
5796 | 6828 /* |
6829 * When "flags" has GREG_LIST return a list with text "s". | |
6830 * Otherwise just return "s". | |
6831 */ | |
6832 static char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6833 getreg_wrap_one_line(char_u *s, int flags) |
5796 | 6834 { |
6835 if (flags & GREG_LIST) | |
6836 { | |
6837 list_T *list = list_alloc(); | |
6838 | |
6839 if (list != NULL) | |
6840 { | |
6841 if (list_append_string(list, NULL, -1) == FAIL) | |
6842 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6843 list_free(list); |
5796 | 6844 return NULL; |
6845 } | |
6846 list->lv_first->li_tv.vval.v_string = s; | |
6847 } | |
6848 return (char_u *)list; | |
6849 } | |
6850 return s; | |
6851 } | |
6852 | |
7 | 6853 /* |
6854 * Return the contents of a register as a single allocated string. | |
6855 * Used for "@r" in expressions and for getreg(). | |
6856 * Returns NULL for error. | |
5796 | 6857 * Flags: |
6858 * GREG_NO_EXPR Do not allow expression register | |
6859 * GREG_EXPR_SRC For the expression register: return expression itself, | |
6860 * not the result of its evaluation. | |
6861 * GREG_LIST Return a list of lines in place of a single string. | |
7 | 6862 */ |
6863 char_u * | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6864 get_reg_contents(int regname, int flags) |
7 | 6865 { |
6866 long i; | |
6867 char_u *retval; | |
6868 int allocated; | |
6869 long len; | |
6870 | |
6871 /* Don't allow using an expression register inside an expression */ | |
6872 if (regname == '=') | |
6873 { | |
5796 | 6874 if (flags & GREG_NO_EXPR) |
6875 return NULL; | |
6876 if (flags & GREG_EXPR_SRC) | |
6877 return getreg_wrap_one_line(get_expr_line_src(), flags); | |
6878 return getreg_wrap_one_line(get_expr_line(), flags); | |
7 | 6879 } |
6880 | |
6881 if (regname == '@') /* "@@" is used for unnamed register */ | |
6882 regname = '"'; | |
6883 | |
6884 /* check for valid regname */ | |
6885 if (regname != NUL && !valid_yank_reg(regname, FALSE)) | |
6886 return NULL; | |
6887 | |
6888 #ifdef FEAT_CLIPBOARD | |
6889 regname = may_get_selection(regname); | |
6890 #endif | |
6891 | |
6892 if (get_spec_reg(regname, &retval, &allocated, FALSE)) | |
6893 { | |
6894 if (retval == NULL) | |
6895 return NULL; | |
5796 | 6896 if (allocated) |
6897 return getreg_wrap_one_line(retval, flags); | |
6898 return getreg_wrap_one_line(vim_strsave(retval), flags); | |
7 | 6899 } |
6900 | |
6901 get_yank_register(regname, FALSE); | |
6902 if (y_current->y_array == NULL) | |
6903 return NULL; | |
6904 | |
5796 | 6905 if (flags & GREG_LIST) |
6906 { | |
6907 list_T *list = list_alloc(); | |
6908 int error = FALSE; | |
6909 | |
6910 if (list == NULL) | |
6911 return NULL; | |
6912 for (i = 0; i < y_current->y_size; ++i) | |
6913 if (list_append_string(list, y_current->y_array[i], -1) == FAIL) | |
6914 error = TRUE; | |
6915 if (error) | |
6916 { | |
8863
e1b84109506a
commit https://github.com/vim/vim/commit/107e1eef1df3b786ad3ad49fbdb9e058649303b5
Christian Brabandt <cb@256bit.org>
parents:
8690
diff
changeset
|
6917 list_free(list); |
5796 | 6918 return NULL; |
6919 } | |
6920 return (char_u *)list; | |
6921 } | |
6922 | |
7 | 6923 /* |
6924 * Compute length of resulting string. | |
6925 */ | |
6926 len = 0; | |
6927 for (i = 0; i < y_current->y_size; ++i) | |
6928 { | |
6929 len += (long)STRLEN(y_current->y_array[i]); | |
6930 /* | |
6931 * Insert a newline between lines and after last line if | |
6932 * y_type is MLINE. | |
6933 */ | |
6934 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6935 ++len; | |
6936 } | |
6937 | |
6938 retval = lalloc(len + 1, TRUE); | |
6939 | |
6940 /* | |
6941 * Copy the lines of the yank register into the string. | |
6942 */ | |
6943 if (retval != NULL) | |
6944 { | |
6945 len = 0; | |
6946 for (i = 0; i < y_current->y_size; ++i) | |
6947 { | |
6948 STRCPY(retval + len, y_current->y_array[i]); | |
6949 len += (long)STRLEN(retval + len); | |
6950 | |
6951 /* | |
6952 * Insert a NL between lines and after the last line if y_type is | |
6953 * MLINE. | |
6954 */ | |
6955 if (y_current->y_type == MLINE || i < y_current->y_size - 1) | |
6956 retval[len++] = '\n'; | |
6957 } | |
6958 retval[len] = NUL; | |
6959 } | |
6960 | |
6961 return retval; | |
6962 } | |
6963 | |
5798 | 6964 static int |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6965 init_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6966 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6967 yankreg_T **old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6968 yankreg_T **old_y_current, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6969 int must_append, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6970 int *yank_type UNUSED) |
5798 | 6971 { |
6972 if (!valid_yank_reg(name, TRUE)) /* check for valid reg name */ | |
6973 { | |
6974 emsg_invreg(name); | |
6975 return FAIL; | |
6976 } | |
6977 | |
6978 /* Don't want to change the current (unnamed) register */ | |
6979 *old_y_previous = y_previous; | |
6980 *old_y_current = y_current; | |
6981 | |
6982 get_yank_register(name, TRUE); | |
6983 if (!y_append && !must_append) | |
6984 free_yank_all(); | |
6985 return OK; | |
6986 } | |
6987 | |
6988 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6989 finish_write_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6990 int name, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6991 yankreg_T *old_y_previous, |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
6992 yankreg_T *old_y_current) |
5798 | 6993 { |
6994 # ifdef FEAT_CLIPBOARD | |
6995 /* Send text of clipboard register to the clipboard. */ | |
6996 may_set_selection(); | |
6997 # endif | |
6998 | |
6999 /* ':let @" = "val"' should change the meaning of the "" register */ | |
7000 if (name != '"') | |
7001 y_previous = old_y_previous; | |
7002 y_current = old_y_current; | |
7003 } | |
7004 | |
7 | 7005 /* |
7006 * Store string "str" in register "name". | |
7007 * "maxlen" is the maximum number of bytes to use, -1 for all bytes. | |
7008 * If "must_append" is TRUE, always append to the register. Otherwise append | |
7009 * if "name" is an uppercase letter. | |
7010 * Note: "maxlen" and "must_append" don't work for the "/" register. | |
7011 * Careful: 'str' is modified, you may have to use a copy! | |
7012 * If "str" ends in '\n' or '\r', use linewise, otherwise use characterwise. | |
7013 */ | |
7014 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7015 write_reg_contents( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7016 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7017 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7018 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7019 int must_append) |
7 | 7020 { |
7021 write_reg_contents_ex(name, str, maxlen, must_append, MAUTO, 0L); | |
7022 } | |
7023 | |
7024 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7025 write_reg_contents_lst( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7026 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7027 char_u **strings, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7028 int maxlen UNUSED, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7029 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7030 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7031 long block_len) |
5798 | 7032 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7033 yankreg_T *old_y_previous, *old_y_current; |
5798 | 7034 |
7035 if (name == '/' | |
7036 #ifdef FEAT_EVAL | |
7037 || name == '=' | |
7038 #endif | |
7039 ) | |
7040 { | |
7041 char_u *s; | |
7042 | |
7043 if (strings[0] == NULL) | |
7044 s = (char_u *)""; | |
7045 else if (strings[1] != NULL) | |
7046 { | |
7047 EMSG(_("E883: search pattern and expression register may not " | |
7048 "contain two or more lines")); | |
7049 return; | |
7050 } | |
7051 else | |
7052 s = strings[0]; | |
7053 write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len); | |
7054 return; | |
7055 } | |
7056 | |
7057 if (name == '_') /* black hole: nothing to do */ | |
7058 return; | |
7059 | |
7060 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, | |
7061 &yank_type) == FAIL) | |
7062 return; | |
7063 | |
7064 str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE); | |
7065 | |
7066 finish_write_reg(name, old_y_previous, old_y_current); | |
7067 } | |
7068 | |
7069 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7070 write_reg_contents_ex( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7071 int name, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7072 char_u *str, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7073 int maxlen, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7074 int must_append, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7075 int yank_type, |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7076 long block_len) |
7 | 7077 { |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7078 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
|
7079 long len; |
7 | 7080 |
336 | 7081 if (maxlen >= 0) |
7082 len = maxlen; | |
7083 else | |
7084 len = (long)STRLEN(str); | |
7085 | |
7 | 7086 /* Special case: '/' search pattern */ |
7087 if (name == '/') | |
7088 { | |
7089 set_last_search_pat(str, RE_SEARCH, TRUE, TRUE); | |
7090 return; | |
7091 } | |
7092 | |
6557 | 7093 if (name == '#') |
7094 { | |
7095 buf_T *buf; | |
7096 | |
7097 if (VIM_ISDIGIT(*str)) | |
7098 { | |
7099 int num = atoi((char *)str); | |
7100 | |
7101 buf = buflist_findnr(num); | |
7102 if (buf == NULL) | |
7103 EMSGN(_(e_nobufnr), (long)num); | |
7104 } | |
7105 else | |
7106 buf = buflist_findnr(buflist_findpat(str, str + STRLEN(str), | |
7107 TRUE, FALSE, FALSE)); | |
7108 if (buf == NULL) | |
7109 return; | |
7110 curwin->w_alt_fnum = buf->b_fnum; | |
7111 return; | |
7112 } | |
7113 | |
336 | 7114 #ifdef FEAT_EVAL |
7115 if (name == '=') | |
7116 { | |
7117 char_u *p, *s; | |
7118 | |
7119 p = vim_strnsave(str, (int)len); | |
7120 if (p == NULL) | |
7121 return; | |
7122 if (must_append) | |
7123 { | |
7124 s = concat_str(get_expr_line_src(), p); | |
7125 vim_free(p); | |
7126 p = s; | |
7127 } | |
7128 set_expr_line(p); | |
7129 return; | |
7130 } | |
7131 #endif | |
7132 | |
7 | 7133 if (name == '_') /* black hole: nothing to do */ |
7134 return; | |
7135 | |
5798 | 7136 if (init_write_reg(name, &old_y_previous, &old_y_current, must_append, |
7137 &yank_type) == FAIL) | |
7138 return; | |
7139 | |
7140 str_to_reg(y_current, yank_type, str, len, block_len, FALSE); | |
7141 | |
7142 finish_write_reg(name, old_y_previous, old_y_current); | |
7 | 7143 } |
7144 #endif /* FEAT_EVAL */ | |
7145 | |
7146 #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL) | |
7147 /* | |
7148 * Put a string into a register. When the register is not empty, the string | |
7149 * is appended. | |
7150 */ | |
7151 static void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7152 str_to_reg( |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7153 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
|
7154 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
|
7155 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
|
7156 long len, /* length of string */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7157 long blocklen, /* width of Visual block */ |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7158 int str_list) /* TRUE if str is char_u ** */ |
7 | 7159 { |
2896 | 7160 int type; /* MCHAR, MLINE or MBLOCK */ |
7 | 7161 int lnum; |
7162 long start; | |
7163 long i; | |
7164 int extra; | |
7165 int newlines; /* number of lines added */ | |
7166 int extraline = 0; /* extra line at the end */ | |
7167 int append = FALSE; /* append to last line in register */ | |
7168 char_u *s; | |
5798 | 7169 char_u **ss; |
7 | 7170 char_u **pp; |
7171 long maxlen; | |
7172 | |
2000 | 7173 if (y_ptr->y_array == NULL) /* NULL means empty register */ |
7 | 7174 y_ptr->y_size = 0; |
7175 | |
2896 | 7176 if (yank_type == MAUTO) |
5798 | 7177 type = ((str_list || (len > 0 && (str[len - 1] == NL |
7178 || str[len - 1] == CAR))) | |
2896 | 7179 ? MLINE : MCHAR); |
7180 else | |
7181 type = yank_type; | |
7182 | |
7 | 7183 /* |
7184 * Count the number of lines within the string | |
7185 */ | |
7186 newlines = 0; | |
5798 | 7187 if (str_list) |
7188 { | |
7189 for (ss = (char_u **) str; *ss != NULL; ++ss) | |
7 | 7190 ++newlines; |
5798 | 7191 } |
7192 else | |
7193 { | |
7194 for (i = 0; i < len; i++) | |
7195 if (str[i] == '\n') | |
7196 ++newlines; | |
7197 if (type == MCHAR || len == 0 || str[len - 1] != '\n') | |
7198 { | |
7199 extraline = 1; | |
7200 ++newlines; /* count extra newline at the end */ | |
7201 } | |
7202 if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR) | |
7203 { | |
7204 append = TRUE; | |
7205 --newlines; /* uncount newline when appending first line */ | |
7206 } | |
7 | 7207 } |
7208 | |
6807 | 7209 /* Without any lines make the register empty. */ |
7210 if (y_ptr->y_size + newlines == 0) | |
7211 { | |
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13202
diff
changeset
|
7212 VIM_CLEAR(y_ptr->y_array); |
6807 | 7213 return; |
7214 } | |
7215 | |
7 | 7216 /* |
7217 * Allocate an array to hold the pointers to the new register lines. | |
7218 * If the register was not empty, move the existing lines to the new array. | |
7219 */ | |
7220 pp = (char_u **)lalloc_clear((y_ptr->y_size + newlines) | |
7221 * sizeof(char_u *), TRUE); | |
7222 if (pp == NULL) /* out of memory */ | |
7223 return; | |
7224 for (lnum = 0; lnum < y_ptr->y_size; ++lnum) | |
7225 pp[lnum] = y_ptr->y_array[lnum]; | |
7226 vim_free(y_ptr->y_array); | |
7227 y_ptr->y_array = pp; | |
7228 maxlen = 0; | |
7229 | |
7230 /* | |
7231 * Find the end of each line and save it into the array. | |
7232 */ | |
5798 | 7233 if (str_list) |
7234 { | |
7235 for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum) | |
7 | 7236 { |
5856 | 7237 i = (long)STRLEN(*ss); |
5798 | 7238 pp[lnum] = vim_strnsave(*ss, i); |
7239 if (i > maxlen) | |
7240 maxlen = i; | |
7 | 7241 } |
5798 | 7242 } |
7243 else | |
7244 { | |
7245 for (start = 0; start < len + extraline; start += i + 1) | |
7 | 7246 { |
5798 | 7247 for (i = start; i < len; ++i) /* find the end of the line */ |
7248 if (str[i] == '\n') | |
7249 break; | |
7250 i -= start; /* i is now length of line */ | |
7251 if (i > maxlen) | |
7252 maxlen = i; | |
7253 if (append) | |
7254 { | |
7255 --lnum; | |
7256 extra = (int)STRLEN(y_ptr->y_array[lnum]); | |
7257 } | |
7258 else | |
7259 extra = 0; | |
7260 s = alloc((unsigned)(i + extra + 1)); | |
7261 if (s == NULL) | |
7262 break; | |
7263 if (extra) | |
7264 mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra); | |
7265 if (append) | |
7266 vim_free(y_ptr->y_array[lnum]); | |
7267 if (i) | |
7268 mch_memmove(s + extra, str + start, (size_t)i); | |
7269 extra += i; | |
7270 s[extra] = NUL; | |
7271 y_ptr->y_array[lnum++] = s; | |
7272 while (--extra >= 0) | |
7273 { | |
7274 if (*s == NUL) | |
7275 *s = '\n'; /* replace NUL with newline */ | |
7276 ++s; | |
7277 } | |
7278 append = FALSE; /* only first line is appended */ | |
7 | 7279 } |
7280 } | |
7281 y_ptr->y_type = type; | |
7282 y_ptr->y_size = lnum; | |
7283 if (type == MBLOCK) | |
7284 y_ptr->y_width = (blocklen < 0 ? maxlen - 1 : blocklen); | |
7285 else | |
7286 y_ptr->y_width = 0; | |
9272
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7287 #ifdef FEAT_VIMINFO |
f5d9eb512f8b
commit https://github.com/vim/vim/commit/46bbb0c4ba27395859dfeaa26938483946bb4ec2
Christian Brabandt <cb@256bit.org>
parents:
9225
diff
changeset
|
7288 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
|
7289 #endif |
7 | 7290 } |
7291 #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */ | |
7292 | |
7293 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7294 clear_oparg(oparg_T *oap) |
7 | 7295 { |
7296 vim_memset(oap, 0, sizeof(oparg_T)); | |
7297 } | |
7298 | |
7299 /* | |
161 | 7300 * Count the number of bytes, characters and "words" in a line. |
7 | 7301 * |
7302 * "Words" are counted by looking for boundaries between non-space and | |
7303 * space characters. (it seems to produce results that match 'wc'.) | |
7304 * | |
161 | 7305 * Return value is byte count; word count for the line is added to "*wc". |
7306 * Char count is added to "*cc". | |
7 | 7307 * |
7308 * The function will only examine the first "limit" characters in the | |
7309 * line, stopping if it encounters an end-of-line (NUL byte). In that | |
7310 * case, eol_size will be added to the character count to account for | |
7311 * the size of the EOL character. | |
7312 */ | |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7313 static varnumber_T |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7314 line_count_info( |
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7315 char_u *line, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7316 varnumber_T *wc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7317 varnumber_T *cc, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7318 varnumber_T limit, |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7319 int eol_size) |
7 | 7320 { |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7321 varnumber_T i; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7322 varnumber_T words = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7323 varnumber_T chars = 0; |
7 | 7324 int is_word = 0; |
7325 | |
3626 | 7326 for (i = 0; i < limit && line[i] != NUL; ) |
7 | 7327 { |
7328 if (is_word) | |
7329 { | |
7330 if (vim_isspace(line[i])) | |
7331 { | |
7332 words++; | |
7333 is_word = 0; | |
7334 } | |
7335 } | |
7336 else if (!vim_isspace(line[i])) | |
7337 is_word = 1; | |
161 | 7338 ++chars; |
7339 #ifdef FEAT_MBYTE | |
474 | 7340 i += (*mb_ptr2len)(line + i); |
161 | 7341 #else |
7342 ++i; | |
7343 #endif | |
7 | 7344 } |
7345 | |
7346 if (is_word) | |
7347 words++; | |
7348 *wc += words; | |
7349 | |
7350 /* Add eol_size if the end of line was reached before hitting limit. */ | |
2996 | 7351 if (i < limit && line[i] == NUL) |
161 | 7352 { |
7 | 7353 i += eol_size; |
161 | 7354 chars += eol_size; |
7355 } | |
7356 *cc += chars; | |
7 | 7357 return i; |
7358 } | |
7359 | |
7360 /* | |
7361 * Give some info about the position of the cursor (for "g CTRL-G"). | |
7362 * In Visual mode, give some info about the selected region. (In this case, | |
7363 * 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
|
7364 * When "dict" is not NULL store the info there instead of showing it. |
7 | 7365 */ |
7366 void | |
7829
2a8d6b2dd925
commit https://github.com/vim/vim/commit/9b57814db13c29ecb08260b36923c0e1c8a373a9
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7367 cursor_pos_info(dict_T *dict) |
7 | 7368 { |
7369 char_u *p; | |
274 | 7370 char_u buf1[50]; |
7371 char_u buf2[40]; | |
7 | 7372 linenr_T lnum; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7373 varnumber_T byte_count = 0; |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7374 #ifdef FEAT_MBYTE |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7375 varnumber_T bom_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7376 #endif |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7377 varnumber_T byte_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7378 varnumber_T char_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7379 varnumber_T char_count_cursor = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7380 varnumber_T word_count = 0; |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7381 varnumber_T word_count_cursor = 0; |
7 | 7382 int eol_size; |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7383 varnumber_T last_check = 100000L; |
7 | 7384 long line_count_selected = 0; |
7385 pos_T min_pos, max_pos; | |
7386 oparg_T oparg; | |
7387 struct block_def bd; | |
7388 | |
7389 /* | |
7390 * Compute the length of the file in characters. | |
7391 */ | |
7392 if (curbuf->b_ml.ml_flags & ML_EMPTY) | |
7393 { | |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7394 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7395 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7396 MSG(_(no_lines_msg)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7397 return; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7398 } |
7 | 7399 } |
7400 else | |
7401 { | |
7402 if (get_fileformat(curbuf) == EOL_DOS) | |
7403 eol_size = 2; | |
7404 else | |
7405 eol_size = 1; | |
7406 | |
7407 if (VIsual_active) | |
7408 { | |
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11065
diff
changeset
|
7409 if (LT_POS(VIsual, curwin->w_cursor)) |
7 | 7410 { |
7411 min_pos = VIsual; | |
7412 max_pos = curwin->w_cursor; | |
7413 } | |
7414 else | |
7415 { | |
7416 min_pos = curwin->w_cursor; | |
7417 max_pos = VIsual; | |
7418 } | |
7419 if (*p_sel == 'e' && max_pos.col > 0) | |
7420 --max_pos.col; | |
7421 | |
7422 if (VIsual_mode == Ctrl_V) | |
7423 { | |
1866 | 7424 #ifdef FEAT_LINEBREAK |
7425 char_u * saved_sbr = p_sbr; | |
7426 | |
7427 /* Make 'sbr' empty for a moment to get the correct size. */ | |
7428 p_sbr = empty_option; | |
7429 #endif | |
7 | 7430 oparg.is_VIsual = 1; |
7431 oparg.block_mode = TRUE; | |
7432 oparg.op_type = OP_NOP; | |
7433 getvcols(curwin, &min_pos, &max_pos, | |
688 | 7434 &oparg.start_vcol, &oparg.end_vcol); |
1866 | 7435 #ifdef FEAT_LINEBREAK |
7436 p_sbr = saved_sbr; | |
7437 #endif | |
688 | 7438 if (curwin->w_curswant == MAXCOL) |
7439 oparg.end_vcol = MAXCOL; | |
7 | 7440 /* Swap the start, end vcol if needed */ |
7441 if (oparg.end_vcol < oparg.start_vcol) | |
7442 { | |
7443 oparg.end_vcol += oparg.start_vcol; | |
7444 oparg.start_vcol = oparg.end_vcol - oparg.start_vcol; | |
7445 oparg.end_vcol -= oparg.start_vcol; | |
7446 } | |
7447 } | |
7448 line_count_selected = max_pos.lnum - min_pos.lnum + 1; | |
7449 } | |
7450 | |
7451 for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum) | |
7452 { | |
7453 /* Check for a CTRL-C every 100000 characters. */ | |
161 | 7454 if (byte_count > last_check) |
7 | 7455 { |
7456 ui_breakcheck(); | |
7457 if (got_int) | |
7458 return; | |
161 | 7459 last_check = byte_count + 100000L; |
7 | 7460 } |
7461 | |
7462 /* Do extra processing for VIsual mode. */ | |
7463 if (VIsual_active | |
7464 && lnum >= min_pos.lnum && lnum <= max_pos.lnum) | |
7465 { | |
45 | 7466 char_u *s = NULL; |
7467 long len = 0L; | |
7468 | |
7 | 7469 switch (VIsual_mode) |
7470 { | |
7471 case Ctrl_V: | |
5735 | 7472 #ifdef FEAT_VIRTUALEDIT |
7 | 7473 virtual_op = virtual_active(); |
5735 | 7474 #endif |
7 | 7475 block_prep(&oparg, &bd, lnum, 0); |
5735 | 7476 #ifdef FEAT_VIRTUALEDIT |
7 | 7477 virtual_op = MAYBE; |
5735 | 7478 #endif |
45 | 7479 s = bd.textstart; |
7480 len = (long)bd.textlen; | |
7 | 7481 break; |
7482 case 'V': | |
45 | 7483 s = ml_get(lnum); |
7484 len = MAXCOL; | |
7 | 7485 break; |
7486 case 'v': | |
7487 { | |
7488 colnr_T start_col = (lnum == min_pos.lnum) | |
7489 ? min_pos.col : 0; | |
7490 colnr_T end_col = (lnum == max_pos.lnum) | |
7491 ? max_pos.col - start_col + 1 : MAXCOL; | |
7492 | |
45 | 7493 s = ml_get(lnum) + start_col; |
7494 len = end_col; | |
7 | 7495 } |
7496 break; | |
7497 } | |
45 | 7498 if (s != NULL) |
7499 { | |
161 | 7500 byte_count_cursor += line_count_info(s, &word_count_cursor, |
7501 &char_count_cursor, len, eol_size); | |
45 | 7502 if (lnum == curbuf->b_ml.ml_line_count |
7503 && !curbuf->b_p_eol | |
6933 | 7504 && (curbuf->b_p_bin || !curbuf->b_p_fixeol) |
50 | 7505 && (long)STRLEN(s) < len) |
161 | 7506 byte_count_cursor -= eol_size; |
45 | 7507 } |
7 | 7508 } |
7509 else | |
7510 { | |
7511 /* In non-visual mode, check for the line the cursor is on */ | |
7512 if (lnum == curwin->w_cursor.lnum) | |
7513 { | |
7514 word_count_cursor += word_count; | |
161 | 7515 char_count_cursor += char_count; |
7516 byte_count_cursor = byte_count + | |
7517 line_count_info(ml_get(lnum), | |
7518 &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
|
7519 (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
|
7520 eol_size); |
7 | 7521 } |
7522 } | |
7523 /* Add to the running totals */ | |
161 | 7524 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
|
7525 &char_count, (varnumber_T)MAXCOL, |
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7526 eol_size); |
7 | 7527 } |
7528 | |
7529 /* Correction for when last line doesn't have an EOL. */ | |
6933 | 7530 if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) |
161 | 7531 byte_count -= eol_size; |
7 | 7532 |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7533 if (dict == NULL) |
7 | 7534 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7535 if (VIsual_active) |
7 | 7536 { |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7537 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
|
7538 { |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7539 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
|
7540 &max_pos.col); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7541 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
|
7542 (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
|
7543 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7544 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7545 buf1[0] = NUL; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7546 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7547 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
|
7548 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7549 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7550 _("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
|
7551 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7552 (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
|
7553 (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
|
7554 (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
|
7555 (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
|
7556 (long long)byte_count); |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7557 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7558 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7559 _("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
|
7560 buf1, line_count_selected, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7561 (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
|
7562 (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
|
7563 (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
|
7564 (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
|
7565 (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
|
7566 (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
|
7567 (long long)byte_count); |
7 | 7568 } |
7569 else | |
7480
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 p = ml_get_curline(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7572 validate_virtcol(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7573 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
|
7574 (int)curwin->w_virtcol + 1); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7575 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
|
7576 linetabsize(p)); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7577 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7578 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
|
7579 && char_count == byte_count) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7580 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7581 _("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
|
7582 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7583 (long)curwin->w_cursor.lnum, |
7 | 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, (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
|
7586 (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
|
7587 else |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7588 vim_snprintf((char *)IObuff, IOSIZE, |
9389
32e34e574716
commit https://github.com/vim/vim/commit/22fcfad29276bd5f317faf516637dcd491b96a12
Christian Brabandt <cb@256bit.org>
parents:
9332
diff
changeset
|
7589 _("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
|
7590 (char *)buf1, (char *)buf2, |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7591 (long)curwin->w_cursor.lnum, |
161 | 7592 (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
|
7593 (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
|
7594 (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
|
7595 (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
|
7596 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7597 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7598 |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7599 #ifdef FEAT_MBYTE |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7600 bom_count = bomb_size(); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7601 if (bom_count > 0) |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7602 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
|
7603 _("(+%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
|
7604 #endif |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7605 if (dict == NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7606 { |
7496
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7607 /* 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
|
7608 p = p_shm; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7609 p_shm = (char_u *)""; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7610 msg(IObuff); |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7611 p_shm = p; |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7612 } |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7613 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7614 #if defined(FEAT_EVAL) |
7480
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7615 if (dict != NULL) |
a49163681559
commit https://github.com/vim/vim/commit/ed767a2073ef150971b0439a58e7ee582af6984e
Christian Brabandt <cb@256bit.org>
parents:
7447
diff
changeset
|
7616 { |
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7617 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
|
7618 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
|
7619 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
|
7620 # ifdef FEAT_MBYTE |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7621 + bom_count |
6d969668bfc8
commit https://github.com/vim/vim/commit/c71982b23978ef61d0a2f0fe5535e782e1c561ed
Christian Brabandt <cb@256bit.org>
parents:
7484
diff
changeset
|
7622 # endif |
14301
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7623 ); |
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7624 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
|
7625 byte_count_cursor); |
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7626 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
|
7627 char_count_cursor); |
3c80092eb211
patch 8.1.0166: using dict_add_nr_str() is clumsy
Christian Brabandt <cb@256bit.org>
parents:
14216
diff
changeset
|
7628 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
|
7629 word_count_cursor); |
7 | 7630 } |
7484
1fe988587423
commit https://github.com/vim/vim/commit/718272a7e13c71095ce07eb3b3d5e1f9790a6991
Christian Brabandt <cb@256bit.org>
parents:
7480
diff
changeset
|
7631 #endif |
7 | 7632 } |